6 files changed, 23 insertions, 9 deletions

diff --git a/web-ui/app/js/mail_view/ui/compose_box.js b/web-ui/app/js/mail_view/ui/compose_box.js
index 92588310..dcc8fd76 100644
--- a/web-ui/app/js/mail_view/ui/compose_box.js
+++ b/web-ui/app/js/mail_view/ui/compose_box.js
@@ -67,13 +67,15 @@ define(
         }
       };
 
+      this.discardDraft = function () {
+        this.trigger(events.dispatchers.rightPane.openNoMessageSelected);
+      };
+
       this.after('initialize', function () {
         this.renderComposeBox();
 
         this.select('toBox').focus();
-        this.on(this.select('cancelButton'), 'click', this.showNoMessageSelected);
         this.on(document, events.mail.deleted, this.mailDeleted);
-
         this.on(document, events.mail.sent, this.showNoMessageSelected);
       });
     }
diff --git a/web-ui/app/js/mail_view/ui/draft_box.js b/web-ui/app/js/mail_view/ui/draft_box.js
index 8c2e15c7..e8dd10ea 100644
--- a/web-ui/app/js/mail_view/ui/draft_box.js
+++ b/web-ui/app/js/mail_view/ui/draft_box.js
@@ -72,7 +72,6 @@ define(
         this.select('bodyBox').focus();
         this.select('tipMsg').hide();
         this.enableAutoSave();
-        this.on(this.select('cancelButton'), 'click', this.showNoMessageSelected);
         this.on(this.select('closeMailButton'), 'click', this.showNoMessageSelected);
       };
 
diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js
index 3c5b0ccc..01db6c4f 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/app/js/mail_view/ui/mail_view.js
@@ -212,7 +212,6 @@ define(
         this.trigger(events.mail.want, {mail: this.attr.ident, caller: this});
       };
 
-
       this.after('initialize', function () {
         this.on(this, events.mail.here, this.displayMail);
         this.on(this, events.mail.notFound, this.openNoMessageSelectedPane);
diff --git a/web-ui/app/js/mixins/with_compose_inline.js b/web-ui/app/js/mixins/with_compose_inline.js
index cd5dcd8b..b39201ae 100644
--- a/web-ui/app/js/mixins/with_compose_inline.js
+++ b/web-ui/app/js/mixins/with_compose_inline.js
@@ -65,6 +65,10 @@ define(
         this.attr.mail.ident = data.ident;
       };
 
+      this.discardDraft = function() {
+        this.trashReply();
+      };
+
       this.after('initialize', function () {
         this.on(document, events.mail.sent, this.openMail);
         this.on(document, events.mail.deleted, this.trashReply);
diff --git a/web-ui/app/js/mixins/with_mail_edit_base.js b/web-ui/app/js/mixins/with_mail_edit_base.js
index da92ad29..a3c88e66 100644
--- a/web-ui/app/js/mixins/with_mail_edit_base.js
+++ b/web-ui/app/js/mixins/with_mail_edit_base.js
@@ -118,10 +118,14 @@ define(
 
       this.trashMail = function() {
         this.cancelPostponedSaveDraft();
-        this.trigger(document, events.mail.save, {
-          mail: this.buildMail(),
-          callback: this.deleteMail.bind(this)
-        });
+        if (this.attr.ident) {
+          this.trigger(document, events.mail.save, {
+            mail: this.buildMail(),
+            callback: this.deleteMail.bind(this)
+          });
+        } else {
+            this.trigger(document, events.ui.mail.discard);
+        }
       };
 
       this.trim_recipient = function(recipients) {
@@ -133,7 +137,7 @@ define(
       this.sendMail = function () {
         this.cancelPostponedSaveDraft();
         var mail = this.buildMail('sent');
-        
+
         if (allRecipientsAreEmails(mail)) {
           mail.header.to = this.trim_recipient(mail.header.to);
           mail.header.cc = this.trim_recipient(mail.header.cc);
@@ -219,6 +223,10 @@ define(
         });
       };
 
+      this.before('initialize', function () {
+            this.discardDraft = function () {};
+      });
+
       this.after('initialize', function () {
         this.on(document, events.dispatchers.rightPane.clear, this.teardown);
         this.on(document, events.ui.recipients.updated, this.recipientsUpdated);
@@ -227,6 +235,7 @@ define(
 
         this.on(document, events.ui.mail.send, this.sendMail);
 
+        this.on(document, events.ui.mail.discard, this.discardDraft);
         this.on(document, events.ui.tag.selected, this.saveTag);
         this.on(document, events.ui.tag.select, this.saveTag);
       });
diff --git a/web-ui/app/js/page/events.js b/web-ui/app/js/page/events.js
index 307fc8d1..6897cf63 100644
--- a/web-ui/app/js/page/events.js
+++ b/web-ui/app/js/page/events.js
@@ -60,6 +60,7 @@ define(function () {
         wantChecked: 'ui:mail:wantChecked',
         hereChecked: 'ui:mail:hereChecked',
         checked: 'ui:mail:checked',
+        discard: 'ui:mail:discard',
         unchecked: 'ui:mail:unchecked',
         changedSinceLastSave: 'ui:mail:changedSinceLastSave',
         send: 'ui:mail:send',