From 1839f072b4032924212294f66c62fadeaa0fb9f2 Mon Sep 17 00:00:00 2001
From: Michal Horejsek <horejsek@protonmail.com>
Date: Wed, 6 Jan 2021 10:31:45 +0100
Subject: [PATCH] Replace old INTERNALDATE

---
 internal/imap/mailbox_message.go | 6 ++++++
 unreleased.md                    | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/internal/imap/mailbox_message.go b/internal/imap/mailbox_message.go
index b76d7ea4..c66e254e 100644
--- a/internal/imap/mailbox_message.go
+++ b/internal/imap/mailbox_message.go
@@ -229,6 +229,12 @@ func (im *imapMailbox) getMessage(storeMessage storeMessageProvider, items []ima
 			}
 		case imap.FetchInternalDate:
 			msg.InternalDate = time.Unix(m.Time, 0)
+
+			// Apple Mail crashes fetching messages with date older than 1970.
+			// There is no point having message older than RFC itself, it's not possible.
+			if msg.InternalDate.Before(rfc822Birthday) {
+				msg.InternalDate = rfc822Birthday
+			}
 		case imap.FetchRFC822Size:
 			// Size attribute on the server counts encrypted data. The value is cleared
 			// on our part and we need to compute "real" size of decrypted data.
diff --git a/unreleased.md b/unreleased.md
index 3a1a1d9e..42167d67 100644
--- a/unreleased.md
+++ b/unreleased.md
@@ -9,9 +9,6 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 ### Removed
 
 ### Fixed
-* GODT-135 Support parameters in SMTP `FROM MAIL` command, such as `BODY=7BIT`, or empty value `FROM MAIL:<>` used by some clients.
-* GODT-338 GODT-781 GODT-857 GODT-866 Flaky tests.
-* GODT-773 Replace old dates with birthday of RFC822 to not crash Apple Mail. Original is available under `X-Original-Date` header.
 * GODT-922 Fix panic during restarting the bridge.
 * GODT-945 Fix panic in integration tests caused by concurrent map writes.
 * GODT-732 Fix usage of fontawesome.
@@ -24,3 +21,4 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 ### Changed
 * GODT-389 Prefer `From` header instead of `MAIL FROM` address.
 * GODT-898 Only set ContentID for inline attachments.
+* GODT-773 Replace `INTERNALDATE` older than birthday of RFC822 by birthday of RFC822 to not crash Apple Mail.