From b46ffd4a3fd21931ed2f52c3401053c92587d451 Mon Sep 17 00:00:00 2001
From: Halla Moore <halla@nylas.com>
Date: Fri, 16 Dec 2016 15:43:39 -0800
Subject: [PATCH] [local-sync] Fix a couple bugs that popped up while sending

- Pass in the account when creating an ImapConnection
- Wrap the return value of the SendMessage task in an object
---
 packages/local-sync/src/local-sync-worker/sync-worker.js        | 1 +
 .../src/local-sync-worker/syncback_tasks/send-message.imap.js   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/local-sync/src/local-sync-worker/sync-worker.js b/packages/local-sync/src/local-sync-worker/sync-worker.js
index b7f688ed3..6fd7328fa 100644
--- a/packages/local-sync/src/local-sync-worker/sync-worker.js
+++ b/packages/local-sync/src/local-sync-worker/sync-worker.js
@@ -126,6 +126,7 @@ class SyncWorker {
       db: this._db,
       settings: Object.assign({}, settings, credentials),
       logger: this._logger,
+      account: this._account,
     });
 
     conn.on('mail', () => {
diff --git a/packages/local-sync/src/local-sync-worker/syncback_tasks/send-message.imap.js b/packages/local-sync/src/local-sync-worker/syncback_tasks/send-message.imap.js
index 57ea8c5fa..0a3f14443 100644
--- a/packages/local-sync/src/local-sync-worker/syncback_tasks/send-message.imap.js
+++ b/packages/local-sync/src/local-sync-worker/syncback_tasks/send-message.imap.js
@@ -48,7 +48,7 @@ class SendMessageIMAP extends SyncbackTask {
       // actually did
       logger.error(err, 'SendMessage: Could not sent message to sent folder')
     }
-    return message.toJSON()
+    return {message: message.toJSON()}
   }
 }