diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 978dd0d1d..f855d8306 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -29,7 +29,7 @@
                    ng-disabled="!(editor.message.editable.to.length > 0 || editor.message.editable.cc.length > 0 || editor.message.editable.bcc.length > 0)">
           <md-icon>send</md-icon>
         </md-button>
-        <md-button class="sg-icon-button" ng-click="editor.message.$save()">
+        <md-button class="sg-icon-button" ng-click="editor.save()">
           <md-icon>save</md-icon>
         </md-button>
         <md-button class="sg-icon-button" ng-click="editor.cancel()">
diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index ba574409f..2bc73533a 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -17,6 +17,7 @@
     vm.hideCc = true;
     vm.hideBcc = true;
     vm.cancel = cancel;
+    vm.save = save;
     vm.send = send;
     vm.removeAttachment = removeAttachment;
     vm.contactFilter = contactFilter;
@@ -111,11 +112,26 @@
       $mdDialog.cancel();
     }
 
+    function save() {
+      vm.message.$save().then(function(data) {
+        $mdToast.show(
+          $mdToast.simple()
+            .content(l('Your email has been saved'))
+            .position('top right')
+            .hideDelay(3000));
+      });
+    }
+
     function send() {
       if (vm.autosave)
         $timeout.cancel(vm.autosave);
 
       vm.message.$send().then(function(data) {
+        $mdToast.show(
+          $mdToast.simple()
+            .content(l('Your email has been sent'))
+            .position('top right')
+            .hideDelay(3000));
         $mdDialog.hide();
       });
     }