diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php
index db50c71a6d..76b1759286 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php
@@ -65,7 +65,9 @@ class Configuration
                 ->scalarNode('path')->defaultValue('%kernel.cache_dir%/swiftmailer/spool')->end()
             ->end()
             ->scalarNode('delivery_address')->end()
-            ->booleanNode('disable_delivery')->end();
+            ->booleanNode('disable_delivery')->end()
+            ->booleanNode('logging')->defaultValue(false)->end()
+        ;
 
         return $treeBuilder->buildTree();
     }
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
index faa183bbf2..35ae906ca6 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
+++ b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
@@ -93,7 +93,10 @@ class SwiftmailerExtension extends Extension
             }
         }
 
-        $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.messagelogger')));
+        if ($config['logging']) {
+            $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.messagelogger')));
+            $container->findDefinition('data_collector.swiftmailer')->addTag('data_collector', array('template' => 'SwiftmailerBundle:Collector:swiftmailer', 'id' => 'swiftmailer'));
+        }
 
         if (isset($config['delivery_address']) && $config['delivery_address']) {
             $container->setParameter('swiftmailer.single_address', $config['delivery_address']);
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/schema/swiftmailer-1.0.xsd b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/schema/swiftmailer-1.0.xsd
index 28800bf9bd..5dbb2e5dee 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/schema/swiftmailer-1.0.xsd
+++ b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/schema/swiftmailer-1.0.xsd
@@ -22,6 +22,7 @@
     <xsd:attribute name="type" type="xsd:string" />
     <xsd:attribute name="delivery-address" type="xsd:string" />
     <xsd:attribute name="disable-delivery" type="xsd:boolean" />
+    <xsd:attribute name="logging" type="xsd:string" />
   </xsd:complexType>
 
   <xsd:complexType name="spool">
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
index 2ed1498657..d1c9fdf6f9 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
+++ b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
@@ -68,8 +68,7 @@
 
     <service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" public="false" />
 
-    <service id="swiftmailer.data_collector" class="%swiftmailer.data_collector.class%" public="false">
-        <tag name="data_collector" template="SwiftmailerBundle:Collector:message" id="swiftmailer" />
+    <service id="data_collector.swiftmailer" class="%swiftmailer.data_collector.class%" public="false">
         <argument type="service" id="swiftmailer.plugin.messagelogger" />
         <argument type="service" id="swiftmailer.mailer" />
     </service>