diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 8f407740a6..f4a4d39542 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.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" +
+            " WHEN folder.type = '" + EntityFolder.TRASH + "' THEN 5" +
+            " WHEN folder.type = '" + EntityFolder.JUNK + "' THEN 6" +
+            " WHEN folder.type = '" + EntityFolder.SYSTEM + "' THEN 7" +
+            " WHEN folder.type = '" + EntityFolder.USER + "' THEN 8" +
+            " WHEN folder.type = '" + EntityFolder.ARCHIVE + "' 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);
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index 8b39f2bb61..3c06301ad3 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -153,11 +153,11 @@ public class EntityFolder extends EntityOrder implements Serializable {
             OUTBOX,
             DRAFTS,
             SENT,
-            ARCHIVE,
             TRASH,
             JUNK,
             SYSTEM,
-            USER
+            USER,
+            ARCHIVE
     ));
 
     private static Map<String, String> GUESS_FOLDER_TYPE = new HashMap<String, String>() {{