diff --git a/rhodecode/lib/smtp_mailer.py b/rhodecode/lib/rcmail/smtp_mailer.py
copy from rhodecode/lib/smtp_mailer.py
copy to rhodecode/lib/rcmail/smtp_mailer.py
--- a/rhodecode/lib/smtp_mailer.py
+++ b/rhodecode/lib/rcmail/smtp_mailer.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    rhodecode.lib.smtp_mailer
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
+    rhodecode.lib.rcmail.smtp_mailer
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Simple smtp mailer used in RhodeCode
 
@@ -24,17 +24,8 @@
 
 import logging
 import smtplib
-import mimetypes
 from socket import sslerror
-
-from email.mime.multipart import MIMEMultipart
-from email.mime.image import MIMEImage
-from email.mime.audio import MIMEAudio
-from email.mime.base import MIMEBase
-from email.mime.text import MIMEText
-from email.utils import formatdate
-from email import encoders
-
+from rhodecode.lib.rcmail.message import Message
 
 class SmtpMailer(object):
     """SMTP mailer class
@@ -62,10 +53,15 @@ class SmtpMailer(object):
         self.debug = debug
         self.auth = smtp_auth
 
-    def send(self, recipients=[], subject='', body='', attachment_files=None):
+
+    def send(self, recipients=[], subject='', body='', html='',
+             attachment_files=None):
 
         if isinstance(recipients, basestring):
             recipients = [recipients]
+        msg = Message(subject, recipients, body, html, self.mail_from)
+        raw_msg = msg.to_message()
+
         if self.ssl:
             smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port)
         else:
@@ -87,26 +83,7 @@ class SmtpMailer(object):
         if self.user and self.passwd:
             smtp_serv.login(self.user, self.passwd)
 
-        date_ = formatdate(localtime=True)
-        msg = MIMEMultipart()
-        msg.set_type('multipart/alternative')
-        msg.preamble = 'You will not see this in a MIME-aware mail reader.\n'
-
-        text_msg = MIMEText(body)
-        text_msg.set_type('text/plain')
-        text_msg.set_param('charset', 'UTF-8')
-
-        msg['From'] = self.mail_from
-        msg['To'] = ','.join(recipients)
-        msg['Date'] = date_
-        msg['Subject'] = subject
-
-        msg.attach(text_msg)
-
-        if attachment_files:
-            self.__atach_files(msg, attachment_files)
-
-        smtp_serv.sendmail(self.mail_from, recipients, msg.as_string())
+        smtp_serv.sendmail(msg.sender, msg.send_to, raw_msg.as_string())
         logging.info('MAIL SEND TO: %s' % recipients)
 
         try:
@@ -114,53 +91,3 @@ class SmtpMailer(object):
         except sslerror:
             # sslerror is raised in tls connections on closing sometimes
             pass
-
-    def __atach_files(self, msg, attachment_files):
-        if isinstance(attachment_files, dict):
-            for f_name, msg_file in attachment_files.items():
-                ctype, encoding = mimetypes.guess_type(f_name)
-                logging.info("guessing file %s type based on %s", ctype,
-                             f_name)
-                if ctype is None or encoding is not None:
-                    # No guess could be made, or the file is encoded
-                    # (compressed), so use a generic bag-of-bits type.
-                    ctype = 'application/octet-stream'
-                maintype, subtype = ctype.split('/', 1)
-                if maintype == 'text':
-                    # Note: we should handle calculating the charset
-                    file_part = MIMEText(self.get_content(msg_file),
-                                         _subtype=subtype)
-                elif maintype == 'image':
-                    file_part = MIMEImage(self.get_content(msg_file),
-                                          _subtype=subtype)
-                elif maintype == 'audio':
-                    file_part = MIMEAudio(self.get_content(msg_file),
-                                          _subtype=subtype)
-                else:
-                    file_part = MIMEBase(maintype, subtype)
-                    file_part.set_payload(self.get_content(msg_file))
-                    # Encode the payload using Base64
-                    encoders.encode_base64(msg)
-                # Set the filename parameter
-                file_part.add_header('Content-Disposition', 'attachment',
-                                     filename=f_name)
-                file_part.add_header('Content-Type', ctype, name=f_name)
-                msg.attach(file_part)
-        else:
-            raise Exception('Attachment files should be'
-                            'a dict in format {"filename":"filepath"}')
-
-    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):
-            return open(msg_file, "rb").read()
-        else:
-            # just for safe seek to 0
-            msg_file.seek(0)
-            return msg_file.read()
-