diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 3649acd3d8..a5bc658ad0 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -261,13 +261,6 @@ code {
     background: none !important;
 }
 
-.codehilite pre {
-    width: 100%;
-    margin-left: -5000px;
-    position: relative;
-    left: 5000px;
-}
-
 pre {
     /* 12/14 em, so bootstrap's default 12 px,
        when body is the default 14 px */
@@ -1177,7 +1170,7 @@ table.compose_table {
 }
 
 div.focused_table {
-    display: table;
+    display: block;
 }
 
 .include-sender .message_content {
diff --git a/static/templates/message.handlebars b/static/templates/message.handlebars
index 61ff650e99..eac41e954f 100644
--- a/static/templates/message.handlebars
+++ b/static/templates/message.handlebars
@@ -221,7 +221,7 @@
 
 {{#if trailing_bookend}}
 <div id="trailing_bookend" class="bookend_tr">
-  <div colspan="2" class="bookend">
+  <div class="bookend">
     <center>{{trailing_bookend}}</center>
     <span class="tiny"><p></p></span>
   </div>