diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java
index 4a7b37447..c7f6ec84d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java
@@ -64,7 +64,8 @@ public class RecipientLoader extends AsyncTaskLoader<List<Recipient>> {
 
     private static final String SORT_ORDER = "" +
             ContactsContract.CommonDataKinds.Email.TIMES_CONTACTED + " DESC, " +
-            ContactsContract.Contacts.SORT_KEY_PRIMARY;
+            ContactsContract.Contacts.SORT_KEY_PRIMARY + "," +
+            ContactsContract.CommonDataKinds.Email.IS_SUPER_PRIMARY + " DESC";
 
     private static final String[] PROJECTION_NICKNAME = {
             ContactsContract.Data.CONTACT_ID,