From a989c3976bfed5f703cb18dc169793d755b57150 Mon Sep 17 00:00:00 2001
From: Vinay Keerthi <11478411+stonecharioteer@users.noreply.github.com>
Date: Wed, 17 Dec 2025 19:31:24 +0530
Subject: [PATCH] feat: preserve original email timestamp when importing emails

---
 app/mailboxes/imap/imap_mailbox.rb | 2 +-
 app/mailboxes/mailbox_helper.rb    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index 27bc88e06..f8c55339f 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -102,7 +102,7 @@ class Imap::ImapMailbox
           auto_reply: @processed_mail.auto_reply?,
           mail_subject: @processed_mail.subject,
           initiated_at: {
-            timestamp: Time.now.utc
+            timestamp: @processed_mail.date&.utc || Time.now.utc
           }
         }
       }
diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index 2b5fa1a26..3342775be 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -13,6 +13,7 @@ module MailboxHelper
       message_type: 'incoming',
       content_type: 'incoming_email',
       source_id: processed_mail.message_id,
+      created_at: processed_mail.date&.utc || Time.current,
       content_attributes: {
         email: processed_mail.serialized_data,
         cc_email: processed_mail.cc,