diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
index 6132662cee..4a3612c423 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
+++ b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
@@ -63,6 +63,10 @@ class SwiftmailerExtension extends Extension
             $transport = $config['transport'];
         }
 
+        if ('smtp' === $transport) {
+            $loader->load('smtp.xml');
+        }
+
         $container->setParameter('swiftmailer.transport.name', $transport);
 
         $container->setAlias('swiftmailer.transport', 'swiftmailer.transport.'.$transport);
@@ -79,10 +83,10 @@ class SwiftmailerExtension extends Extension
         if (isset($config['spool'])) {
             $type = $config['spool']['type'];
 
+            $loader->load('spool.xml');
             $container->setAlias('swiftmailer.transport.real', 'swiftmailer.transport.'.$transport);
             $container->setAlias('swiftmailer.transport', 'swiftmailer.transport.spool');
             $container->setAlias('swiftmailer.spool', 'swiftmailer.spool.'.$type);
-            $container->getDefinition('swiftmailer.spool.file')->setArgument(0, '%swiftmailer.spool.file.path%');
 
             foreach (array('path') as $key) {
                 $container->setParameter('swiftmailer.spool.'.$type.'.'.$key, $config['spool'][$key]);
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/smtp.xml b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/smtp.xml
new file mode 100644
index 0000000000..da878ff378
--- /dev/null
+++ b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/smtp.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
+
+  <parameters>
+    <parameter key="swiftmailer.transport.smtp.class">Swift_Transport_EsmtpTransport</parameter>
+  </parameters>
+
+  <services>
+    <service id="swiftmailer.transport.smtp" class="%swiftmailer.transport.smtp.class%" public="false">
+      <argument type="service" id="swiftmailer.transport.buffer" />
+      <argument type="collection">
+        <argument type="service" id="swiftmailer.transport.authhandler" />
+      </argument>
+      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
+
+      <call method="setHost"><argument>%swiftmailer.transport.smtp.host%</argument></call>
+      <call method="setPort"><argument>%swiftmailer.transport.smtp.port%</argument></call>
+      <call method="setEncryption"><argument>%swiftmailer.transport.smtp.encryption%</argument></call>
+      <call method="setUsername"><argument>%swiftmailer.transport.smtp.username%</argument></call>
+      <call method="setPassword"><argument>%swiftmailer.transport.smtp.password%</argument></call>
+      <call method="setAuthMode"><argument>%swiftmailer.transport.smtp.auth_mode%</argument></call>
+    </service>
+  </services>
+</container>
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/spool.xml b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/spool.xml
new file mode 100644
index 0000000000..a86c716337
--- /dev/null
+++ b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/spool.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
+
+  <parameters>
+    <parameter key="swiftmailer.spool.file.class">Swift_FileSpool</parameter>
+
+    <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
+    <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
+  </parameters>
+
+  <services>
+    <service id="swiftmailer.transport.spool" class="Swift_Transport_SpoolTransport" public="false">
+      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
+      <argument type="service" id="swiftmailer.spool" />
+    </service>
+
+    <service id="swiftmailer.spool.file" class="%swiftmailer.spool.file.class%" public="false">
+      <argument>%swiftmailer.spool.file.path%</argument>
+    </service>
+
+    <service id="swiftmailer.spool" alias="swiftmailer.spool.file" public="false" />
+  </services>
+</container>
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
index 5ca479e9fd..5b556f3abd 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
+++ b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
@@ -7,12 +7,10 @@
   <parameters>
     <parameter key="swiftmailer.class">Swift_Mailer</parameter>
 
-    <parameter key="swiftmailer.transport.smtp.class">Swift_Transport_EsmtpTransport</parameter>
     <parameter key="swiftmailer.transport.sendmail.class">Swift_Transport_SendmailTransport</parameter>
     <parameter key="swiftmailer.transport.mail.class">Swift_Transport_MailTransport</parameter>
 
     <parameter key="swiftmailer.transport.failover.class">Swift_Transport_FailoverTransport</parameter>
-    <parameter key="swiftmailer.spool.file.class">Swift_FileSpool</parameter>
 
     <parameter key="swiftmailer.init_file">%swiftmailer.base_dir%/swift_init.php</parameter>
 
@@ -26,21 +24,6 @@
       <file>%swiftmailer.init_file%</file>
     </service>
 
-    <service id="swiftmailer.transport.smtp" class="%swiftmailer.transport.smtp.class%" public="false">
-      <argument type="service" id="swiftmailer.transport.buffer" />
-      <argument type="collection">
-        <argument type="service" id="swiftmailer.transport.authhandler" />
-      </argument>
-      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
-
-      <call method="setHost"><argument>%swiftmailer.transport.smtp.host%</argument></call>
-      <call method="setPort"><argument>%swiftmailer.transport.smtp.port%</argument></call>
-      <call method="setEncryption"><argument>%swiftmailer.transport.smtp.encryption%</argument></call>
-      <call method="setUsername"><argument>%swiftmailer.transport.smtp.username%</argument></call>
-      <call method="setPassword"><argument>%swiftmailer.transport.smtp.password%</argument></call>
-      <call method="setAuthMode"><argument>%swiftmailer.transport.smtp.auth_mode%</argument></call>
-    </service>
-
     <service id="swiftmailer.transport.sendmail" class="%swiftmailer.transport.sendmail.class%" public="false">
       <argument type="service" id="swiftmailer.transport.buffer" />
       <argument type="service" id="swiftmailer.transport.eventdispatcher" />
@@ -71,19 +54,10 @@
 
     <service id="swiftmailer.transport.replacementfactory" class="Swift_StreamFilters_StringReplacementFilterFactory" public="false" />
 
-    <service id="swiftmailer.transport.spool" class="Swift_Transport_SpoolTransport" public="false">
-      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
-      <argument type="service" id="swiftmailer.spool" />
-    </service>
-
     <service id="swiftmailer.transport.null" class="Swift_Transport_NullTransport" public="false">
       <argument type="service" id="swiftmailer.transport.eventdispatcher" />
     </service>
 
-    <service id="swiftmailer.spool.file" class="%swiftmailer.spool.file.class%" public="false">
-      <argument />
-    </service>
-
     <service id="swiftmailer.plugin.redirecting" class="%swiftmailer.plugin.redirecting.class%" public="false">
       <argument>%swiftmailer.single_address%</argument>
     </service>
@@ -91,7 +65,5 @@
     <service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />
 
     <service id="swiftmailer.transport" alias="swiftmailer.transport.smtp" public="false" />
-
-    <service id="swiftmailer.spool" alias="swiftmailer.spool.file" public="false" />
   </services>
 </container>