diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/app/ui/legacy/src/main/res/layout/message_view_header.xml
index 53a076f3e808da94c4dc824811cac5d653f1f3e5..4c822cf73d428ef7430b996df6f214718f0588da 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_header.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_header.xml
@@ -279,6 +279,7 @@
                             app:srcCompat="?iconActionSingleMessageOptions"
                             android:padding="8dp"
                             android:background="?selectableItemBackground"
+                            android:visibility="invisible"
                             />
 
                     </LinearLayout>
diff --git a/app/ui/legacy/src/main/res/menu/message_list_option.xml b/app/ui/legacy/src/main/res/menu/message_list_option.xml
index 04e246279701fd91b79e8240044661f7e06a008d..415c8fe24911ff7fe9f065b0459d0d17d433da8b 100644
--- a/app/ui/legacy/src/main/res/menu/message_list_option.xml
+++ b/app/ui/legacy/src/main/res/menu/message_list_option.xml
@@ -95,7 +95,7 @@
     <item
         android:id="@+id/single_message_options"
         android:icon="?attr/iconActionSingleMessageOptions"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         android:title="@string/single_message_options_action">
         <menu>
             <item