diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index 4db79f5ba4..e12bdf7a32 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -72,8 +72,6 @@
         </div>
         </div>
         <div class="message_content">{{{content}}}</div>
-        <div class="message_expander message_length_controller" title="See the rest of this message">[More...]</div>
-        <div class="message_collapser message_length_controller" title="Make this message take up less space on the screen">[Collapse this message]</div>
     </td>
 </tr>
 {{/with}}
diff --git a/zephyr/static/js/message_list.js b/zephyr/static/js/message_list.js
index 2a106dcb82..0b3926a1e5 100644
--- a/zephyr/static/js/message_list.js
+++ b/zephyr/static/js/message_list.js
@@ -360,18 +360,6 @@ MessageList.prototype = {
                               }});
         }
 
-        $.each(rendered_elems, function (index, elem) {
-            var row = $(elem);
-
-            var content = $(elem).find(".message_content")[0];
-            if (content !== undefined) {
-                if( content.offsetHeight < content.scrollHeight ||
-                    content.offsetWidth < content.scrollWidth) {
-                    $(elem).find(".message_expander").show();
-                }
-            }
-        });
-
         // Re-add the fading of messages that is lost when we re-render.
         compose.update_faded_messages();
     },
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index b09d3eebf6..8575f187ff 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -805,8 +805,7 @@ $(function () {
 
     $("#main_div").on("click", ".messagebox", function (e) {
         var target = $(e.target);
-        if (target.is("a") || target.is("img.message_inline_image") || target.is("img.twitter-avatar") ||
-            target.is("div.message_length_controller")) {
+        if (target.is("a") || target.is("img.message_inline_image") || target.is("img.twitter-avatar")) {
             // If this click came from a hyperlink, don't trigger the
             // reply action.  The simple way of doing this is simply
             // to call e.stopPropagation() from within the link's
@@ -857,20 +856,6 @@ $(function () {
         show_actions_popover(this, rows.id(row));
     });
 
-    $("#home").on("click", ".message_expander", function (e) {
-        var row = $(this).closest(".message_row");
-        row.find(".message_content").addClass("expanded");
-        $(this).hide();
-        row.find(".message_collapser").show();
-    });
-
-    $("#home").on("click", ".message_collapser", function (e) {
-        var row = $(this).closest(".message_row");
-        row.find(".message_content").removeClass("expanded");
-        $(this).hide();
-        row.find(".message_expander").show();
-    });
-
     $("#home").on("click", ".narrows_by_recipient", function (e) {
         var nearest = current_msg_list.get(rows.id($(this).closest(".recipient_row")));
         var selected = current_msg_list.selected_message();
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index cea39aaf16..640ef6ce88 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -428,9 +428,6 @@ table.focused_table {
 .message_content {
     margin-left: 5px;
     margin-right: 35px; /* size of the timestamp */
-    line-height: 1.5em;
-    max-height: 9.0em;
-    overflow: hidden;
 }
 @media (max-width: 480px) {
     .message_content {
@@ -438,20 +435,6 @@ table.focused_table {
     }
 }
 
-.message_content.expanded {
-    max-height: none;
-}
-
-.message_length_controller {
-    display: none;
-    text-align: center;
-    color: #0088CC;
-}
-
-.message_length_controller:hover {
-    text-decoration: underline;
-}
-
 blockquote {
     margin-bottom: 6px;
 }