From e352fb137e27c2b7603cf27d36190ab04752f5e3 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Fri, 29 Apr 2016 18:37:20 +0200
Subject: return UID correctly so old drafts are automatically removed

---
 js/service/messageservice.js | 4 ++--
 js/views/composer.js         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/service/messageservice.js b/js/service/messageservice.js
index 8a9256efe..1a606ba9d 100644
--- a/js/service/messageservice.js
+++ b/js/service/messageservice.js
@@ -290,10 +290,10 @@ define(function(require) {
 							collection.set([message], {remove: false});
 						}
 					}
-					defer.resolve(arguments);
+					defer.resolve(data);
 				},
 				error: function() {
-					defer.reject(arguments);
+					defer.reject();
 				},
 				data: {
 					to: message.to,
diff --git a/js/views/composer.js b/js/views/composer.js
index 589c37739..e57c05d77 100644
--- a/js/views/composer.js
+++ b/js/views/composer.js
@@ -126,6 +126,7 @@ define(function(require) {
 			if (!this.isReply()) {
 				this.accounts = options.accounts;
 				this.account = options.account || this.accounts.at(0);
+				this.draftUID = options.data.id;
 			} else {
 				this.account = options.account;
 				this.folderId = options.folderId;
-- 
cgit v1.2.3