diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index dad41d3976..0996aba17a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -7004,6 +7004,20 @@ public class FragmentCompose extends FragmentBase {
 
             DB db = DB.getInstance(context);
 
+            if (auto_identity && to != null && to.length > 0) {
+                String email = ((InternetAddress) to[0]).getAddress();
+                List<Long> ids = null;
+                if (suggest_sent)
+                    ids = db.contact().getIdentities(email, EntityContact.TYPE_TO);
+                if (suggest_received && (ids == null || ids.size() == 0))
+                    ids = db.contact().getIdentities(email, EntityContact.TYPE_FROM);
+                if (ids != null && ids.size() == 1) {
+                    EntityIdentity identity = db.identity().getIdentity(ids.get(0));
+                    if (identity != null)
+                        return identity;
+                }
+            }
+
             if (from != null && from.length > 0) {
                 for (Address sender : from)
                     for (EntityIdentity identity : identities)
@@ -7036,20 +7050,6 @@ public class FragmentCompose extends FragmentBase {
                         }
             }
 
-            if (auto_identity && to != null && to.length > 0) {
-                String email = ((InternetAddress) to[0]).getAddress();
-                List<Long> ids = null;
-                if (suggest_sent)
-                    ids = db.contact().getIdentities(email, EntityContact.TYPE_TO);
-                if (suggest_received && (ids == null || ids.size() == 0))
-                    ids = db.contact().getIdentities(email, EntityContact.TYPE_FROM);
-                if (ids != null && ids.size() == 1) {
-                    EntityIdentity identity = db.identity().getIdentity(ids.get(0));
-                    if (identity != null)
-                        return identity;
-                }
-            }
-
             for (EntityIdentity identity : identities)
                 if (identity.account.equals(aid) && identity.primary) {
                     EntityLog.log(context, "Selected primary account/identity");