From acfde3cb7bd2becfa784dda7e997ef9ef4f14044 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Fri, 10 May 2024 21:29:09 +0000
Subject: [PATCH] fix: never treat message with Chat-Group-ID as a private
 reply

---
 src/receive_imf.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/receive_imf.rs b/src/receive_imf.rs
index 21c63558b..e1f7ce283 100644
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -1754,6 +1754,11 @@ async fn is_probably_private_reply(
         return Ok(false);
     }
 
+    // Message cannot be a private reply if it has an explicit Chat-Group-ID header.
+    if mime_parser.get_chat_group_id().is_some() {
+        return Ok(false);
+    }
+
     if !mime_parser.has_chat_version() {
         let chat_contacts = chat::get_chat_contacts(context, parent_chat_id).await?;
         if chat_contacts.len() == 2 && chat_contacts.contains(&ContactId::SELF) {