1 files changed, 6 insertions, 3 deletions
diff --git a/web-ui/app/js/mail_view/data/mail_sender.js b/web-ui/app/js/mail_view/data/mail_sender.js
index 7440f5a7..0dba1a02 100644
--- a/web-ui/app/js/mail_view/data/mail_sender.js
+++ b/web-ui/app/js/mail_view/data/mail_sender.js
@@ -2,9 +2,10 @@ define(
   [
     'flight/lib/component',
     'mail_view/data/mail_builder',
-    'page/events'
+    'page/events',
+    'features'
   ],
-  function (defineComponent, mailBuilder, events) {
+  function (defineComponent, mailBuilder, events, features) {
     'use strict';
 
     return defineComponent(mailSender);
@@ -67,7 +68,9 @@ define(
 
       this.after('initialize', function () {
         this.on(events.mail.send, this.sendMail);
-        this.on(events.mail.saveDraft, this.saveDraft);
+        if(features.isEnabled('saveDraft')) {
+          this.on(events.mail.saveDraft, this.saveDraft);
+        }
         this.on(document, events.mail.save, this.saveMailWithCallback);
       });
     }