Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/gmail-header-case-insensitive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@googleworkspace/cli": patch
---

Fix Gmail reply header parsing to treat message header names as case-insensitive so recipients and threading metadata are preserved.
66 changes: 57 additions & 9 deletions crates/google-workspace-cli/src/helpers/gmail/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,15 @@ fn parse_message_headers(headers: &[Value]) -> ParsedMessageHeaders {
let name = header.get("name").and_then(|v| v.as_str()).unwrap_or("");
let value = header.get("value").and_then(|v| v.as_str()).unwrap_or("");

match name {
"From" => parsed.from = value.to_string(),
"Reply-To" => append_address_list_header_value(&mut parsed.reply_to, value),
"To" => append_address_list_header_value(&mut parsed.to, value),
"Cc" => append_address_list_header_value(&mut parsed.cc, value),
"Subject" => parsed.subject = value.to_string(),
"Date" => parsed.date = value.to_string(),
"Message-ID" | "Message-Id" => parsed.message_id = value.to_string(),
"References" => append_header_value(&mut parsed.references, value),
match name.to_ascii_lowercase().as_str() {
"from" => parsed.from = value.to_string(),
"reply-to" => append_address_list_header_value(&mut parsed.reply_to, value),
"to" => append_address_list_header_value(&mut parsed.to, value),
"cc" => append_address_list_header_value(&mut parsed.cc, value),
"subject" => parsed.subject = value.to_string(),
"date" => parsed.date = value.to_string(),
"message-id" => parsed.message_id = value.to_string(),
"references" => append_header_value(&mut parsed.references, value),
_ => {}
}
}
Expand Down Expand Up @@ -2427,6 +2427,54 @@ mod tests {
assert_eq!(original.body_html.as_deref(), Some("<p>HTML only</p>"));
}

#[test]
fn test_parse_original_message_accepts_case_insensitive_header_names() {
let msg = json!({
"threadId": "thread-case-1",
"snippet": "Snippet fallback",
"payload": {
"mimeType": "text/plain",
"headers": [
{ "name": "FROM", "value": "[email protected]" },
{ "name": "reply-to", "value": "[email protected]" },
{ "name": "TO", "value": "[email protected]" },
{ "name": "CC", "value": "[email protected]" },
{ "name": "subject", "value": "Case test" },
{ "name": "DATE", "value": "Fri, 6 Mar 2026 12:00:00 +0000" },
{ "name": "Message-Id", "value": "<[email protected]>" },
{ "name": "REFERENCES", "value": "<[email protected]>" },
{ "name": "references", "value": "<[email protected]>" }
],
"body": { "data": URL_SAFE.encode("Body text") }
}
});

let original = parse_original_message(&msg).unwrap();

assert_eq!(original.from.email, "[email protected]");
assert_eq!(original.message_id, "[email protected]");
assert_eq!(original.subject, "Case test");
assert_eq!(
original.date.as_deref(),
Some("Fri, 6 Mar 2026 12:00:00 +0000")
);
assert_eq!(original.to.len(), 1);
assert_eq!(original.to[0].email, "[email protected]");

let cc = original.cc.unwrap();
assert_eq!(cc.len(), 1);
assert_eq!(cc[0].email, "[email protected]");

let reply_to = original.reply_to.unwrap();
assert_eq!(reply_to.len(), 1);
assert_eq!(reply_to[0].email, "[email protected]");

assert_eq!(
original.references,
vec!["[email protected]", "[email protected]"]
);
}

#[test]
fn test_parse_original_message_multipart_alternative() {
let msg = json!({
Expand Down
Loading