diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index a19d40a464..44c8ade125 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -61,7 +61,6 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
     private LifecycleOwner owner;
 
     private boolean readonly;
-    private boolean confirm;
     private boolean debug;
 
     private List<EntityAttachment> all = new ArrayList<>();
@@ -230,7 +229,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
                 return;
             }
 
-            if (confirm) {
+            if (false) {
                 View dview = LayoutInflater.from(context).inflate(R.layout.dialog_attachment, null);
                 final AlertDialog dialog = new DialogBuilderLifecycle(context, owner)
                         .setView(dview)
@@ -338,7 +337,6 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         this.inflater = LayoutInflater.from(context);
         this.owner = owner;
         this.readonly = readonly;
-        this.confirm = prefs.getBoolean("confirm", false);
         this.debug = prefs.getBoolean("debug", false);
         setHasStableIds(true);
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index f7cf19f524..b1f15388cf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -78,7 +78,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
     private SwitchCompat swAutoRead;
     private SwitchCompat swCollapse;
     private SwitchCompat swAutoMove;
-    private SwitchCompat swConfirm;
     private SwitchCompat swSender;
     private SwitchCompat swAutoResize;
     private SwitchCompat swAutoSend;
@@ -92,7 +91,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
 
     static String[] OPTIONS_RESTART = new String[]{
             "unified", "date", "threading", "avatars", "identicons", "preview", "addresses", "autoimages",
-            "pull", "actionbar", "autoclose", "autonext", "confirm", "debug"
+            "pull", "actionbar", "autoclose", "autonext", "debug"
     };
 
     private final static String[] ADVANCED_OPTIONS = new String[]{
@@ -100,7 +99,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             "metered", "download",
             "unified", "date", "threading", "avatars", "identicons", "preview", "addresses",
             "pull", "actionbar", "autoclose", "autonext",
-            "autoread", "collapse", "automove", "confirm", "sender", "autoresize", "autosend",
+            "autoread", "collapse", "automove", "sender", "autoresize", "autosend",
             "light", "sound", "debug",
             "first", "why", "last_update_check",
             "app_support", "message_swipe", "message_select",
@@ -139,7 +138,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
         swAutoRead = view.findViewById(R.id.swAutoRead);
         swCollapse = view.findViewById(R.id.swCollapse);
         swAutoMove = view.findViewById(R.id.swAutoMove);
-        swConfirm = view.findViewById(R.id.swConfirm);
         swSender = view.findViewById(R.id.swSender);
         swAutoResize = view.findViewById(R.id.swAutoResize);
         swAutoSend = view.findViewById(R.id.swAutoSend);
@@ -325,13 +323,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             }
         });
 
-        swConfirm.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("confirm", checked).apply();
-            }
-        });
-
         swSender.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -473,7 +464,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
         swAutoRead.setChecked(prefs.getBoolean("autoread", false));
         swCollapse.setChecked(prefs.getBoolean("collapse", false));
         swAutoMove.setChecked(!prefs.getBoolean("automove", false));
-        swConfirm.setChecked(prefs.getBoolean("confirm", false));
         swSender.setChecked(prefs.getBoolean("sender", false));
         swAutoResize.setChecked(prefs.getBoolean("autoresize", true));
         swAutoSend.setChecked(!prefs.getBoolean("autosend", false));
diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index e404803376..3cf8d2a020 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -435,13 +435,13 @@
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swConfirm"
+            android:id="@+id/swAutoResize"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="12dp"
-            android:text="@string/title_advanced_confirm"
+            android:text="@string/title_advanced_autoresize"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swAutoMove"
             app:switchPadding="12dp" />
@@ -455,7 +455,7 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_sender"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swConfirm"
+            app:layout_constraintTop_toBottomOf="@id/swAutoResize"
             app:switchPadding="12dp" />
 
         <TextView
@@ -471,18 +471,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swSender" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swAutoResize"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="12dp"
-            android:text="@string/title_advanced_autoresize"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSenderHint"
-            app:switchPadding="12dp" />
-
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swAutoSend"
             android:layout_width="match_parent"
@@ -492,7 +480,7 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_autosend"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swAutoResize"
+            app:layout_constraintTop_toBottomOf="@id/tvSenderHint"
             app:switchPadding="12dp" />
 
         <TextView