From 1cdaab901232a9ed7d5a0ad7974719b4bbfc1624 Mon Sep 17 00:00:00 2001
From: Tomash Khamlai <tomash.khamlai@gmail.com>
Date: Thu, 1 May 2025 18:34:54 +0700
Subject: [PATCH] Update \Magento\Email\Model\Transport::setReturnPath to use
 the existing logic defined in [Headers.php
 v6.4.19](https://github.com/symfony/mime/blob/v6.4.19/Header/Headers.php)

---
 app/code/Magento/Email/Model/Transport.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Email/Model/Transport.php b/app/code/Magento/Email/Model/Transport.php
index 6dcaf6a2ffd07..b46e4564e327f 100644
--- a/app/code/Magento/Email/Model/Transport.php
+++ b/app/code/Magento/Email/Model/Transport.php
@@ -242,11 +242,15 @@ public function sendMessage(): void
     private function setReturnPath(SymfonyMessage $email): void
     {
         if ($this->isSetReturnPath === 2 && $this->returnPathValue) {
-            $email->getHeaders()->addMailboxListHeader('Sender', [$this->returnPathValue]);
+            $email->getHeaders()->addMailboxHeader('Sender', $this->returnPathValue);
         } elseif ($this->isSetReturnPath === 1 &&
-            !empty($fromAddresses = $email->getHeaders()->get('From')?->getAddresses())) {
+            !empty(
+                /** @var \Symfony\Component\Mime\Address[] $fromAddresses */
+                $fromAddresses = $email->getHeaders()->get('From')?->getAddresses()
+            )
+        ) {
             reset($fromAddresses);
-            $email->getHeaders()->addMailboxListHeader('Sender', [current($fromAddresses)->getAddress()]);
+            $email->getHeaders()->addMailboxHeader('Sender', current($fromAddresses));
         }
     }