diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index dc1f78441..9495724cc 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -78,12 +78,12 @@
       <textarea name="content" var:class="editorClass" ng-model="message.editable.text"/>
       <div class="buttonsToolbar">
         <div layout="row" layout-align="end center">
-          <md-button
-             ng-click="message.$save()">
+          <md-button ng-click="cancel()"><var:string label:value="Cancel"/></md-button>
+          <md-button ng-click="message.$save()">
             <var:string label:value="Save"/>
           </md-button>
           <md-button class="fg-sogoBlue-700 md-primary md-hue-3"
-             ng-click="send(message)">
+                     ng-click="send(message)">
             <var:string label:value="Send"/>
           </md-button>
         </div>
diff --git a/UI/WebServerResources/js/Common/ui-desktop.js b/UI/WebServerResources/js/Common/ui-desktop.js
index cdb13a485..ba3505cab 100644
--- a/UI/WebServerResources/js/Common/ui-desktop.js
+++ b/UI/WebServerResources/js/Common/ui-desktop.js
@@ -632,7 +632,7 @@
         return function postLink(scope, iElement, iAttr, controller) {
           $compile(mdInputEl)(scope);
           $compile(selectEl)(scope);
-          $compile(tElement.find('md-button'))(scope);
+          $compile(tElement.find('md-button'))(scope.$parent);
         }
       }
     }])
diff --git a/UI/WebServerResources/js/MailerUI.js b/UI/WebServerResources/js/MailerUI.js
index ad111caf4..ba57dc762 100644
--- a/UI/WebServerResources/js/MailerUI.js
+++ b/UI/WebServerResources/js/MailerUI.js
@@ -277,6 +277,12 @@
         $scope.message = stateMessage;
       }
       $scope.identities = _.pluck(_.flatten(_.pluck(stateAccounts, 'identities')), 'full');
+      $scope.cancel = function() {
+        if ($scope.mailbox)
+          $state.go('mail.account.mailbox', { accountId: $scope.mailbox.$account.id, mailboxId: $scope.mailbox.id });
+        else
+          $state.go('mail');
+      };
       $scope.send = function(message) {
         message.$send().then(function(data) {
           $rootScope.message = null;