Merge pull request #1464 from owncloud/fix-drafts-issues

return UID correctly so old drafts are automatically removed
owncloud-archive · May 3, 2016 · 6de0d6f · 6de0d6f
2 parents 271dff5 + e352fb1
commit 6de0d6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;