diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 1b82b8e43..ee0cac230 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -134,8 +134,9 @@
                   <sg-avatar-image class="md-tile-left"
                                    sg-email="::viewer.message.from[0].email"
                                    size="40">person</sg-avatar-image>
-                  <div class="md-list-item-text">
-                    <span ng-bind="::viewer.message.from[0].name"><!-- from --></span><br/>
+                  <div>
+                    <span ng-bind="::viewer.message.from[0].name"><!-- from --></span>
+                    <br/>
                     <a href="#" class="md-caption"
                        ng-bind="::viewer.message.from[0].email"
                        ng-click="viewer.newMessage($event, { to: [viewer.message.from[0].full] })"><!-- from --></a>
@@ -294,7 +295,7 @@
             <div class="msg-body">
               <div layout="row" layout-wrap="layout-wrap">
                 <div class="mailer_mailcontent" layout="row" layout-wrap="layout-wrap"
-                     ng-repeat="part in viewer.message.$content() track by $index"
+                     ng-repeat="part in viewer.message.$content() track by $id(part.content)"
                      ng-class="::part.msgclass">
                   <div class="md-flex sg-mail-part"
                        tabindex="-1"
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index db4547629..0c4d2323f 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -745,6 +745,7 @@
         _this.$mailbox.unseenCount--;
       }
       return Message.$timeout(function() {
+        delete _this.$parts;
         angular.extend(_this, data);
         _this.$formatFullAddresses();
         _this.$loadUnsafeContent = false;