diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
index 789205542c..20c3c4e272 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
@@ -47,30 +47,32 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
     private SwitchCompat swSuggestSent;
     private SwitchCompat swSuggestReceived;
     private Button btnLocalContacts;
+    private SwitchCompat swSendReminders;
+    private Spinner spSendDelayed;
+
     private SwitchCompat swPrefixOnce;
     private SwitchCompat swExtendedReply;
     private SwitchCompat swQuoteReply;
-    private SwitchCompat swPlainOnly;
-    private SwitchCompat swFormatFlowed;
     private Spinner spSignatureLocation;
-    private SwitchCompat swUsenetSignature;
-    private SwitchCompat swRemoveSignatures;
     private SwitchCompat swResizeImages;
     private SwitchCompat swResizeAttachments;
     private Spinner spAutoResize;
     private TextView tvAutoResize;
-    private SwitchCompat swSendReminders;
+
+    private SwitchCompat swPlainOnly;
+    private SwitchCompat swFormatFlowed;
+    private SwitchCompat swUsenetSignature;
+    private SwitchCompat swRemoveSignatures;
     private SwitchCompat swReceipt;
     private Spinner spReceiptType;
     private SwitchCompat swLookupMx;
-    private Spinner spSendDelayed;
 
     private final static String[] RESET_OPTIONS = new String[]{
-            "keyboard", "suggest_sent", "suggested_received",
-            "prefix_once", "extended_reply", "quote_reply",
-            "plain_only", "format_flowed", "signature_location", "usenet_signature", "remove_signatures",
+            "keyboard", "suggest_sent", "suggested_received", "send_reminders", "send_delayed",
+            "prefix_once", "extended_reply", "quote_reply", "signature_location",
             "resize_images", "resize_attachments", "resize",
-            "send_reminders", "receipt_default", "receipt_type", "lookup_mx", "send_delayed"
+            "plain_only", "format_flowed", "usenet_signature", "remove_signatures",
+            "receipt_default", "receipt_type", "lookup_mx"
     };
 
     @Override
@@ -87,23 +89,25 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         swSuggestSent = view.findViewById(R.id.swSuggestSent);
         swSuggestReceived = view.findViewById(R.id.swSuggestReceived);
         btnLocalContacts = view.findViewById(R.id.btnLocalContacts);
+        swSendReminders = view.findViewById(R.id.swSendReminders);
+        spSendDelayed = view.findViewById(R.id.spSendDelayed);
+
         swPrefixOnce = view.findViewById(R.id.swPrefixOnce);
         swExtendedReply = view.findViewById(R.id.swExtendedReply);
         swQuoteReply = view.findViewById(R.id.swQuoteReply);
-        swPlainOnly = view.findViewById(R.id.swPlainOnly);
-        swFormatFlowed = view.findViewById(R.id.swFormatFlowed);
         spSignatureLocation = view.findViewById(R.id.spSignatureLocation);
-        swUsenetSignature = view.findViewById(R.id.swUsenetSignature);
-        swRemoveSignatures = view.findViewById(R.id.swRemoveSignatures);
         swResizeImages = view.findViewById(R.id.swResizeImages);
         swResizeAttachments = view.findViewById(R.id.swResizeAttachments);
         spAutoResize = view.findViewById(R.id.spAutoResize);
         tvAutoResize = view.findViewById(R.id.tvAutoResize);
-        swSendReminders = view.findViewById(R.id.swSendReminders);
+
+        swPlainOnly = view.findViewById(R.id.swPlainOnly);
+        swFormatFlowed = view.findViewById(R.id.swFormatFlowed);
+        swUsenetSignature = view.findViewById(R.id.swUsenetSignature);
+        swRemoveSignatures = view.findViewById(R.id.swRemoveSignatures);
         swReceipt = view.findViewById(R.id.swReceipt);
         spReceiptType = view.findViewById(R.id.spReceiptType);
         swLookupMx = view.findViewById(R.id.swLookupMx);
-        spSendDelayed = view.findViewById(R.id.spSendDelayed);
 
         setOptions();
 
@@ -140,6 +144,26 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
+        swSendReminders.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("send_reminders", checked).apply();
+            }
+        });
+
+        spSendDelayed.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
+                int[] values = getResources().getIntArray(R.array.sendDelayedValues);
+                prefs.edit().putInt("send_delayed", values[position]).apply();
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                prefs.edit().remove("send_delayed").apply();
+            }
+        });
+
         swPrefixOnce.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -161,20 +185,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
