diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 4acb71328..4c47ccb2a 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -25,7 +25,7 @@
             <md-icon>close</md-icon>
           </md-button>
           <md-button class="md-icon-button hide-gt-xs"
-                     ng-hide="isPopup"
+                     ng-hide="::isPopup"
                      label:aria-label="Close"
                      ng-click="viewer.close()">
             <md-icon>close</md-icon>
diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js
index b9942fdb4..109a1b62f 100644
--- a/UI/WebServerResources/js/Mailer/MailboxController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxController.js
@@ -184,6 +184,8 @@
               targetEvent: $event,
               clickOutsideToClose: false,
               escapeToClose: false,
+              scope: $scope,
+              preserveScope: true,
               templateUrl: 'UIxMailEditor',
               controller: 'MessageEditorController',
               controllerAs: 'editor',
diff --git a/UI/WebServerResources/js/Mailer/Mailer.popup.js b/UI/WebServerResources/js/Mailer/Mailer.popup.js
index 7c2641c88..0d15541a6 100644
--- a/UI/WebServerResources/js/Mailer/Mailer.popup.js
+++ b/UI/WebServerResources/js/Mailer/Mailer.popup.js
@@ -237,8 +237,8 @@
   /**
    * @ngInject
    */
-  MessageEditorControllerPopup.$inject = ['$window', '$q', '$mdDialog', 'stateAccount', 'stateMessage'];
-  function MessageEditorControllerPopup($window, $q, $mdDialog, stateAccount, stateMessage) {
+  MessageEditorControllerPopup.$inject = ['$window', '$scope', '$q', '$mdDialog', 'stateAccount', 'stateMessage'];
+  function MessageEditorControllerPopup($window, $scope, $q, $mdDialog, stateAccount, stateMessage) {
     var onCompleteDeferred = $q.defer();
     $mdDialog
       .show({
@@ -246,6 +246,8 @@
         disableParentScroll: false,
         clickOutsideToClose: false,
         escapeToClose: false,
+        scope: $scope,
+        preserveScope: true,
         templateUrl: 'UIxMailEditor',
         controller: 'MessageEditorController',
         controllerAs: 'editor',
diff --git a/UI/WebServerResources/js/Mailer/MessageController.js b/UI/WebServerResources/js/Mailer/MessageController.js
index f084d8dd7..c772c9d5e 100644
--- a/UI/WebServerResources/js/Mailer/MessageController.js
+++ b/UI/WebServerResources/js/Mailer/MessageController.js
@@ -285,6 +285,8 @@
               targetEvent: $event,
               clickOutsideToClose: false,
               escapeToClose: false,
+              scope: $scope,
+              preserveScope: true,
               templateUrl: 'UIxMailEditor',
               controller: 'MessageEditorController',
               controllerAs: 'editor',