diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 16705a1b2..a5365b9a1 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -223,22 +223,22 @@
             </md-list-item>
             <div class="sg-block-toggle">
               <div class="md-margin" md-whiteframe="3">
-                <div class="md-padding" layout="row">
-                <div flex="50">
-                  <h6 class="md-subhead md-default-theme md-fg md-primary">Subject Name</h6>
-                  <div ng-repeat="field in ::viewer.message.$smime.certificate.subject">
-                    <div class="pseudo-input-label" ng-bind="field[0]"><!-- label --></div>
-                    <div class="pseudo-input-field md-body-1" ng-bind="field[1]"><!-- value --></div>
+                <div class="md-padding" layout="row" layout-wrap="layout-wrap">
+                  <div flex="50" flex-xs="100">
+                    <h6 class="md-subhead md-default-theme md-fg md-primary">Subject Name</h6>
+                    <div ng-repeat="field in ::viewer.message.$smime.certificate.subject">
+                      <div class="pseudo-input-label" ng-bind="field[0]"><!-- label --></div>
+                      <div class="pseudo-input-field md-body-1" ng-bind="field[1]"><!-- value --></div>
+                    </div>
                   </div>
-                </div>
-                <div flex="50">
-                  <h6 class="md-subhead md-default-theme md-fg md-primary">Issuer</h6>
-                  <div ng-repeat="field in ::viewer.message.$smime.certificate.issuer">
-                    <div class="pseudo-input-label" ng-bind="field[0]"><!-- label --></div>
-                    <div class="pseudo-input-field md-body-1" ng-bind="field[1]"><!-- value --></div>
+                  <div flex="50" flex-xs="100">
+                    <h6 class="md-subhead md-default-theme md-fg md-primary">Issuer</h6>
+                    <div ng-repeat="field in ::viewer.message.$smime.certificate.issuer">
+                      <div class="pseudo-input-label" ng-bind="field[0]"><!-- label --></div>
+                      <div class="pseudo-input-field md-body-1" ng-bind="field[1]"><!-- value --></div>
+                    </div>
                   </div>
                 </div>
-                </div>
               </div>
             </div>
           </sg-block-toggle>
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index e9cbccef7..e29c44e1a 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -299,6 +299,7 @@
               formattedMessage = formattedMessage.replace(/\n/g, "</p><p class=\"md-caption\">") + "</p>";
               _this.$smime = {
                 validSignature: part.valid,
+                certificate: part.certificates[part.certificates.length - 1],
                 message: formattedMessage
               };
             }