diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index b961c9597..f3a98ee6e 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -108,12 +108,16 @@ class ServiceProvider extends ModuleServiceProvider
         /*
          * Override standard Mailer content with template
          */
-        Event::listen('mailer.register', function($provider, $mailer) {
-            $mailer->bindEvent('mailer.beforeAddContent', function($message, $view, $plain, $data){
-                if (MailTemplate::addContentToMailer($message, $view, $data))
-                    return false;
-            });
+        Event::listen('mailer.beforeAddContent', function($mailer, $message, $view, $plain, $data){
+            if (MailTemplate::addContentToMailer($message, $view, $data))
+                return false;
         });
+        // Event::listen('mailer.register', function($provider, $mailer) {
+        //     $mailer->bindEvent('mailer.beforeAddContent', function($message, $view, $plain, $data){
+        //         if (MailTemplate::addContentToMailer($message, $view, $data))
+        //             return false;
+        //     });
+        // });
 
         /*
          * Register other module providers