diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 15b4971c8b..b1f50d1f18 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -177,6 +177,9 @@ public class FragmentMessages extends FragmentEx {
         new ItemTouchHelper(new ItemTouchHelper.Callback() {
             @Override
             public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+                if (!prefs.getBoolean("swipe", true))
+                    return 0;
+
                 int pos = viewHolder.getAdapterPosition();
                 if (pos == RecyclerView.NO_POSITION)
                     return 0;
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 9e14f914f3..293b35edd9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -36,6 +36,7 @@ public class FragmentOptions extends FragmentEx {
     private CheckBox cbAvatars;
     private CheckBox cbLight;
     private CheckBox cbBrowse;
+    private CheckBox cbSwipe;
     private CheckBox cbDebug;
 
     @Override
@@ -50,6 +51,7 @@ public class FragmentOptions extends FragmentEx {
         cbAvatars = view.findViewById(R.id.cbAvatars);
         cbLight = view.findViewById(R.id.cbLight);
         cbBrowse = view.findViewById(R.id.cbBrowse);
+        cbSwipe = view.findViewById(R.id.cbSwipe);
         cbDebug = view.findViewById(R.id.cbDebug);
 
         // Wire controls
@@ -92,6 +94,15 @@ public class FragmentOptions extends FragmentEx {
             }
         });
 
+        cbSwipe.setChecked(prefs.getBoolean("swipe", true));
+        cbSwipe.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("swipe", checked).apply();
+                ServiceSynchronize.reload(getContext(), "swipe=" + checked);
+            }
+        });
+
         cbDebug.setChecked(prefs.getBoolean("debug", false));
         cbDebug.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index 625094ab1b..8809038225 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -51,6 +51,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbLight" />
 
+        <CheckBox
+            android:id="@+id/cbSwipe"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_swipe"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbBrowse" />
+
         <CheckBox
             android:id="@+id/cbDebug"
             android:layout_width="wrap_content"
@@ -59,6 +69,6 @@
             android:layout_marginTop="12dp"
             android:text="@string/title_advanced_debug"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbBrowse" />
+            app:layout_constraintTop_toBottomOf="@id/cbSwipe" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2a4ae56652..80f5d0dc06 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,6 +83,7 @@
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_light">Use notification light</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
+    <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_debug">Debug mode</string>
 
     <string name="title_select">Select &#8230;</string>