diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
index 432a69fc8a9..7bdac748102 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
@@ -41,6 +41,7 @@ import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons
 import app.k9mail.legacy.message.controller.MessageReference
 import com.eygraber.uri.toKmpUri
 import com.fsck.k9.activity.MessageCompose
+import com.fsck.k9.activity.compose.MessageActions
 import com.fsck.k9.activity.MessageLoaderHelper
 import com.fsck.k9.activity.MessageLoaderHelper.MessageLoaderCallbacks
 import com.fsck.k9.activity.MessageLoaderHelperFactory
@@ -470,6 +471,7 @@ class MessageViewFragment :
 
             R.id.set_format_plain -> onDisplayPlainText()
             R.id.set_format_html -> onDisplayHTML()
+            R.id.view_compose -> MessageActions.actionCompose(requireActivity(), account)
             else -> return false
         }
 
diff --git a/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml b/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml
index 5def058bef4..36cacf4467f 100644
--- a/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml
+++ b/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml
@@ -62,7 +62,7 @@
         android:id="@+id/compose"
         android:icon="@drawable/ic_edit"
         android:title="@string/compose_action"
-        app:showAsAction="never"
+        app:showAsAction="always"
         />
 
     <item
diff --git a/legacy/ui/legacy/src/main/res/menu/new_message_list_option_menu.xml b/legacy/ui/legacy/src/main/res/menu/new_message_list_option_menu.xml
index 04c6198716c..d5abf05d3d3 100644
--- a/legacy/ui/legacy/src/main/res/menu/new_message_list_option_menu.xml
+++ b/legacy/ui/legacy/src/main/res/menu/new_message_list_option_menu.xml
@@ -31,7 +31,7 @@
         android:id="@+id/compose"
         android:icon="@drawable/ic_edit"
         android:title="@string/compose_action"
-        app:showAsAction="never"
+        app:showAsAction="always"
         />
 
     <item