diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 39d38e7c27..2031568213 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2283,6 +2283,12 @@ public class FragmentCompose extends FragmentBase {
                             if (identity.id.equals(iid)) {
                                 Log.i("Selected requested identity=" + iid);
                                 selected = identity;
+                                if (data.draft.from != null)
+                                    for (Address sender : data.draft.from)
+                                        if (identity.similarAddress(sender)) {
+                                            from = sender;
+                                            break;
+                                        }
                                 break;
                             }