diff --git a/src/Symfony/Component/Mailer/Event/MessageEvent.php b/src/Symfony/Component/Mailer/Event/MessageEvent.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Mailer/Event/MessageEvent.php
+++ b/src/Symfony/Component/Mailer/Event/MessageEvent.php
@@ -16,7 +16,7 @@ use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mime\RawMessage;
 
 /**
- * Allows the transformation of a Message and the SMTP Envelope before the email is sent.
+ * Allows the transformation of a Message and the Envelope before the email is sent.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -45,12 +45,12 @@ final class MessageEvent extends Event
         $this->message = $message;
     }
 
-    public function getEnvelope(): SmtpEnvelope
+    public function getEnvelope(): Envelope
     {
         return $this->envelope;
     }
 
-    public function setEnvelope(SmtpEnvelope $envelope): void
+    public function setEnvelope(Envelope $envelope): void
     {
         $this->envelope = $envelope;
     }
[Mailer] Fix SmtpEnvelope renaming to Envelope