diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 63f18e25a5..43b3692002 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -239,7 +239,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
             @Override
             public void run() {
                 drawerLayout.closeDrawer(drawerContainer);
-                onMenuOrder(R.string.title_setup_reorder_accounts, EntityAccount.class);
+                onMenuOrder(R.string.title_setup_reorder_accounts, EntityAccount.class.getName());
             }
         }));
 
@@ -247,7 +247,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
             @Override
             public void run() {
                 drawerLayout.closeDrawer(drawerContainer);
-                onMenuOrder(R.string.title_setup_reorder_folders, TupleFolderSort.class);
+                onMenuOrder(R.string.title_setup_reorder_folders, TupleFolderSort.class.getName());
             }
         }).setSeparated());
 
@@ -552,13 +552,13 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
         }
     }
 
-    private void onMenuOrder(int title, Class clazz) {
+    private void onMenuOrder(int title, String className) {
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
             getSupportFragmentManager().popBackStack("order", FragmentManager.POP_BACK_STACK_INCLUSIVE);
 
         Bundle args = new Bundle();
         args.putInt("title", title);
-        args.putString("class", clazz.getName());
+        args.putString("class", className);
 
         FragmentOrder fragment = new FragmentOrder();
         fragment.setArguments(args);
@@ -2003,7 +2003,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
                 else if (ACTION_IMPORT_CERTIFICATE.equals(action))
                     onImportCertificate(intent);
                 else if (ACTION_SETUP_REORDER.equals(action))
-                    onMenuOrder(R.string.title_setup_reorder_accounts, EntityAccount.class);
+                    onMenuOrder(R.string.title_setup_reorder_accounts, intent.getStringExtra("className"));
                 else if (ACTION_SETUP_MORE.equals(action))
                     onSetupMore(intent);
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 6e8f580592..efd987431f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -120,7 +120,8 @@ public class FragmentSetup extends FragmentBase {
     private CardView cardExtra;
     private TextView tvExtra;
     private Button btnNotification;
-    private Button btnReorder;
+    private Button btnReorderAccounts;
+    private Button btnReorderFolders;
     private Button btnDelete;
     private Button btnApp;
     private Button btnMore;
@@ -199,7 +200,8 @@ public class FragmentSetup extends FragmentBase {
         cardExtra = view.findViewById(R.id.cardExtra);
         tvExtra = view.findViewById(R.id.tvExtra);
         btnNotification = view.findViewById(R.id.btnNotification);
-        btnReorder = view.findViewById(R.id.btnReorder);
+        btnReorderAccounts = view.findViewById(R.id.btnReorderAccounts);
+        btnReorderFolders = view.findViewById(R.id.btnReorderFolders);
         btnDelete = view.findViewById(R.id.btnDelete);
         btnApp = view.findViewById(R.id.btnApp);
         btnMore = view.findViewById(R.id.btnMore);
@@ -628,14 +630,25 @@ public class FragmentSetup extends FragmentBase {
             }
         });
 
-        btnReorder.setOnClickListener(new View.OnClickListener() {
+        btnReorderAccounts.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
-                lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SETUP_REORDER));
+            public void onClick(View v) {
+                LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(v.getContext());
+                lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SETUP_REORDER)
+                        .putExtra("className", EntityAccount.class.getName()));
             }
         });
 
+        btnReorderFolders.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(v.getContext());
+                lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SETUP_REORDER)
+                        .putExtra("className", TupleFolderSort.class.getName()));
+            }
+        });
+
+
         btnDelete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 4703b21fc8..72eef6cbb0 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -938,7 +938,7 @@
                     app:layout_constraintTop_toBottomOf="@id/btnNotification" />
 
                 <Button
-                    android:id="@+id/btnReorder"
+                    android:id="@+id/btnReorderAccounts"
                     style="?android:attr/buttonStyleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -949,6 +949,18 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNotificationHint" />
 
+                <Button
+                    android:id="@+id/btnReorderFolders"
+                    style="?android:attr/buttonStyleSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:drawableEnd="@drawable/twotone_reorder_24"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_setup_reorder_folders"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btnReorderAccounts" />
+
                 <Button
                     android:id="@+id/btnDelete"
                     style="?android:attr/buttonStyleSmall"
@@ -959,7 +971,7 @@
                     android:drawablePadding="6dp"
                     android:text="@string/title_delete_account"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnReorder" />
+                    app:layout_constraintTop_toBottomOf="@id/btnReorderFolders" />
 
                 <TextView
                     android:id="@+id/tvDeleteHint"
@@ -1053,7 +1065,7 @@
                     android:id="@+id/grpExtra"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    app:constraint_referenced_ids="btnNotification,tvNotificationHint,btnReorder,btnDelete,tvDeleteHint,btnApp,btnMore" />
+                    app:constraint_referenced_ids="btnNotification,tvNotificationHint,btnReorderAccounts,btnReorderFolders,btnDelete,tvDeleteHint,btnApp,btnMore" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>