diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java
index 08507c4e3e..47677a8116 100644
--- a/app/src/main/java/eu/faircode/email/DaoIdentity.java
+++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java
@@ -70,8 +70,8 @@ public interface DaoIdentity {
     @Query("UPDATE identity SET error = :error WHERE id = :id")
     int setIdentityError(long id, String error);
 
-    @Query("UPDATE identity SET `primary` = 0")
-    void resetPrimary();
+    @Query("UPDATE identity SET `primary` = 0 WHERE account = :account")
+    void resetPrimary(long account);
 
     @Query("UPDATE identity SET tbd = 1 WHERE id = :id")
     int setIdentityTbd(long id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8829d6d570..077b51d155 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1285,7 +1285,9 @@ public class FragmentCompose extends FragmentEx {
                     }
 
                     // Select identity matching from address
+                    int icount = 0;
                     String from = null;
+                    EntityIdentity first = null;
                     EntityIdentity primary = null;
                     if (result.draft.from != null && result.draft.from.length > 0)
                         from = Helper.canonicalAddress(((InternetAddress) result.draft.from[0]).getAddress());
@@ -1296,14 +1298,24 @@ public class FragmentCompose extends FragmentEx {
                             result.draft.from = new InternetAddress[]{new InternetAddress(identity.email, identity.name)};
                             break;
                         }
-                        if (identity.primary)
-                            primary = identity;
+                        if (identity.account.equals(result.draft.account)) {
+                            icount++;
+                            if (identity.primary)
+                                primary = identity;
+                            if (first == null)
+                                first = identity;
+                        }
                     }
 
                     // Select primary identity
-                    if (result.draft.identity == null && primary != null) {
-                        result.draft.identity = primary.id;
-                        result.draft.from = new InternetAddress[]{new InternetAddress(primary.email, primary.name)};
+                    if (result.draft.identity == null) {
+                        if (primary != null) {
+                            result.draft.identity = primary.id;
+                            result.draft.from = new InternetAddress[]{new InternetAddress(primary.email, primary.name)};
+                        } else if (first != null && icount == 1) {
+                            result.draft.identity = first.id;
+                            result.draft.from = new InternetAddress[]{new InternetAddress(first.email, first.name)};
+                        }
                     }
 
                     result.draft.sender = MessageHelper.getSortKey(result.draft.from);
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 1443e5d7e1..d745cd2bb8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -551,7 +551,7 @@ public class FragmentIdentity extends FragmentEx {
                             identity.error = null;
 
                             if (identity.primary)
-                                db.identity().resetPrimary();
+                                db.identity().resetPrimary(account);
 
                             if (update)
                                 db.identity().updateIdentity(identity);