From 330564fb55bd6c1c8787bfa488f24cab06af0757 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 21 Apr 2021 15:34:24 +0200
Subject: [PATCH] Convert mail Date header to user timezone when being
 displayed on forward/replay header

---
 mail/inc/class.mail_compose.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index de092666a2..7a7903316f 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2304,7 +2304,7 @@ class mail_compose
 			$this->sessionData['body']	= /*"<br>".*//*"&nbsp;".*/"<div>".'----------------'.lang("original message").'-----------------'."".'<br>'.
 				@htmlspecialchars(lang("from")).": ".$fromAddress."<br>".
 				$toAddress.$ccAddress.
-				@htmlspecialchars(lang("date").": ".$headers['DATE'],ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."<br>".
+				@htmlspecialchars(lang("date").": ".Mail::_strtotime($headers['DATE'],'r',true),ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."<br>".
 				'----------------------------------------------------------'."</div>";
 			$this->sessionData['mimeType'] 	= 'html';
 			if (!empty($styles)) $this->sessionData['body'] .= $styles;
@@ -2336,7 +2336,7 @@ class mail_compose
             $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
                 @htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
 				$toAddress.$ccAddress.
-				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n".
+				@htmlspecialchars(lang("date").": ".Mail::_strtotime($headers['DATE'],'r',true), ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n".
                 '-------------------------------------------------'."\r\n \r\n ";
 			$this->sessionData['mimeType']	= 'plain';