Skip to content

Commit 33372be

Browse files
committed
Fix From/Sender handling in Emails
1 parent 88939b7 commit 33372be

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

EventListener/EnvelopeListener.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1515
use Symfony\Component\Mailer\Event\MessageEvent;
1616
use Symfony\Component\Mime\Address;
17+
use Symfony\Component\Mime\Message;
1718

1819
/**
1920
* Manipulates the Envelope of a Message.
@@ -43,6 +44,13 @@ public function onMessage(MessageEvent $event): void
4344
{
4445
if ($this->sender) {
4546
$event->getEnvelope()->setSender($this->sender);
47+
48+
$message = $event->getMessage();
49+
if ($message instanceof Message) {
50+
if (!$message->getHeaders()->has('Sender') && !$message->getHeaders()->has('From')) {
51+
$message->getHeaders()->addMailboxHeader('Sender', $this->sender->getAddress());
52+
}
53+
}
4654
}
4755

4856
if ($this->recipients) {

Transport/AbstractTransport.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
6363
$envelope = $event->getEnvelope();
6464
}
6565

66-
if (!$envelope->getRecipients()) {
67-
return null;
68-
}
69-
7066
$message = new SentMessage($message, $envelope);
7167
$this->doSend($message);
7268

0 commit comments

Comments
 (0)