diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 1838fdf06..e4aa2dcf1 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -246,19 +246,16 @@
    * @returns the HTML representation of the body
    */
   Message.prototype.$editableContent = function() {
-    var _this = this,
-        deferred = Message.$q.defer();
+    var _this = this;
 
-    Message.$$resource.fetch(this.id, 'edit').then(function(data) {
+    return Message.$$resource.fetch(this.id, 'edit').then(function(data) {
       angular.extend(_this, data);
-      Message.$$resource.fetch(_this.$absolutePath({asDraft: true}), 'edit').then(function(data) {
+      return Message.$$resource.fetch(_this.$absolutePath({asDraft: true}), 'edit').then(function(data) {
         Message.$log.debug('editable = ' + JSON.stringify(data, undefined, 2));
         angular.extend(_this.editable, data);
-        deferred.resolve(data.text);
-      }, deferred.reject);
-    }, deferred.reject);
-
-    return deferred.promise;
+        return data.text;
+      });
+    });
   };
 
   /**
diff --git a/UI/WebServerResources/js/Mailer/MessageController.js b/UI/WebServerResources/js/Mailer/MessageController.js
index b887a9c06..08c1bfec9 100644
--- a/UI/WebServerResources/js/Mailer/MessageController.js
+++ b/UI/WebServerResources/js/Mailer/MessageController.js
@@ -77,8 +77,9 @@
     }
 
     function edit($event) {
-      var message = vm.message.$editableContent();
-      showMailEditor($event, message);
+      vm.message.$editableContent().then(function() {
+        showMailEditor($event, vm.message);
+      });
     }
   }