diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index a0b44a5184..327d93f6df 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -163,8 +163,9 @@ public class EntityMessage implements Serializable {
     }
 
     boolean replySelf(List<TupleIdentityEx> identities) {
-        if (identities != null && from != null)
-            for (Address sender : from)
+        Address[] senders = (reply == null || reply.length == 0 ? from : reply);
+        if (identities != null && senders != null)
+            for (Address sender : senders)
                 for (TupleIdentityEx identity : identities)
                     if (identity.similarAddress(sender))
                         return true;