From 44690e8bfdf63e5b419f82a37ac8831668306a0d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Oct 2021 22:04:39 +0200
Subject: [PATCH] Prevent searching for self

---
 .../eu/faircode/email/AdapterMessage.java     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e690edd1f8..eb4109cadf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3856,24 +3856,30 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     if (folder == null)
                         return null;
 
+                    boolean ingoing = false;
                     boolean outgoing = EntityFolder.isOutgoing(folder.type);
 
                     if (message.identity != null) {
-                        if (message.from != null && message.from.length > 0) {
-                            EntityIdentity identity = db.identity().getIdentity(message.identity);
-                            if (identity == null)
-                                return null;
+                        EntityIdentity identity = db.identity().getIdentity(message.identity);
+                        if (identity == null)
+                            return null;
 
+                        if (message.to != null)
+                            for (Address recipient : message.to)
+                                if (identity.similarAddress(recipient)) {
+                                    ingoing = true;
+                                    break;
+                                }
+
+                        if (message.from != null)
                             for (Address sender : message.from)
                                 if (identity.similarAddress(sender)) {
                                     outgoing = true;
                                     break;
                                 }
-                        }
                     }
 
-                    if (outgoing && message.reply != null &&
-                            MessageHelper.equal(message.from, message.to))
+                    if (outgoing && ingoing && message.reply != null)
                         return message.reply;
 
                     return (outgoing ? message.to : message.from);