diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index 9b544a5cc2..37474c3d37 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -176,7 +176,8 @@ public interface DaoFolder {
     List<EntityFolder> getNotifyingFolders(long account);
 
     @Query("SELECT * FROM folder" +
-            " WHERE parent = :parent")
+            " WHERE parent = :parent" +
+            " ORDER BY name COLLATE NOCASE")
     List<EntityFolder> getChildFolders(long parent);
 
     @Query("SELECT folder.type" +