diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/zephyr.html
index 5839f5eb63..2ab8a224e2 100644
--- a/zephyr/jstemplates/zephyr.html
+++ b/zephyr/jstemplates/zephyr.html
@@ -31,5 +31,5 @@
       <span class="zephyr_sender_username">{{sender}}</span>
     </span>
     <span class="zephyr_time" title="{{full_date_str}}">{{timestr}}</span>
-    {{{content}}}
+    <div class="zephyr_content">{{{content}}}</div>
 </td>
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index c85863cb25..5f6053e2da 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -116,11 +116,7 @@ table.zephyr_table {
     margin-left: auto;
 }
 
-.messagebox p {
-    margin-left: 45px;
-}
-
-.messagebox .codehilite {
+.zephyr_content {
     margin-left: 45px;
 }