diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 39246a745d..150b2b2f55 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1556,7 +1556,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     final boolean delete = (inTrash || !hasTrash || outbox || message.uid == null);
 
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                    boolean archive_trash = prefs.getBoolean("archive_trash", true);
+                    boolean button_archive_trash = prefs.getBoolean("button_archive_trash", true);
+                    boolean button_move = prefs.getBoolean("button_move", true);
                     boolean expand_all = prefs.getBoolean("expand_all", false);
                     boolean expand_one = prefs.getBoolean("expand_one", true);
 
@@ -1569,9 +1570,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     ibUnsubscribe.setVisibility(message.unsubscribe == null ? View.GONE : View.VISIBLE);
                     ibAnswer.setVisibility(outbox || (!expand_all && expand_one) ? View.GONE : View.VISIBLE);
-                    ibMove.setVisibility(move ? View.VISIBLE : View.GONE);
-                    ibArchive.setVisibility(archive && archive_trash ? View.VISIBLE : View.GONE);
-                    ibTrash.setVisibility(trash && archive_trash ? View.VISIBLE : View.GONE);
+                    ibMove.setVisibility(move && button_move ? View.VISIBLE : View.GONE);
+                    ibArchive.setVisibility(archive && button_archive_trash ? View.VISIBLE : View.GONE);
+                    ibTrash.setVisibility(trash && button_archive_trash ? View.VISIBLE : View.GONE);
                     ibJunk.setVisibility(junk || unjunk ? View.VISIBLE : View.GONE);
 
                     bindBody(message, scroll);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index a6c0bc2fe7..7910b2ddeb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -50,7 +50,7 @@ public class FragmentOptions extends FragmentBase {
             "name_email", "prefer_contact", "distinguish_contacts", "authentication",
             "subject_top", "font_size_sender", "font_size_subject", "subject_italic", "highlight_subject", "subject_ellipsize",
             "keywords_header", "flags", "flags_background", "preview", "preview_italic", "preview_lines",
-            "addresses", "archive_trash", "attachments_alt",
+            "addresses", "button_archive_trash", "button_move", "attachments_alt",
             "contrast", "monospaced", "text_color", "text_size",
             "inline_images", "collapse_quotes", "seekbar", "actionbar", "navbar_colorize",
             "autoscroll", "swipenav", "autoexpand", "autoclose", "onclose",
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index b43c3998d9..9f615281fe 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -97,8 +97,10 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
     private SwitchCompat swPreview;
     private SwitchCompat swPreviewItalic;
     private Spinner spPreviewLines;
+
     private SwitchCompat swAddresses;
     private SwitchCompat swArchiveTrash;
+    private SwitchCompat swMove;
 
     private SwitchCompat swContrast;
     private SwitchCompat swMonospaced;
@@ -119,7 +121,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             "subject_top", "font_size_sender", "font_size_subject", "subject_italic", "highlight_subject", "subject_ellipsize",
             "keywords_header", "flags", "flags_background",
             "preview", "preview_italic", "preview_lines",
-            "addresses", "archive_trash",
+            "addresses", "button_archive_trash", "button_move",
             "contrast", "monospaced", "text_color", "text_size",
             "inline_images", "collapse_quotes", "attachments_alt",
             "authentication"
@@ -179,6 +181,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         spPreviewLines = view.findViewById(R.id.spPreviewLines);
         swAddresses = view.findViewById(R.id.swAddresses);
         swArchiveTrash = view.findViewById(R.id.swArchiveTrash);
+        swMove = view.findViewById(R.id.swMove);
         swContrast = view.findViewById(R.id.swContrast);
         swMonospaced = view.findViewById(R.id.swMonospaced);
         swTextColor = view.findViewById(R.id.swTextColor);
@@ -548,7 +551,14 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swArchiveTrash.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("archive_trash", checked).apply();
+                prefs.edit().putBoolean("button_archive_trash", checked).apply();
+            }
+        });
+
+        swMove.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("button_move", checked).apply();
             }
         });
 
@@ -739,7 +749,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         spPreviewLines.setSelection(prefs.getInt("preview_lines", 2) - 1);
         spPreviewLines.setEnabled(swPreview.isChecked());
         swAddresses.setChecked(prefs.getBoolean("addresses", false));
-        swArchiveTrash.setChecked(prefs.getBoolean("archive_trash", true));
+        swArchiveTrash.setChecked(prefs.getBoolean("button_archive_trash", true));
+        swMove.setChecked(prefs.getBoolean("button_move", true));
         swContrast.setChecked(prefs.getBoolean("contrast", false));
         swMonospaced.setChecked(prefs.getBoolean("monospaced", false));
         swTextColor.setChecked(prefs.getBoolean("text_color", true));
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index f42ae2cd22..bbab660edd 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -722,6 +722,18 @@
             app:layout_constraintTop_toBottomOf="@id/tvCaptionBody"
             app:switchPadding="12dp" />
 
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swMove"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:checked="true"
+            android:text="@string/title_advanced_move"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swArchiveTrash"
+            app:switchPadding="12dp" />
+
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swAddresses"
             android:layout_width="0dp"
@@ -730,7 +742,7 @@
             android:text="@string/title_advanced_addresses"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swArchiveTrash"
+            app:layout_constraintTop_toBottomOf="@id/swMove"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46e346cdbf..02799d6798 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -341,6 +341,7 @@
     <string name="title_advanced_preview_italic">Show message preview in italics</string>
     <string name="title_advanced_preview_lines">Number of preview lines</string>
     <string name="title_advanced_archive_trash">Show buttons to archive or trash a message</string>
+    <string name="title_advanced_move">Show button to move a message</string>
     <string name="title_advanced_addresses">Show address details by default</string>
     <string name="title_advanced_attachments_alt">Show attachments after the message text</string>
     <string name="title_advanced_contrast">Use high contrast for message text</string>