diff --git a/src/receive_imf.rs b/src/receive_imf.rs index a146cb416..12b5e2d13 100644 --- a/src/receive_imf.rs +++ b/src/receive_imf.rs @@ -1682,6 +1682,13 @@ async fn apply_group_changes( if let Some(removed_addr) = mime_parser.get_header(HeaderDef::ChatGroupMemberRemoved) { removed_id = Contact::lookup_id_by_addr(context, removed_addr, Origin::Unknown).await?; + + better_msg = if removed_id == Some(from_id) { + Some(stock_str::msg_group_left_local(context, from_id).await) + } else { + Some(stock_str::msg_del_member_local(context, removed_addr, from_id).await) + }; + if let Some(contact_id) = removed_id { if allow_member_list_changes { // Remove a single member from the chat. @@ -1689,12 +1696,6 @@ async fn apply_group_changes( chat::remove_from_chat_contacts_table(context, chat_id, contact_id).await?; send_event_chat_modified = true; } - - better_msg = if contact_id == from_id { - Some(stock_str::msg_group_left_local(context, from_id).await) - } else { - Some(stock_str::msg_del_member_local(context, removed_addr, from_id).await) - }; } else { info!( context,