diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js.es6 b/app/assets/javascripts/discourse/controllers/raw-email.js.es6
index 01f637a7bec..2cff6cf2a27 100644
--- a/app/assets/javascripts/discourse/controllers/raw-email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/raw-email.js.es6
@@ -12,12 +12,12 @@ import ObjectController from 'discourse/controllers/object';
   @module Discourse
 **/
 export default ObjectController.extend(ModalFunctionality, {
-  raw_email: "",
+  rawEmail: "",
 
   loadRawEmail: function(postId) {
     var self = this;
-    Discourse.Post.loadRawEmail(postId).then(function (raw_email) {
-      self.set("raw_email", raw_email);
+    Discourse.Post.loadRawEmail(postId).then(function (result) {
+      self.set("rawEmail", result);
     });
   }
 
diff --git a/app/assets/javascripts/discourse/templates/modal/raw_email.hbs b/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
index 88d8ffa997c..beaf5cb723d 100644
--- a/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
@@ -1,6 +1,6 @@
 <div class="modal-body">
-  {{#if raw_email}}
-    {{textarea value=raw_email class="raw-email-textarea"}}
+  {{#if rawEmail}}
+    {{textarea value=rawEmail class="raw-email-textarea"}}
   {{else}}
     {{i18n raw_email.not_available}}
   {{/if}}