diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b49979bb6a..52fe373314 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1609,7 +1609,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             .putExtra("found", viewType == ViewType.SEARCH);
 
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                    boolean doubletap = prefs.getBoolean("doubletap", false);
+                    boolean doubletap =
+                            (!prefs.getBoolean("autoscroll", false) &&
+                                    prefs.getBoolean("doubletap", false));
 
                     if (!doubletap || message.folderReadOnly || EntityFolder.OUTBOX.equals(message.folderType)) {
                         lbm.sendBroadcast(viewThread);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d349ebe547..8504f5370b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -303,7 +303,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
 
         swipenav = prefs.getBoolean("swipenav", true);
-        autoscroll = (prefs.getBoolean("autoscroll", false) || viewType == AdapterMessage.ViewType.THREAD);
+        autoscroll =
+                (prefs.getBoolean("autoscroll", false) ||
+                        viewType == AdapterMessage.ViewType.THREAD);
         cards = prefs.getBoolean("cards", true);
         date = prefs.getBoolean("date", true);
         threading = prefs.getBoolean("threading", true);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
index 09ab9237f3..670a9c58bf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
@@ -42,9 +42,9 @@ import androidx.preference.PreferenceManager;
 public class FragmentOptionsBehavior extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
     private SwitchCompat swPull;
     private SwitchCompat swAutoScroll;
+    private SwitchCompat swDoubleTap;
     private SwitchCompat swSwipeNav;
     private SwitchCompat swReversed;
-    private SwitchCompat swDoubleTap;
     private SwitchCompat swAutoExpand;
     private SwitchCompat swExpandOne;
     private SwitchCompat swAutoClose;
@@ -57,7 +57,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
     private SwitchCompat swDisableTracking;
 
     private final static String[] RESET_OPTIONS = new String[]{
-            "pull", "autoscroll", "swipenav", "reversed", "doubletap", "autoexpand", "expand_one", "autoclose", "onclose",
+            "pull", "autoscroll", "doubletap", "swipenav", "reversed", "autoexpand", "expand_one", "autoclose", "onclose",
             "collapse", "autoread", "autounflag", "automove", "discard_delete", "disable_tracking"
     };
 
@@ -73,9 +73,9 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
 
         swPull = view.findViewById(R.id.swPull);
         swAutoScroll = view.findViewById(R.id.swAutoScroll);
+        swDoubleTap = view.findViewById(R.id.swDoubleTap);
         swSwipeNav = view.findViewById(R.id.swSwipeNav);
         swReversed = view.findViewById(R.id.swReversed);
-        swDoubleTap = view.findViewById(R.id.swDoubleTap);
         swAutoExpand = view.findViewById(R.id.swAutoExpand);
         swExpandOne = view.findViewById(R.id.swExpandOne);
         swAutoClose = view.findViewById(R.id.swAutoClose);
@@ -104,27 +104,28 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("autoscroll", checked).apply();
+                swDoubleTap.setEnabled(!checked);
             }
         });
 
-        swSwipeNav.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swDoubleTap.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("swipenav", checked).apply();
+                prefs.edit().putBoolean("doubletap", checked).apply();
             }
         });
 
-        swReversed.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swSwipeNav.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("reversed", checked).apply();
+                prefs.edit().putBoolean("swipenav", checked).apply();
             }
         });
 
-        swDoubleTap.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swReversed.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("doubletap", checked).apply();
+                prefs.edit().putBoolean("reversed", checked).apply();
             }
         });
 
@@ -257,9 +258,10 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
 
         swPull.setChecked(prefs.getBoolean("pull", true));
         swAutoScroll.setChecked(prefs.getBoolean("autoscroll", false));
+        swDoubleTap.setChecked(prefs.getBoolean("doubletap", false));
+        swDoubleTap.setEnabled(!swAutoScroll.isChecked());
         swSwipeNav.setChecked(prefs.getBoolean("swipenav", true));
         swReversed.setChecked(prefs.getBoolean("reversed", false));
-        swDoubleTap.setChecked(prefs.getBoolean("doubletap", false));
         swAutoExpand.setChecked(prefs.getBoolean("autoexpand", true));
         swExpandOne.setChecked(prefs.getBoolean("expand_one", true));
         swAutoClose.setChecked(prefs.getBoolean("autoclose", true));
diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml
index 8302232716..446e685ea4 100644
--- a/app/src/main/res/layout/fragment_options_behavior.xml
+++ b/app/src/main/res/layout/fragment_options_behavior.xml
@@ -35,38 +35,38 @@
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swSwipeNav"
+            android:id="@+id/swDoubleTap"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:checked="true"
-            android:text="@string/title_advanced_swipenav"
+            android:text="@string/title_advanced_double_tap"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swAutoScroll"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swReversed"
+            android:id="@+id/swSwipeNav"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:checked="true"
-            android:text="@string/title_advanced_reversed"
+            android:text="@string/title_advanced_swipenav"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swSwipeNav"
+            app:layout_constraintTop_toBottomOf="@id/swDoubleTap"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swDoubleTap"
+            android:id="@+id/swReversed"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@string/title_advanced_double_tap"
+            android:checked="true"
+            android:text="@string/title_advanced_reversed"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swReversed"
+            app:layout_constraintTop_toBottomOf="@id/swSwipeNav"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
@@ -78,7 +78,7 @@
             android:text="@string/title_advanced_autoexpand"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swDoubleTap"
+            app:layout_constraintTop_toBottomOf="@id/swReversed"
             app:switchPadding="12dp" />
 
         <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6778e97357..fcdab6de4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -269,9 +269,9 @@
 
     <string name="title_advanced_pull_refresh">Pull down to refresh</string>
     <string name="title_advanced_autoscroll">Scroll to top on receiving new messages</string>
+    <string name="title_advanced_double_tap">Double tap to mark message read/unread</string>
     <string name="title_advanced_swipenav">Swipe left/right to go to next/previous conversation</string>
     <string name="title_advanced_reversed">Reverse navigation direction</string>
-    <string name="title_advanced_double_tap">Double tap to mark message read/unread</string>
     <string name="title_advanced_autoexpand">Automatically expand messages</string>
     <string name="title_advanced_expand_one">Expand only one message at a time</string>
     <string name="title_advanced_collapse">Collapse messages in conversations on \'back\'</string>