diff --git a/account_credit_control/__init__.py b/account_credit_control/__init__.py
index 5f37efe65..15a388665 100644
--- a/account_credit_control/__init__.py
+++ b/account_credit_control/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from . import mail
 from . import run
 from . import line
 from . import account
diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index 7afb553b1..46ce0a35b 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -75,7 +75,7 @@ class CreditControlLine(orm.Model):
         'partner_id': fields.many2one('res.partner', "Partner", required=True),
         'amount_due': fields.float('Due Amount Tax incl.', required=True, readonly=True),
         'balance_due': fields.float('Due balance', required=True, readonly=True),
-        'mail_message_id': fields.many2one('mail.message', 'Sent Email', readonly=True),
+        'mail_message_id': fields.many2one('mail.mail', 'Sent Email', readonly=True),
 
         'move_line_id': fields.many2one('account.move.line', 'Move line',
                                         required=True, readonly=True),
diff --git a/account_credit_control/mail.py b/account_credit_control/mail.py
new file mode 100644
index 000000000..24ce0faac
--- /dev/null
+++ b/account_credit_control/mail.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi, Guewen Baconnier
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm, fields
+
+class Mail(orm.Model):
+    _inherit = 'mail.mail'
+
+    # use HTML fields instead of text
+    _columns = {'body_html': fields.html('Rich-text Contents',
+                                         help="Rich-text/HTML message"),}
diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
index 31a6b88d3..be64414f6 100644
--- a/account_credit_control/wizard/credit_control_communication.py
+++ b/account_credit_control/wizard/credit_control_communication.py
@@ -56,7 +56,7 @@ class CreditCommunication(TransientModel):
         if isinstance(com_id, list):
             com_id = com_id[0]
         form = self.browse(cr, uid, com_id, context=context)
-        email = form.partner_id.id or False
+        email = form.partner_id.email or False
         return email
 
     def _get_credit_lines(self, cr, uid, line_ids, partner_id, level_id, context=None):
@@ -101,7 +101,7 @@ class CreditCommunication(TransientModel):
         """Generate email message using template related to level"""
         cr_line_obj = self.pool.get('credit.control.line')
         email_temp_obj = self.pool.get('email.template')
-        email_message_obj = self.pool.get('mail.message')
+        email_message_obj = self.pool.get('mail.mail')
         email_ids = []
         essential_fields = ['subject',
                             'body_html',
@@ -118,6 +118,8 @@ class CreditCommunication(TransientModel):
                                                          template,
                                                          comm.id,
                                                          context=context)
+            email_values['body_html'] = email_values['body']
+            email_values['type'] = 'email'
 
             email_id = email_message_obj.create(cr, uid, email_values, context=context)