From e9f2b715749866414fc078b51250fb9df1623169 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Sun, 28 Apr 2024 18:02:51 +0200
Subject: [PATCH] Log RFC 2822 date parse error for #1554

---
 .../v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
index e90af817e..2666f55b5 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
@@ -37,11 +37,16 @@ abstract class DateTimeHelper
 	{
 		$sDateTime = \trim($sDateTime);
 		if (empty($sDateTime)) {
+			\SnappyMail\Log::info("No RFC 2822 date to parse");
 			return 0;
 		}
 
 		$sDateTime = \trim(\preg_replace('/ \([a-zA-Z0-9]+\)$/', '', $sDateTime));
 		$oDateTime = \DateTime::createFromFormat(\DateTime::RFC2822, $sDateTime, static::GetUtcTimeZoneObject());
+		// 398045302 is 1982-08-13 00:08:22 the date RFC 822 was created
+		if (!$oDateTime || 398045302 > $oDateTime->getTimestamp()) {
+			\SnappyMail\Log::notice("Failed to parse RFC 2822 date '{$sDateTime}'");
+		}
 		return $oDateTime ? $oDateTime->getTimestamp() : 0;
 	}