diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 4d49856ff6..8f407740a6 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -186,11 +186,11 @@ public interface DaoMessage {
             " WHEN folder.type = '" + EntityFolder.OUTBOX + "' THEN 2" +
             " WHEN folder.type = '" + EntityFolder.DRAFTS + "' THEN 3" +
             " WHEN folder.type = '" + EntityFolder.SENT + "' THEN 4" +
-            " WHEN folder.type = '" + EntityFolder.SYSTEM + "' THEN 5" +
-            " WHEN folder.type = '" + EntityFolder.USER + "' THEN 6" +
-            " WHEN folder.type = '" + EntityFolder.ARCHIVE + "' THEN 7" +
-            " WHEN folder.type = '" + EntityFolder.TRASH + "' THEN 8" +
-            " WHEN folder.type = '" + EntityFolder.JUNK + "' THEN 9" +
+            " WHEN folder.type = '" + EntityFolder.ARCHIVE + "' THEN 5" +
+            " WHEN folder.type = '" + EntityFolder.TRASH + "' THEN 6" +
+            " WHEN folder.type = '" + EntityFolder.JUNK + "' THEN 7" +
+            " WHEN folder.type = '" + EntityFolder.SYSTEM + "' THEN 8" +
+            " WHEN folder.type = '" + EntityFolder.USER + "' THEN 9" +
             " ELSE 999 END")
         // The folder type sort order should match the duplicate algorithm
     DataSource.Factory<Integer, TupleMessageEx> pagedThread(long account, String thread, Long id, boolean ascending, boolean debug);