diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d71e92be00..312d5e32fb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3404,7 +3404,11 @@ public class FragmentMessages extends FragmentBase
             String action = prefs.getString(
                     long_press ? "answer_action" : "answer_single",
                     long_press ? "reply" : "menu");
-            if ("menu".equals(action) || !message.content)
+            if ("move".equals(action)) {
+                View child = rvMessage.getChildAt(pos);
+                if (child != null && child.isEnabled())
+                    child.findViewById(R.id.ibMove).performClick();
+            } else if ("menu".equals(action) || !message.content)
                 onReply(message, selected, fabReply);
             else
                 onMenuReply(message, action);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7e32b7166..fd05473da2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2618,6 +2618,7 @@
         <item>forward</item>
         <item>resend</item>
         <item>editasnew</item>
+        <item>move</item>
         <item>menu</item>
     </string-array>
 
@@ -2628,6 +2629,7 @@
         <item>@string/title_forward</item>
         <item>@string/title_resend</item>
         <item>@string/title_editasnew</item>
+        <item>@string/title_move</item>
         <item>@string/title_reply_menu</item>
     </string-array>