diff --git a/src/flux/stores/draft-helpers.es6 b/src/flux/stores/draft-helpers.es6
index 754793163..2997ceb07 100644
--- a/src/flux/stores/draft-helpers.es6
+++ b/src/flux/stores/draft-helpers.es6
@@ -66,12 +66,6 @@ export function messageMentionsAttachment({body} = {}) {
   return (cleaned.indexOf("attach") >= 0);
 }
 
-export function queueDraftFileUploads(draft) {
-  if (draft.files.length > 0 || draft.uploads.length > 0) {
-    Actions.queueTask(new SyncbackDraftFilesTask(draft.clientId))
-  }
-}
-
 export function appendQuotedTextToDraft(draft) {
   const query = DatabaseStore.find(Message, draft.replyToMessageId).include(Message.attributes.body);
 
@@ -135,9 +129,11 @@ export function prepareDraftForSyncback(session) {
     return DatabaseStore.inTransaction((t) =>
       t.persistModel(draft)
     )
-    .then(() =>
-      Promise.resolve(queueDraftFileUploads(draft))
-    )
+    .then(() => {
+      if (draft.files.length > 0 || draft.uploads.length > 0) {
+        Actions.queueTask(new SyncbackDraftFilesTask(draft.clientId))
+      }
+    })
     .thenReturn(draft)
   })
 }
diff --git a/src/pro b/src/pro
index 6ac68bb49..773d754ba 160000
--- a/src/pro
+++ b/src/pro
@@ -1 +1 @@
-Subproject commit 6ac68bb4961cd303f7d1d4aad0920687dda988ff
+Subproject commit 773d754ba1936246888d5eec2f8de894ff686c80