diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index 31c877368b..768b11fd95 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -117,6 +117,9 @@ public class EntityIdentity {
         if (other == null)
             return false;
 
+        if (!other.contains("@") || !email.contains("@"))
+            return false;
+
         return other.equalsIgnoreCase(email);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 89dc3a0086..a37790f800 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2814,11 +2814,10 @@ public class FragmentCompose extends FragmentBase {
                                             preferred = (same == null ? similar : same);
                                         }
                                     }
-                                    if (preferred == null)
-                                        preferred = data.draft.from[0];
-                                    String from = ((InternetAddress) preferred).getAddress();
-                                    if (from != null && from.contains("@"))
+                                    if (preferred != null) {
+                                        String from = ((InternetAddress) preferred).getAddress();
                                         data.draft.extra = from.substring(0, from.indexOf("@"));
+                                    }
                                 }
                             }