diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php
index c23e9f6ddfbc6..cabc017db74ef 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php
@@ -71,5 +71,6 @@
 
         ->set('mailer.logger_message_listener', MessageLoggerListener::class)
             ->tag('kernel.event_subscriber')
+            ->deprecate('symfony/framework-bundle', '5.2', 'The "%service_id%" service is deprecated, use "mailer.message_logger_listener" instead.')
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php
index f6398c6e17994..5bc56faad5a05 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php
@@ -12,16 +12,21 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\Mailer\DataCollector\MessageDataCollector;
+use Symfony\Component\Mailer\EventListener\MessageLoggerListener;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('mailer.data_collector', MessageDataCollector::class)
             ->args([
-                service('mailer.logger_message_listener'),
+                service('mailer.message_logger_listener'),
             ])
-        ->tag('data_collector', [
-            'template' => '@WebProfiler/Collector/mailer.html.twig',
-            'id' => 'mailer',
-        ])
+            ->tag('data_collector', [
+                'template' => '@WebProfiler/Collector/mailer.html.twig',
+                'id' => 'mailer',
+            ])
+
+        ->set('mailer.message_logger_listener', MessageLoggerListener::class)
+            ->tag('kernel.event_subscriber')
+            ->tag('kernel.reset', ['method' => 'reset'])
     ;
 };