diff --git a/static/js/popovers.js b/static/js/popovers.js
index adb2d43e7b..935262fabb 100644
--- a/static/js/popovers.js
+++ b/static/js/popovers.js
@@ -174,12 +174,18 @@ exports.toggle_actions_popover = function (element, id) {
         }) && page_params.realm_allow_edit_history;
         var should_display_delete_option = page_params.is_admin ||
             (message.sent_by_me && page_params.realm_allow_message_deleting);
+
+        var should_display_collapse = !message.locally_echoed && !message.collapsed;
+        var should_display_uncollapse = !message.locally_echoed && message.collapsed;
+
         var args = {
             message: message,
             use_edit_icon: use_edit_icon,
             editability_menu_item: editability_menu_item,
             can_mute_topic: can_mute_topic,
             can_unmute_topic: can_unmute_topic,
+            should_display_collapse: should_display_collapse,
+            should_display_uncollapse: should_display_uncollapse,
             should_display_add_reaction_option: message.sent_by_me,
             should_display_edit_history_option: should_display_edit_history_option,
             conversation_time_uri: narrow.by_conversation_and_time_uri(message, true),
diff --git a/static/templates/actions_popover_content.handlebars b/static/templates/actions_popover_content.handlebars
index 4d4bb8b641..2501bd7f54 100644
--- a/static/templates/actions_popover_content.handlebars
+++ b/static/templates/actions_popover_content.handlebars
@@ -13,12 +13,24 @@
         </a>
     </li>
 
+
+    {{#if should_display_collapse}}
     <li>
         <a href="#" class="popover_toggle_collapse" data-message-id="{{message.id}}">
-            <i class="{{#if message.collapsed}}fa fa-plus{{else}}fa fa-minus{{/if}}" aria-hidden="true"></i>
-            {{#if message.collapsed}}{{t "Un-collapse" }}{{else}}{{t "Collapse" }}{{/if}} (-)
+            <i class="fa fa-minus" aria-hidden="true"></i>
+            {{t "Collapse" }} (-)
         </a>
     </li>
+    {{/if}}
+
+    {{#if should_display_uncollapse}}
+    <li>
+        <a href="#" class="popover_toggle_collapse" data-message-id="{{message.id}}">
+            <i class="fa fa-plus" aria-hidden="true"></i>
+            {{t "Un-collapse" }} (-)
+        </a>
+    </li>
+    {{/if}}
 
     {{#if should_display_edit_history_option}}
     <li>