diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 3d21953c09..5c8865c98c 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -213,7 +213,9 @@ public class EntityMessage implements Serializable {
         if (identities != null && senders != null)
             for (Address sender : senders)
                 for (TupleIdentityEx identity : identities)
-                    if (identity.account == account && identity.similarAddress(sender))
+                    if (identity.account == account &&
+                            identity.self &&
+                            identity.similarAddress(sender))
                         return true;
 
         return false;