diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 183eb9615..3ef2f0d5c 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -124,7 +124,7 @@
         </md-card-actions>
         <md-card-content>
           <div class="sg-padded">
-            <h5 ng-bind="::viewer.message.subject"><!-- subject --></h5>
+            <h5 ng-bind="viewer.message.subject"><!-- subject --></h5>
             <time class="msg-date" datetime="viewer.message.date" ng-bind="::viewer.message.date"><!-- date --></time>
           </div>
           <div>
diff --git a/UI/WebServerResources/js/Mailer/sgMessageListItem.directive.js b/UI/WebServerResources/js/Mailer/sgMessageListItem.directive.js
index d54dee4ac..88000d3f1 100644
--- a/UI/WebServerResources/js/Mailer/sgMessageListItem.directive.js
+++ b/UI/WebServerResources/js/Mailer/sgMessageListItem.directive.js
@@ -28,12 +28,17 @@
 
 
     this.$onInit = function () {
+      var watchedAttrs = ['uid', 'isread', 'isflagged', 'flags', 'subject'];
+
       // this.service = Message;
       this.MailboxService = Mailbox;
 
+      if (Mailbox.selectedFolder.type == 'draft')
+        watchedAttrs.push('subject');
+
       $scope.$watch(
         function() {
-          return $ctrl.message? [ _.pick($ctrl.message, ['uid', 'isread', 'isflagged', 'flags']) ] : null;
+          return $ctrl.message? [ _.pick($ctrl.message, watchedAttrs) ] : null;
         },
         function(newId, oldId) {
           if ($ctrl.message) {