diff --git a/app/src/main/java/eu/faircode/email/TupleFolderEx.java b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
index 7d4c0f3fb2..c2b28cbeb3 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
@@ -74,11 +74,17 @@ public class TupleFolderEx extends EntityFolder implements Serializable {
                 else if (f2.accountName == null)
                     return -1;
 
-                int o = Integer.compare(
+                int fo = Integer.compare(
+                        f1.order == null ? -1 : f1.order,
+                        f2.order == null ? -1 : f2.order);
+                if (fo != 0)
+                    return fo;
+
+                int ao = Integer.compare(
                         f1.accountOrder == null ? -1 : f1.accountOrder,
                         f2.accountOrder == null ? -1 : f2.accountOrder);
-                if (o != 0)
-                    return o;
+                if (ao != 0)
+                    return ao;
 
                 int a = collator.compare(f1.accountName, f2.accountName);
                 if (a != 0)
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderNav.java b/app/src/main/java/eu/faircode/email/TupleFolderNav.java
index 5d9d08ed1e..4c640ca2d2 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderNav.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderNav.java
@@ -54,11 +54,17 @@ public class TupleFolderNav extends EntityFolder implements Serializable {
                 else if (f2.accountName == null)
                     return -1;
 
-                int o = Integer.compare(
+                int fo = Integer.compare(
+                        f1.order == null ? -1 : f1.order,
+                        f2.order == null ? -1 : f2.order);
+                if (fo != 0)
+                    return fo;
+
+                int ao = Integer.compare(
                         f1.accountOrder == null ? -1 : f1.accountOrder,
                         f2.accountOrder == null ? -1 : f2.accountOrder);
-                if (o != 0)
-                    return o;
+                if (ao != 0)
+                    return ao;
 
                 int a = collator.compare(f1.accountName, f2.accountName);
                 if (a != 0)
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderSort.java b/app/src/main/java/eu/faircode/email/TupleFolderSort.java
index 739bb8f305..442ef59b0a 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderSort.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderSort.java
@@ -55,11 +55,17 @@ public class TupleFolderSort extends EntityFolder {
                 else if (f2.accountName == null)
                     return -1;
 
-                int o = Integer.compare(
+                int fo = Integer.compare(
+                        f1.order == null ? -1 : f1.order,
+                        f2.order == null ? -1 : f2.order);
+                if (fo != 0)
+                    return fo;
+
+                int ao = Integer.compare(
                         f1.accountOrder == null ? -1 : f1.accountOrder,
                         f2.accountOrder == null ? -1 : f2.accountOrder);
-                if (o != 0)
-                    return o;
+                if (ao != 0)
+                    return ao;
 
                 int a = collator.compare(f1.accountName, f2.accountName);
                 if (a != 0)