diff --git a/addons/account/data/mail_template_data.xml b/addons/account/data/mail_template_data.xml
index d0365929333..55518c79549 100644
--- a/addons/account/data/mail_template_data.xml
+++ b/addons/account/data/mail_template_data.xml
@@ -35,7 +35,7 @@ invoice
 % if object.origin:
 (with reference: ${object.origin})
 % endif
-amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>
+amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>
 from ${object.company_id.name}.
 </p>
 
diff --git a/addons/account/data/payment_receipt_data.xml b/addons/account/data/payment_receipt_data.xml
index 3190edfb151..d3c02413732 100644
--- a/addons/account/data/payment_receipt_data.xml
+++ b/addons/account/data/payment_receipt_data.xml
@@ -14,7 +14,7 @@
             <field name="lang">${object.partner_id.lang}</field>
             <field name="body_html" type="xml">
 <p>Dear ${object.partner_id.name},</p>
-<p>Thank you for your payment.<br />Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>
+<p>Thank you for your payment.<br />Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>
 <p>If you have any questions, please do not hesitate to contact us.</p>
 <p>Best regards,
 % if user and user.signature:
diff --git a/addons/l10n_be_invoice_bba/data/mail_template_data.xml b/addons/l10n_be_invoice_bba/data/mail_template_data.xml
index 1f52714dcd9..b7110f157e7 100644
--- a/addons/l10n_be_invoice_bba/data/mail_template_data.xml
+++ b/addons/l10n_be_invoice_bba/data/mail_template_data.xml
@@ -21,7 +21,7 @@ pro-forma invoice
 % if object.origin:
 (with reference: ${object.origin} )
 % endif
-amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>
+amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>
 from ${object.company_id.name}.
 </p>
 
diff --git a/addons/mrp_repair/data/mrp_repair_data.xml b/addons/mrp_repair/data/mrp_repair_data.xml
index 839b5729e23..8591b6bee7f 100644
--- a/addons/mrp_repair/data/mrp_repair_data.xml
+++ b/addons/mrp_repair/data/mrp_repair_data.xml
@@ -20,7 +20,7 @@
                 (with reference: ${object.origin} )
                 % endif
                 % if object.invoice_method != 'none':
-                amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}.</strong>
+                amounting in <strong>${format_amount(object.amount_total, object.pricelist_id.currency_id)}.</strong>
                 % endif
                 </p>
                 <p>You can reply to this email if you have any questions.</p>
diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml
index ecba11ce056..88270926646 100644
--- a/addons/purchase/data/mail_template_data.xml
+++ b/addons/purchase/data/mail_template_data.xml
@@ -28,7 +28,7 @@ Here is, in attachment, a ${object.state in ('draft', 'sent') and 'request for q
 % if object.origin:
     (RFQ origin: ${object.origin})
 % endif
-amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>
+amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>
 from ${object.company_id.name}.
 </p>
 
@@ -68,7 +68,7 @@ Please find in attachment a <strong>${object.state in ('draft', 'sent') and 'req
 % if object.origin:
     (RFQ origin: ${object.origin})
 % endif
-amounting <strong>${object.amount_total} ${object.currency_id.name}</strong>
+amounting <strong>${format_amount(object.amount_total, object.currency_id)}</strong>
 from ${object.company_id.name}.
 </p>
 
diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml
index e83ed891611..473da40a96c 100644
--- a/addons/sale/data/mail_template_data.xml
+++ b/addons/sale/data/mail_template_data.xml
@@ -36,7 +36,7 @@ the ${doc_name} <strong>${object.name}</strong>
 % if object.origin:
 (with reference: ${object.origin} )
 % endif
-amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong>
+amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>
 from ${object.company_id.name}.
 </p>