-        swPlainOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("plain_only", checked).apply();
-            }
-        });
-
-        swFormatFlowed.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("format_flowed", checked).apply();
-            }
-        });
-
         spSignatureLocation.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
@@ -187,20 +197,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
-        swUsenetSignature.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("usenet_signature", checked).apply();
-            }
-        });
-
-        swRemoveSignatures.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("remove_signatures", checked).apply();
-            }
-        });
-
         swResizeImages.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -231,6 +227,34 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
+        swPlainOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("plain_only", checked).apply();
+            }
+        });
+
+        swFormatFlowed.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("format_flowed", checked).apply();
+            }
+        });
+
+        swUsenetSignature.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("usenet_signature", checked).apply();
+            }
+        });
+
+        swRemoveSignatures.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("remove_signatures", checked).apply();
+            }
+        });
+
         swReceipt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -250,13 +274,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
-        swSendReminders.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("send_reminders", checked).apply();
-            }
-        });
-
         swLookupMx.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -264,19 +281,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
-        spSendDelayed.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
-                int[] values = getResources().getIntArray(R.array.sendDelayedValues);
-                prefs.edit().putInt("send_delayed", values[position]).apply();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-                prefs.edit().remove("send_delayed").apply();
-            }
-        });
-
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 
         return view;
@@ -326,18 +330,23 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         swKeyboard.setChecked(prefs.getBoolean("keyboard", true));
         swSuggestSent.setChecked(prefs.getBoolean("suggest_sent", true));
         swSuggestReceived.setChecked(prefs.getBoolean("suggest_received", false));
+        swSendReminders.setChecked(prefs.getBoolean("send_reminders", true));
+
+        int send_delayed = prefs.getInt("send_delayed", 0);
+        int[] sendDelayedValues = getResources().getIntArray(R.array.sendDelayedValues);
+        for (int pos = 0; pos < sendDelayedValues.length; pos++)
+            if (sendDelayedValues[pos] == send_delayed) {
+                spSendDelayed.setSelection(pos);
+                break;
+            }
+
         swPrefixOnce.setChecked(prefs.getBoolean("prefix_once", true));
         swExtendedReply.setChecked(prefs.getBoolean("extended_reply", false));
         swQuoteReply.setChecked(prefs.getBoolean("quote_reply", true));
-        swPlainOnly.setChecked(prefs.getBoolean("plain_only", false));
-        swFormatFlowed.setChecked(prefs.getBoolean("format_flowed", false));
 
         int signature_location = prefs.getInt("signature_location", 1);
         spSignatureLocation.setSelection(signature_location);
 
-        swUsenetSignature.setChecked(prefs.getBoolean("usenet_signature", false));
-        swRemoveSignatures.setChecked(prefs.getBoolean("remove_signatures", false));
-
         swResizeImages.setChecked(prefs.getBoolean("resize_images", true));
         swResizeAttachments.setChecked(prefs.getBoolean("resize_attachments", true));
 
@@ -351,18 +360,15 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         spAutoResize.setEnabled(swResizeImages.isChecked() || swResizeAttachments.isChecked());
 
-        swSendReminders.setChecked(prefs.getBoolean("send_reminders", true));
+        swPlainOnly.setChecked(prefs.getBoolean("plain_only", false));
+        swFormatFlowed.setChecked(prefs.getBoolean("format_flowed", false));
+        swUsenetSignature.setChecked(prefs.getBoolean("usenet_signature", false));
+        swRemoveSignatures.setChecked(prefs.getBoolean("remove_signatures", false));
+        swReceipt.setChecked(prefs.getBoolean("receipt_default", false));
+
         int receipt_type = prefs.getInt("receipt_type", 2);
         spReceiptType.setSelection(receipt_type);
-        swReceipt.setChecked(prefs.getBoolean("receipt_default", false));
-        swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false));
 
-        int send_delayed = prefs.getInt("send_delayed", 0);
-        int[] sendDelayedValues = getResources().getIntArray(R.array.sendDelayedValues);
-        for (int pos = 0; pos < sendDelayedValues.length; pos++)
-            if (sendDelayedValues[pos] == send_delayed) {
-                spSendDelayed.setSelection(pos);
-                break;
-            }
+        swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false));
     }
 }
diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml
index 2740658ca8..dc61870616 100644
--- a/app/src/main/res/layout/fragment_options_send.xml
+++ b/app/src/main/res/layout/fragment_options_send.xml
@@ -100,6 +100,63 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swSuggestReceived" />
 
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swSendReminders"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:checked="true"
+            android:text="@string/title_advanced_send_reminders"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btnLocalContacts"
+            app:switchPadding="12dp" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvSendReminders"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="48dp"
+            android:text="@string/title_advanced_send_reminders_hint"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swSendReminders" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvSendDelayed"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="48dp"
+            android:text="@string/title_advanced_send_delayed"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvSendReminders" />
+
+        <Spinner
+            android:id="@+id/spSendDelayed"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:entries="@array/sendDelayedNames"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvSendDelayed" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvCaptionMessage"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:gravity="center"
+            android:text="@string/title_advanced_caption_message"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/spSendDelayed" />
+
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swPrefixOnce"
             android:layout_width="0dp"
@@ -109,7 +166,7 @@
             android:text="@string/title_advanced_prefix_once"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnLocalContacts"
+            app:layout_constraintTop_toBottomOf="@id/tvCaptionMessage"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
@@ -135,28 +192,6 @@
             app:layout_constraintTop_toBottomOf="@id/swExtendedReply"
             app:switchPadding="12dp" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swPlainOnly"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_advanced_plain_only"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swQuoteReply"
-            app:switchPadding="12dp" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swFormatFlowed"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_advanced_flow"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swPlainOnly"
-            app:switchPadding="12dp" />
-
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSignatureLocation"
             android:layout_width="0dp"
@@ -168,7 +203,7 @@
             android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swFormatFlowed" />
+            app:layout_constraintTop_toBottomOf="@id/swQuoteReply" />
 
         <Spinner
             android:id="@+id/spSignatureLocation"
@@ -179,40 +214,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSignatureLocation" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swUsenetSignature"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_advanced_usenet_signature"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/spSignatureLocation"
-            app:switchPadding="12dp" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvUsenetSignatureHint"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="48dp"
-            android:text="@string/title_advanced_usenet_hint"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swUsenetSignature" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swRemoveSignatures"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_advanced_remove_signatures"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvUsenetSignatureHint"
-            app:switchPadding="12dp" />
-
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swResizeImages"
             android:layout_width="0dp"
@@ -222,7 +223,7 @@
             android:text="@string/title_advanced_resize_images"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swRemoveSignatures"
+            app:layout_constraintTop_toBottomOf="@id/spSignatureLocation"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
@@ -255,28 +256,73 @@
             app:layout_constraintStart_toEndOf="@id/spAutoResize"
             app:layout_constraintTop_toTopOf="@id/spAutoResize" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvCaptionAdvanced"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:gravity="center"
+            android:text="@string/title_setup_advanced"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/spAutoResize" />
+
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swSendReminders"
+            android:id="@+id/swPlainOnly"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:checked="true"
-            android:text="@string/title_advanced_send_reminders"
+            android:text="@string/title_advanced_plain_only"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/spAutoResize"
+            app:layout_constraintTop_toBottomOf="@id/tvCaptionAdvanced"
+            app:switchPadding="12dp" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swFormatFlowed"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_flow"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swPlainOnly"
+            app:switchPadding="12dp" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swUsenetSignature"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_usenet_signature"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swFormatFlowed"
             app:switchPadding="12dp" />
 
         <eu.faircode.email.FixedTextView
-            android:id="@+id/tvSendReminders"
-            android:layout_width="wrap_content"
+            android:id="@+id/tvUsenetSignatureHint"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="48dp"
-            android:text="@string/title_advanced_send_reminders_hint"
+            android:text="@string/title_advanced_usenet_hint"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swSendReminders" />
+            app:layout_constraintTop_toBottomOf="@id/swUsenetSignature" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swRemoveSignatures"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_remove_signatures"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvUsenetSignatureHint"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swReceipt"
@@ -286,7 +332,7 @@
             android:text="@string/title_identity_receipt"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSendReminders"
+            app:layout_constraintTop_toBottomOf="@id/swRemoveSignatures"
             app:switchPadding="12dp" />
 
         <eu.faircode.email.FixedTextView
@@ -333,27 +379,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swLookupMx" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvSendDelayed"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="48dp"
-            android:text="@string/title_advanced_send_delayed"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvCheckMxHint" />
-
-        <Spinner
-            android:id="@+id/spSendDelayed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:entries="@array/sendDelayedNames"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSendDelayed" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c9e7f54116..7441b75665 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -302,6 +302,7 @@
     <string name="title_advanced_caption_general">General</string>
     <string name="title_advanced_caption_list">List</string>
     <string name="title_advanced_caption_conversation">Conversation</string>
+    <string name="title_advanced_caption_message">Message</string>
     <string name="title_advanced_caption_message_header">Message header</string>
     <string name="title_advanced_caption_message_body">Message body</string>