diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8e8c39c013..7a1d89a1d4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2189,7 +2189,7 @@ public class FragmentCompose extends FragmentBase {
                     // Select identity matching from address
                     Address from = null;
                     EntityIdentity selected = null;
-                    long aid = args.getLong("account", -1);
+                    long aid = args.getLong("account", ref == null ? -1 : ref.account);
                     long iid = args.getLong("identity", -1);
 
                     if (iid >= 0)