diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b96b6e3791e..52a931c9d20 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -129,7 +129,7 @@ class mail_message_common(osv.TransientModel):
             help="Type of message, usually 'html' or 'plain', used to select "\
                   "plain-text or rich-text contents accordingly"),
         'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
-        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
+        'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
         'body': fields.function(get_body, fnct_search = search_body, type='text',
             string='Message Content', store=True,
             help="Content of the message. This content equals the body_text field "\
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index bfbdd6103ef..0aa5261d7e7 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -42,7 +42,7 @@
                         </group>
                         <notebook>
                             <page string="Body (Rich)">
-                                <field name="body_html" widget="text_html"/>
+                                <field name="body_html"/>
                             </page>
                             <page string="Body (Plain)">
                                 <field name="body_text" widget="text"/>
@@ -133,7 +133,7 @@
                                 </group>
                                 <notebook>
                                     <page string="Body (Rich)">
-                                        <field name="body_html" widget="text_html"/>
+                                        <field name="body_html"/>
                                     </page>
                                     <page string="Body (Plain)">
                                         <field name="body_text" widget="text"/>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index ef3351ed123..73fb03cdc28 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -48,7 +48,7 @@
                         <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
                                 class="oe_mail_compose_message_body_text"/>
                         <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
-                                class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
+                                class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible"/>
                         <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
                                 placeholder="Add contacts to notify..."
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>