diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
index 6076b7e85e..8c16232569 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
@@ -338,7 +338,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("expand_all", checked).apply();
                 swExpandOne.setEnabled(!checked);
-                swCollapseMultiple.setEnabled(!swExpandOne.isChecked() || swExpandAll.isChecked());
             }
         });
 
@@ -346,7 +345,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("expand_one", checked).apply();
-                swCollapseMultiple.setEnabled(!swExpandOne.isChecked() || swExpandAll.isChecked());
             }
         });
 
@@ -528,7 +526,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
         swExpandOne.setChecked(prefs.getBoolean("expand_one", true));
         swExpandOne.setEnabled(!swExpandAll.isChecked());
         swCollapseMultiple.setChecked(prefs.getBoolean("collapse_multiple", true));
-        swCollapseMultiple.setEnabled(!swExpandOne.isChecked() || swExpandAll.isChecked());
 
         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 a46b38cc8c..8364e1ff37 100644
--- a/app/src/main/res/layout/fragment_options_behavior.xml
+++ b/app/src/main/res/layout/fragment_options_behavior.xml
@@ -458,7 +458,6 @@
                     android:id="@+id/swCollapseMultiple"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
                     android:text="@string/title_advanced_collapse_multiple"
                     app:layout_constraintEnd_toEndOf="parent"