diff --git a/rhodecode/lib/smtp_mailer.py b/rhodecode/lib/smtp_mailer.py
--- a/rhodecode/lib/smtp_mailer.py
+++ b/rhodecode/lib/smtp_mailer.py
@@ -2,9 +2,9 @@
 """
     rhodecode.lib.smtp_mailer
     ~~~~~~~~~~~~~~~~~~~~~~~~~
-    
+
     Simple smtp mailer used in RhodeCode
-    
+
     :created_on: Sep 13, 2010
     :copyright: (c) 2011 by marcink.
     :license: LICENSE_NAME, see LICENSE_FILE for more details.
@@ -25,18 +25,18 @@ from email import encoders
 
 class SmtpMailer(object):
     """SMTP mailer class
-    
+
     mailer = SmtpMailer(mail_from, user, passwd, mail_server, mail_port, ssl, tls)
-    mailer.send(recipients, subject, body, attachment_files)    
-    
+    mailer.send(recipients, subject, body, attachment_files)
+
     :param recipients might be a list of string or single string
-    :param attachment_files is a dict of {filename:location} 
-        it tries to guess the mimetype and attach the file 
-    
+    :param attachment_files is a dict of {filename:location}
+        it tries to guess the mimetype and attach the file
+
     """
 
     def __init__(self, mail_from, user, passwd, mail_server,
-                    mail_port=None, ssl=False, tls=False):
+                    mail_port=None, ssl=False, tls=False, debug=False):
 
         self.mail_from = mail_from
         self.mail_server = mail_server
@@ -45,7 +45,7 @@ class SmtpMailer(object):
         self.passwd = passwd
         self.ssl = ssl
         self.tls = tls
-        self.debug = False
+        self.debug = debug
 
     def send(self, recipients=[], subject='', body='', attachment_files=None):
 
@@ -132,7 +132,7 @@ class SmtpMailer(object):
     def get_content(self, msg_file):
         """Get content based on type, if content is a string do open first
         else just read because it's a probably open file object
-        
+
         :param msg_file:
         """
         if isinstance(msg_file, str):