diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 691cf2198..bed490b4a 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -267,6 +267,10 @@
             <tag name="thelia.coupon.addCoupon"/>
         </service>
 
+        <service id="mailer" class="Thelia\Mailer\MailerFactory">
+            <argument type="service" id="event_dispatcher"/>
+        </service>
+
 
     </services>
 
diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index 19e62a400..8bf9aeec3 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -281,4 +281,13 @@ class BaseController extends ContainerAware
             $this->accessDenied();
         }
     }
+
+    /**
+     * @return \Swift_Mailer
+     */
+    public function getMailer()
+    {
+        $mailer = $this->container->get('mailer');
+        return $mailer->getSwiftMailer();
+    }
 }
diff --git a/core/lib/Thelia/Core/Event/MailTransporterEvent.php b/core/lib/Thelia/Core/Event/MailTransporterEvent.php
new file mode 100644
index 000000000..d47ac693f
--- /dev/null
+++ b/core/lib/Thelia/Core/Event/MailTransporterEvent.php
@@ -0,0 +1,52 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Event;
+
+
+/**
+ * Class MailTransporterEvent
+ * @package Thelia\Core\Event
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class MailTransporterEvent extends ActionEvent {
+    /**
+     * @var \Swift_Transport
+     */
+    protected $transporter;
+
+    public function setMailerTransporter(\Swift_Transport $transporter)
+    {
+        $this->transporter = $transporter;
+    }
+
+    public function getTransporter()
+    {
+        return $this->transporter;
+    }
+
+    public function hasTransporter()
+    {
+        return null !== $this->transporter;
+    }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 2867762aa..242fde4e4 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -430,4 +430,9 @@ final class TheliaEvents
     const BEFORE_DELETEFEATURE_AV = "action.before_deleteFeatureAv";
     const AFTER_DELETEFEATURE_AV  = "action.after_deleteFeatureAv";
 
+    /**
+     * sent when system find a mailer transporter.
+     */
+    const MAILTRANSPORTER_CONFIG = 'action.mailertransporter.config';
+
 }
diff --git a/core/lib/Thelia/Mailer/MailerFactory.php b/core/lib/Thelia/Mailer/MailerFactory.php
new file mode 100644
index 000000000..5cd952270
--- /dev/null
+++ b/core/lib/Thelia/Mailer/MailerFactory.php
@@ -0,0 +1,91 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Mailer;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Thelia\Core\Event\MailTransporterEvent;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Model\ConfigQuery;
+
+
+/**
+ * Class MailerFactory
+ * @package Thelia\Mailer
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class MailerFactory {
+    /**
+     * @var \Swift_Mailer
+     */
+    protected $swiftMailer;
+
+    protected $dispatcher;
+
+    public function _construct(EventDispatcherInterface $dispatcher)
+    {
+
+        $this->dispatcher = $dispatcher;
+
+        $transporterEvent = new MailTransporterEvent();
+        $this->dispatcher->dispatch(TheliaEvents::MAILTRANSPORTER_CONFIG, $transporterEvent);
+
+        if($transporterEvent->hasTransporter()) {
+            $transporter = $transporterEvent->getTransporter();
+        } else {
+            if (ConfigQuery::read("smtp.enabled")) {
+                $transporter = $this->configureSmtp();
+            } else {
+                $transporter = \Swift_MailTransport::newInstance();
+            }
+        }
+
+        $this->swiftMailer = new \Swift_Mailer($transporter);
+    }
+
+    private function configureSmtp()
+    {
+        $smtpTransporter = new \Swift_SmtpTransport();
+        $smtpTransporter->setHost(Configquery::read('smtp.host', 'localhost'))
+            ->setPort(ConfigQuery::read('smtp.host'))
+            ->setEncryption(ConfigQuery::read('smtp.encryption'))
+            ->setUsername(ConfigQuery::read('smtp.username'))
+            ->setPassword(ConfigQuery::read('smtp.password'))
+            ->setAuthMode(ConfigQuery::read('smtp.authmode'))
+            ->setTimeout(ConfigQuery::read('smtp.timeout', 30))
+            ->setSourceIp(ConfigQuery::read('smtp.sourceip'))
+        ;
+        return $smtpTransporter;
+    }
+
+    public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        $this->swiftMailer->send($message, $failedRecipients);
+    }
+
+    public function getSwiftMailer()
+    {
+        return $this->swiftMailer;
+    }
+
+
+}
\ No newline at end of file