symfony
diff --git a/‎src/Symfony/Component/Mailer/Mailer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Mailer.php
+5-8Lines changed: 5 additions & 8 deletions b/‎src/Symfony/Component/Mailer/Mailer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Mailer.php
+5-8Lines changed: 5 additions & 8 deletions
@@ -45,27 +45,24 @@ public function send(RawMessage $message, Envelope $envelope = null): void
             return;
         }
 
-        $clonedMessage = clone $message;
-
-        // When dispatching a message using messenger, we clear the context to prevent serialization errors
-        if ($clonedMessage instanceof TemplatedEmail) {
-            $clonedMessage->context([]);
-        }
-        $clonedEnvelope = null !== $envelope ? clone $envelope : Envelope::create($clonedMessage);
-
         $stamps = [];
         if (null !== $this->dispatcher) {
             // The dispatched event here has `queued` set to `true`; the goal is NOT to render the message, but to let
             // listeners do something before a message is sent to the queue.
             // We are using a cloned message as we still want to dispatch the **original** message, not the one modified by listeners.
             // That's because the listeners will run again when the email is sent via Messenger by the transport (see `AbstractTransport`).
             // Listeners should act depending on the `$queued` argument of the `MessageEvent` instance.
+            $clonedMessage = clone $message;
+            $clonedEnvelope = null !== $envelope ? clone $envelope : Envelope::create($clonedMessage);
             $event = new MessageEvent($clonedMessage, $clonedEnvelope, (string) $this->transport, true);
             $this->dispatcher->dispatch($event);
             $stamps = $event->getStamps();
         }
 
         try {
+            if ($message instanceof TemplatedEmail) {
+                $message->context([]);
+            }
             $this->bus->dispatch(new SendEmailMessage($message, $envelope), $stamps);
         } catch (HandlerFailedException $e) {
             foreach ($e->getNestedExceptions() as $nested) {