diff --git a/src/flux/stores/database-change-record.es6 b/src/flux/stores/database-change-record.es6
index 3dd918cf7..e134e1fb3 100644
--- a/src/flux/stores/database-change-record.es6
+++ b/src/flux/stores/database-change-record.es6
@@ -25,7 +25,9 @@ export default class DatabaseChangeRecord {
      */
     if (options.objectClass === "Message") {
       this._objects = this._objects.map((o) => {
-        o.body = null;
+        if (!o.draft) {
+          o.body = null;
+        }
         return o;
       })
     }