From 0fe5375737a3190839475116ce6b6f4d86b38f67 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 2 Dec 2025 23:02:22 +0000
Subject: [PATCH] Add `Delivery-Date` on receipt, set `Date` on send if not set

---
 internal/smtpserver/session_local.go  | 5 +++++
 internal/smtpserver/session_remote.go | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/internal/smtpserver/session_local.go b/internal/smtpserver/session_local.go
index 5559498..0282b72 100644
--- a/internal/smtpserver/session_local.go
+++ b/internal/smtpserver/session_local.go
@@ -61,6 +61,11 @@ func (s *SessionLocal) Data(r io.Reader) error {
 			time.Now().String(),
 		),
 	)
+	if !m.Header.Has("Date") {
+		m.Header.Add(
+			"Date", time.Now().UTC().Format(time.RFC822),
+		)
+	}
 
 	var b bytes.Buffer
 	if err := m.WriteTo(&b); err != nil {
diff --git a/internal/smtpserver/session_remote.go b/internal/smtpserver/session_remote.go
index dcac8e8..26ee340 100644
--- a/internal/smtpserver/session_remote.go
+++ b/internal/smtpserver/session_remote.go
@@ -67,6 +67,9 @@ func (s *SessionRemote) Data(r io.Reader) error {
 			time.Now().String(),
 		),
 	)
+	m.Header.Add(
+		"Delivery-Date", time.Now().UTC().Format(time.RFC822),
+	)
 
 	var b bytes.Buffer
 	if err := m.WriteTo(&b); err != nil {