diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java
index ee23549176..0081f778e1 100644
--- a/app/src/main/java/eu/faircode/email/DaoIdentity.java
+++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java
@@ -57,7 +57,8 @@ public interface DaoIdentity {
     @Query("SELECT identity.* FROM identity" +
             " JOIN account ON account.id = identity.account" +
             " WHERE identity.account = :account" +
-            " AND identity.synchronize AND account.synchronize")
+            " AND identity.synchronize AND account.synchronize" +
+            " ORDER BY identity.`primary` DESC, IFNULL(identity.display, identity.name)")
     List<EntityIdentity> getSynchronizingIdentities(long account);
 
     @Query("SELECT COUNT(*) FROM identity WHERE synchronize")