diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index d9b4d5455..1b344e083 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -157,7 +157,8 @@
                                  sg-email="::viewer.message.from[0].email"
                                  size="40">person</sg-avatar-image>
                 <div>
-                  <span ng-bind-html="::viewer.message.from[0].name"><!-- from --></span>
+                  <span ng-if="viewer.message.from[0].nameHighlighted" ng-bind-html="::viewer.message.from[0].nameHighlighted"><!-- from --></span>
+                  <span ng-if="!viewer.message.from[0].nameHighlighted" ng-bind-html="::viewer.message.from[0].name"><!-- from --></span>
                   <a href="#" class="md-caption"
                      ng-bind="::viewer.message.from[0].email"
                      ng-click="viewer.selectRecipient(viewer.message.from[0], $event)"><!-- from --></a>
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index ebc4d12e1..c8a20b6c2 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -551,8 +551,8 @@
   Message.prototype.getHighlightFrom = function () {
     var i = 0;
     for (i = 0; i < this.from.length; i++) {
-      this.from[i].full = this.highlightSearchTerms(this.from[i].full, false);
-      this.from[i].name = this.highlightSearchTerms(this.from[i].name, false);
+      this.from[i].fullHighlighted = this.highlightSearchTerms(this.from[i].full, false);
+      this.from[i].nameHighlighted = this.highlightSearchTerms(this.from[i].name, false);
     }
 
     return this.from;