diff --git a/app/src/main/res/layout/dialog_buttons.xml b/app/src/main/res/layout/dialog_buttons.xml
index c22848b86e..2e5491bd28 100644
--- a/app/src/main/res/layout/dialog_buttons.xml
+++ b/app/src/main/res/layout/dialog_buttons.xml
@@ -31,45 +31,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTitle" />
 
-        <CheckBox
-            android:id="@+id/cbSeen"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_mail_24"
-            android:drawablePadding="6dp"
-            android:text="@string/title_toggle_seen"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvHint" />
-
-        <CheckBox
-            android:id="@+id/cbHide"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_visibility_off_24"
-            android:drawablePadding="6dp"
-            android:text="@string/title_toggle_hide"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbSeen" />
-
-        <CheckBox
-            android:id="@+id/cbImportance"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/baseline_arrow_upward_24"
-            android:drawablePadding="6dp"
-            android:text="@string/title_set_importance"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbHide" />
-
         <CheckBox
             android:id="@+id/cbJunk"
             android:layout_width="0dp"
@@ -81,7 +42,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbImportance" />
+            app:layout_constraintTop_toBottomOf="@id/tvHint" />
 
         <CheckBox
             android:id="@+id/cbTrash"
@@ -136,69 +97,69 @@
             app:layout_constraintTop_toBottomOf="@id/cbMove" />
 
         <CheckBox
-            android:id="@+id/cbNotes"
+            android:id="@+id/cbKeywords"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_sticky_note_2_24"
+            android:drawableEnd="@drawable/twotone_label_important_24"
             android:drawablePadding="6dp"
-            android:text="@string/title_edit_notes"
+            android:text="@string/title_keywords_btn"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbCopy" />
 
         <CheckBox
-            android:id="@+id/cbRule"
+            android:id="@+id/cbNotes"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_filter_alt_24"
+            android:drawableEnd="@drawable/twotone_sticky_note_2_24"
             android:drawablePadding="6dp"
-            android:text="@string/title_message_rule"
+            android:text="@string/title_edit_notes"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbNotes" />
+            app:layout_constraintTop_toBottomOf="@id/cbKeywords" />
 
         <CheckBox
-            android:id="@+id/cbKeywords"
+            android:id="@+id/cbSeen"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_label_important_24"
+            android:drawableEnd="@drawable/twotone_mail_24"
             android:drawablePadding="6dp"
-            android:text="@string/title_keywords_btn"
+            android:text="@string/title_toggle_seen"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbRule" />
+            app:layout_constraintTop_toBottomOf="@id/cbNotes" />
 
         <CheckBox
-            android:id="@+id/cbSearch"
+            android:id="@+id/cbHide"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_search_24"
+            android:drawableEnd="@drawable/twotone_visibility_off_24"
             android:drawablePadding="6dp"
-            android:text="@string/title_button_search"
+            android:text="@string/title_toggle_hide"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbKeywords" />
+            app:layout_constraintTop_toBottomOf="@id/cbSeen" />
 
         <CheckBox
-            android:id="@+id/cbSearchText"
+            android:id="@+id/cbImportance"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_manage_search_24"
+            android:drawableEnd="@drawable/baseline_arrow_upward_24"
             android:drawablePadding="6dp"
-            android:text="@string/title_button_search_text"
+            android:text="@string/title_set_importance"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbSearch" />
+            app:layout_constraintTop_toBottomOf="@id/cbHide" />
 
         <CheckBox
             android:id="@+id/cbTranslate"
@@ -211,7 +172,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbSearchText" />
+            app:layout_constraintTop_toBottomOf="@id/cbImportance" />
 
         <CheckBox
             android:id="@+id/cbForceLight"
@@ -226,6 +187,32 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbTranslate" />
 
+        <CheckBox
+            android:id="@+id/cbSearch"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:drawableEnd="@drawable/twotone_search_24"
+            android:drawablePadding="6dp"
+            android:text="@string/title_button_search"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbForceLight" />
+
+        <CheckBox
+            android:id="@+id/cbSearchText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:drawableEnd="@drawable/twotone_manage_search_24"
+            android:drawablePadding="6dp"
+            android:text="@string/title_button_search_text"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbSearch" />
+
         <CheckBox
             android:id="@+id/cbEvent"
             android:layout_width="0dp"
@@ -237,7 +224,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbForceLight" />
+            app:layout_constraintTop_toBottomOf="@id/cbSearchText" />
 
         <CheckBox
             android:id="@+id/cbShare"
@@ -303,5 +290,18 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbHeaders" />
+
+        <CheckBox
+            android:id="@+id/cbRule"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:drawableEnd="@drawable/twotone_filter_alt_24"
+            android:drawablePadding="6dp"
+            android:text="@string/title_message_rule"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbUnsubscribe" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index b185262562..3587af6a86 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -61,25 +61,15 @@
     </group>
 
     <group android:id="@+id/group_properties">
-        <item
-            android:id="@+id/menu_edit_notes"
-            android:icon="@drawable/twotone_sticky_note_2_24"
-            android:title="@string/title_edit_notes" />
-
-        <item
-            android:id="@+id/menu_create_rule"
-            android:icon="@drawable/twotone_filter_alt_24"
-            android:title="@string/title_create_rule" />
-
         <item
             android:id="@+id/menu_manage_keywords"
             android:icon="@drawable/twotone_label_important_24"
             android:title="@string/title_manage_keywords" />
 
         <item
-            android:id="@+id/menu_search_in_text"
-            android:icon="@drawable/twotone_manage_search_24"
-            android:title="@string/title_search_in_text" />
+            android:id="@+id/menu_edit_notes"
+            android:icon="@drawable/twotone_sticky_note_2_24"
+            android:title="@string/title_edit_notes" />
 
         <item
             android:id="@+id/menu_translate"
@@ -91,6 +81,16 @@
             android:checkable="true"
             android:icon="@drawable/twotone_light_mode_24"
             android:title="@string/title_force_light" />
+
+        <item
+            android:id="@+id/menu_search_in_text"
+            android:icon="@drawable/twotone_manage_search_24"
+            android:title="@string/title_search_in_text" />
+
+        <item
+            android:id="@+id/menu_create_rule"
+            android:icon="@drawable/twotone_filter_alt_24"
+            android:title="@string/title_create_rule" />
     </group>
 
     <group android:id="@+id/group_sharing">