diff --git a/internal_packages/message-autoload-images/stylesheets/message-autoload-images.less b/internal_packages/message-autoload-images/stylesheets/message-autoload-images.less
index aa322a27e..9953b82cc 100644
--- a/internal_packages/message-autoload-images/stylesheets/message-autoload-images.less
+++ b/internal_packages/message-autoload-images/stylesheets/message-autoload-images.less
@@ -6,6 +6,9 @@
   color: mix(@text-color-subtle, #FFCC11, 40%);
   margin: @padding-base-vertical 0;
   padding: @padding-base-vertical @padding-base-horizontal;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 
   .option {
     color: fade(mix(@text-color-subtle, #FFCC11, 80%), 70%);
diff --git a/internal_packages/phishing-detection/lib/main.jsx b/internal_packages/phishing-detection/lib/main.jsx
index 3306975ca..641cb066b 100644
--- a/internal_packages/phishing-detection/lib/main.jsx
+++ b/internal_packages/phishing-detection/lib/main.jsx
@@ -38,7 +38,7 @@ class PhishingIndicator extends React.Component {
         return (
           <div className="phishingIndicator">
             <b>This message looks suspicious!</b>
-            <p>It originates from {from} but replies will go to {replyTo}.</p>
+            <div>{`It originates from ${from} but replies will go to ${replyTo}.`}</div>
           </div>
         );
       }
diff --git a/internal_packages/phishing-detection/stylesheets/phishing.less b/internal_packages/phishing-detection/stylesheets/phishing.less
index 9155aace9..89bbc73b9 100644
--- a/internal_packages/phishing-detection/stylesheets/phishing.less
+++ b/internal_packages/phishing-detection/stylesheets/phishing.less
@@ -1,11 +1,14 @@
 .phishingIndicator {
-    display: block;
-    box-sizing: border-box;
-    -webkit-print-color-adjust: exact;
-    padding: 8px 12px;
-    margin-bottom: 5px;
-    border: 1px solid rgb(235, 204, 209);
-    border-radius: 4px;
-    color: rgb(169, 68, 66);
-    background-color: rgb(242, 222, 222);
+  display: block;
+  box-sizing: border-box;
+  -webkit-print-color-adjust: exact;
+  padding: 8px 12px;
+  margin-bottom: 5px;
+  border: 1px solid rgb(235, 204, 209);
+  border-radius: 4px;
+  color: rgb(169, 68, 66);
+  background-color: rgb(242, 222, 222);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }