From 9c9f216294dd0a0a02f4be624215310809dcedc2 Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Sun, 8 Jun 2025 12:13:03 +0200
Subject: [PATCH] Skip card-is-ham override when sender address == recipient
 address (#1648)

---
 crates/email/src/message/ingest.rs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/crates/email/src/message/ingest.rs b/crates/email/src/message/ingest.rs
index e3ddbfe1..476f5849 100644
--- a/crates/email/src/message/ingest.rs
+++ b/crates/email/src/message/ingest.rs
@@ -204,17 +204,18 @@ impl EmailIngest for Server {
                             .and_then(|s| s.address())
                             .and_then(sanitize_email)
                         {
-                            if !self
-                                .store()
-                                .filter(
-                                    account_id,
-                                    Collection::ContactCard,
-                                    vec![Filter::eq(IDX_EMAIL, sender.into_bytes())],
-                                )
-                                .await
-                                .caused_by(trc::location!())?
-                                .results
-                                .is_empty()
+                            if sender != deliver_to
+                                && !self
+                                    .store()
+                                    .filter(
+                                        account_id,
+                                        Collection::ContactCard,
+                                        vec![Filter::eq(IDX_EMAIL, sender.into_bytes())],
+                                    )
+                                    .await
+                                    .caused_by(trc::location!())?
+                                    .results
+                                    .is_empty()
                             {
                                 is_spam = false;
                                 if self