Skip to content

Use latest received header in JMAP Email/import #2374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use latest received header in JMAP Email/import #2374

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80e59e7
Use latest received header when importing email
apexskier Nov 4, 2025
34c8378
Most recent received header
apexskier Nov 4, 2025
1411b4b
Move received_at handling into JMAP import
apexskier Nov 7, 2025
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
26 changes: 23 additions & 3 deletions crates/jmap/src/email/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use jmap_proto::{
request::MaybeInvalid,
types::state::State,
};
use mail_parser::MessageParser;
use mail_parser::{HeaderName, HeaderValue, MessageParser};
use std::future::Future;
use types::{acl::Acl, id::Id};
use utils::map::vec_map::VecMap;
Expand Down Expand Up @@ -143,15 +143,35 @@ impl EmailImport for Server {
}
};

let message = MessageParser::new().parse(&raw_message);

let received_at = email.received_at.map(|r| r.into()).or_else(|| {
message.clone().and_then(|msg| {
msg.root_part()
.headers()
.iter()
.filter_map(|header| {
if let (HeaderName::Received, HeaderValue::Received(received)) =
(&header.name, &header.value)
{
received.date.map(|dt| dt.to_timestamp() as u64)
} else {
None
}
})
.max()
})
});

// Import message
match self
.email_ingest(IngestEmail {
raw_message: &raw_message,
message: MessageParser::new().parse(&raw_message),
message,
access_token: import_access_token.as_deref().unwrap_or(access_token),
mailbox_ids,
keywords: email.keywords,
received_at: email.received_at.map(|r| r.into()),
received_at,
source: IngestSource::Jmap,
spam_classify: false,
spam_train: can_train_spam,
Expand Down