diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8222a782e5..c1c6dee0b2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -547,7 +547,7 @@ public class FragmentCompose extends FragmentBase {
     }
 
     private void onReferenceEdit() {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         if (prefs.getBoolean("edit_ref_confirmed", false)) {
             onReferenceEditConfirmed();
             return;
@@ -996,7 +996,7 @@ public class FragmentCompose extends FragmentBase {
     }
 
     private void onActionSend() {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         boolean autosend = prefs.getBoolean("autosend", false);
         if (autosend) {
             onActionSendConfirmed();
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index ee5750f491..fcce060e68 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3002,6 +3002,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         if (result.size() == 0)
             return;
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        if (prefs.getBoolean("automove", false)) {
+            moveAskConfirmed(result);
+            return;
+        }
+
         Bundle aargs = new Bundle();
         aargs.putString("question", getResources()
                 .getQuantityString(R.plurals.title_moving_messages,