diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index dd644177b..aae77d487 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -266,7 +266,7 @@
           </md-button>
         </md-card-actions>
         <md-card-content>
-          <pre ng-bind-html="viewer.rawSource"><!-- raw source --></pre>
+          <pre ng-bind-html="viewer.message.$rawSource"><!-- raw source --></pre>
         </md-card-content>
       </md-card>
     </div>
diff --git a/UI/WebServerResources/js/Mailer/MessageController.js b/UI/WebServerResources/js/Mailer/MessageController.js
index ab68ca9b1..a62741c6a 100644
--- a/UI/WebServerResources/js/Mailer/MessageController.js
+++ b/UI/WebServerResources/js/Mailer/MessageController.js
@@ -269,9 +269,9 @@
     }
 
     function toggleRawSource($event) {
-      if (!vm.showRawSource && !vm.rawSource) {
+      if (!vm.showRawSource && !vm.message.$rawSource) {
         Message.$$resource.post(vm.message.id, "viewsource").then(function(data) {
-          vm.rawSource = data;
+          vm.message.$rawSource = data;
           vm.showRawSource = true;
         });
       }
diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index 4d0503b18..86e27e6aa 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -151,6 +151,7 @@
     function save() {
       var ctrls = $parentControllers();
       vm.message.$save().then(function(data) {
+        vm.message.$rawSource = null;
         if (ctrls.draftMailboxCtrl) {
           // We're saving a draft from a popup window.
           // Reload draft mailbox