From 0c66576378b9a411d89220744dd280f4785dfdf3 Mon Sep 17 00:00:00 2001
From: Maurus Decimus <11444311+mdecimus@users.noreply.github.com>
Date: Thu, 23 Apr 2026 16:35:39 +0200
Subject: [PATCH] Fix: Invalid `receivedAt` headers after importing (fixes
 #2939)

---
 CHANGELOG.md                       | 2 ++
 crates/email/src/message/ingest.rs | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fc460de..30ae3da3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ This version includes **multiple breaking changes**. If you are upgrading from v
 ## Changed
 
 ## Fixed
+- JMAP:
+  - Invalid `receivedAt` headers after importing (#2939).
 - Reverse proxy issues.
 - OSS builds.
 - DNS Updater:
diff --git a/crates/email/src/message/ingest.rs b/crates/email/src/message/ingest.rs
index 5a840d98..219cfdb9 100644
--- a/crates/email/src/message/ingest.rs
+++ b/crates/email/src/message/ingest.rs
@@ -479,7 +479,10 @@ impl EmailIngest for Server {
                             if let (HeaderName::Received, HeaderValue::Received(received)) =
                                 (&header.name, &header.value)
                             {
-                                received.date.map(|dt| dt.to_timestamp() as u64)
+                                received
+                                    .date
+                                    .filter(|dt| dt.is_valid())
+                                    .map(|dt| dt.to_timestamp() as u64)
                             } else {
                                 None
                             }