diff --git a/UI/WebServerResources/scss/views/MailerUI.scss b/UI/WebServerResources/scss/views/MailerUI.scss
index bb9470574..c286f988d 100644
--- a/UI/WebServerResources/scss/views/MailerUI.scss
+++ b/UI/WebServerResources/scss/views/MailerUI.scss
@@ -181,6 +181,25 @@ md-sidenav {
   }
 }
 
+// Limit height of attachments card, format content-type labels
+.msg-attachment-link,
+.msg-attachment-image {
+  md-card-content {
+    padding: $baseline-grid;
+    p {
+      @extend .md-caption;
+      line-height: $sg-line-height-2;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      .sg-label-outline {
+        border-color: $colorGrey400;
+        color: $colorGrey600;
+      }
+    }
+  }
+}
+
 // The drop zone zone is only visibile when the user is dragging a file to the browser window
 .sg-dropzone {
   display: none;
@@ -223,9 +242,11 @@ md-sidenav {
   }
 }
 
+// Text or html message body
 .msg-attachment-other {
   flex: 0 0 100%;
   max-width: 100%;
+  word-break: break-word;
 }
 
 .sg-attachment-name {
@@ -247,28 +268,6 @@ md-sidenav {
   font-weight: $sg-font-regular;
 }
 
-// Limit height of attachments card, format content-type labels
-.mailer_mailcontent {
-  .sg-mail-part {
-    md-card {
-      md-card-content {
-        padding: $baseline-grid;
-        p {
-          @extend .md-caption;
-          line-height: $sg-line-height-2;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          .sg-label-outline {
-            border-color: $colorGrey400;
-            color: $colorGrey600;
-          }
-        }
-      }
-    }
-  }
-}
-
 .mailer_plaincontent {
   white-space: pre-wrap;
 }