diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 8135406e02f..26303e01829 100755
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1058,7 +1058,7 @@
 						<page string="Email / SMS" attrs="{'invisible':[('state','=','python'),('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','client_action'), ('state','=','other')]}">
 							<separator colspan="4" string="Email Configuration"/>
 							<field name="address" domain="[('model_id','=',model_id)]"/>
-							<field name="message" select="2" colspan="4"/>
+							<field name="message" select="2" colspan="4" widget="html_tag"/>
 							<newline/>
 							<label colspan="4" string="Access all the fields related to the current object easily just by defining name of the attribute, i.e. [[partner_id.name]] for Invoice Object"/>
 						</page>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 724f546bc3d..03f3bde4bcb 100755
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -454,7 +454,6 @@ class actions_server(osv.osv):
                 
                 address = self.get_field_value(cr, uid, action, context)
                 body = self.merge_message(cr, uid, action, context)
-                #TODO : Apply Mail merge in to the Content of the Email
                 
                 if tools.email_send_attach(user, address, subject, body, debug=False) == True:
                     logger.notifyChannel('email', netsvc.LOG_INFO, 'Email successfully send to : %s' % (address))