diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
index 8e4eaaaaa9..57bfc1e555 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
@@ -50,8 +50,8 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
     private SwitchCompat swPrefixOnce;
     private SwitchCompat swExtendedReply;
     private SwitchCompat swQuoteReply;
-    private SwitchCompat swSignatureEnd;
     private SwitchCompat swPlainOnly;
+    private SwitchCompat swSignatureEnd;
     private SwitchCompat swUsenetSignature;
     private SwitchCompat swResizeImages;
     private SwitchCompat swResizeAttachments;
@@ -86,8 +86,8 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         swPrefixOnce = view.findViewById(R.id.swPrefixOnce);
         swExtendedReply = view.findViewById(R.id.swExtendedReply);
         swQuoteReply = view.findViewById(R.id.swQuoteReply);
-        swSignatureEnd = view.findViewById(R.id.swSignatureEnd);
         swPlainOnly = view.findViewById(R.id.swPlainOnly);
+        swSignatureEnd = view.findViewById(R.id.swSignatureEnd);
         swUsenetSignature = view.findViewById(R.id.swUsenetSignature);
         swResizeImages = view.findViewById(R.id.swResizeImages);
         swResizeAttachments = view.findViewById(R.id.swResizeAttachments);
@@ -154,13 +154,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
-        swSignatureEnd.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("signature_end", checked).apply();
-            }
-        });
-
         swPlainOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -168,6 +161,13 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
+        swSignatureEnd.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("signature_end", checked).apply();
+            }
+        });
+
         swUsenetSignature.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -291,8 +291,8 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         swPrefixOnce.setChecked(prefs.getBoolean("prefix_once", true));
         swExtendedReply.setChecked(prefs.getBoolean("extended_reply", false));
         swQuoteReply.setChecked(prefs.getBoolean("quote_reply", true));
-        swSignatureEnd.setChecked(prefs.getBoolean("signature_end", false));
         swPlainOnly.setChecked(prefs.getBoolean("plain_only", false));
+        swSignatureEnd.setChecked(prefs.getBoolean("signature_end", false));
         swUsenetSignature.setChecked(prefs.getBoolean("usenet_signature", false));
 
         swResizeImages.setChecked(prefs.getBoolean("resize_images", true));
diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml
index 01ef03974b..f73a39764b 100644
--- a/app/src/main/res/layout/fragment_options_send.xml
+++ b/app/src/main/res/layout/fragment_options_send.xml
@@ -119,17 +119,6 @@
             app:layout_constraintTop_toBottomOf="@id/swExtendedReply"
             app:switchPadding="12dp" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swSignatureEnd"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_advanced_signature_end"
-            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/swPlainOnly"
             android:layout_width="0dp"
@@ -138,7 +127,18 @@
             android:text="@string/title_advanced_plain_only"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swSignatureEnd"
+            app:layout_constraintTop_toBottomOf="@id/swQuoteReply"
+            app:switchPadding="12dp" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swSignatureEnd"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_signature_end"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swPlainOnly"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
@@ -149,7 +149,7 @@
             android:text="@string/title_advanced_usenet_signature"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swPlainOnly"
+            app:layout_constraintTop_toBottomOf="@id/swSignatureEnd"
             app:switchPadding="12dp" />
 
         <TextView