From 45f1da82fe19002bcbd8a1848acb5e6dbebc5056 Mon Sep 17 00:00:00 2001 From: link2xt Date: Mon, 11 Aug 2025 20:19:40 +0000 Subject: [PATCH] fix: take Chat-Group-Name into account when matching ad hoc groups --- src/receive_imf.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/receive_imf.rs b/src/receive_imf.rs index e036d1040..980fddead 100644 --- a/src/receive_imf.rs +++ b/src/receive_imf.rs @@ -2502,9 +2502,14 @@ async fn lookup_or_create_adhoc_group( .context("Cannot lookup address-contact by the From field")?; let grpname = mime_parser - .get_subject() - .map(|s| remove_subject_prefix(&s)) - .unwrap_or_else(|| "👥📧".to_string()); + .get_header(HeaderDef::ChatGroupName) + .map(|s| s.to_string()) + .unwrap_or_else(|| { + mime_parser + .get_subject() + .map(|s| remove_subject_prefix(&s)) + .unwrap_or_else(|| "👥📧".to_string()) + }); let to_ids: Vec = to_ids.iter().filter_map(|x| *x).collect(); let mut contact_ids = Vec::with_capacity(to_ids.len() + 1); contact_ids.extend(&to_ids);