diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 3af588dea..25a1db130 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -14,7 +14,7 @@
       Dear ${object.contact_address.name or ''}
       <br/>
       <br/>
-      ${object.current_policy_level.custom_mail_text.replace('\n', '<br>') | safe}
+      ${object.current_policy_level.custom_mail_text | safe}
       ]]></field>
     </record>
 
diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index 0e2b03dfe..51bda55f2 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -239,7 +239,7 @@ class CreditControlPolicyLevel(models.Model):
     custom_text = fields.Text(string='Custom Message',
                               required=True,
                               translate=True)
-    custom_mail_text = fields.Text(string='Custom Mail Message',
+    custom_mail_text = fields.Html(string='Custom Mail Message',
                                    required=True, translate=True)
 
     _sql_constraint = [('unique level',