summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odoo/addons/base/models/ir_mail_server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/odoo/addons/base/models/ir_mail_server.py b/odoo/addons/base/models/ir_mail_server.py
index 8858fd3602c..e735c871708 100644
--- a/odoo/addons/base/models/ir_mail_server.py
+++ b/odoo/addons/base/models/ir_mail_server.py
@@ -283,11 +283,11 @@ class IrMailServer(models.Model):
email_body = ustr(body)
if subtype == 'html' and not body_alternative:
- msg.add_alternative(email_body, subtype=subtype, charset='utf-8')
msg.add_alternative(html2text.html2text(email_body), subtype='plain', charset='utf-8')
- elif body_alternative:
msg.add_alternative(email_body, subtype=subtype, charset='utf-8')
+ elif body_alternative:
msg.add_alternative(ustr(body_alternative), subtype=subtype_alternative, charset='utf-8')
+ msg.add_alternative(email_body, subtype=subtype, charset='utf-8')
else:
msg.set_content(email_body, subtype=subtype, charset='utf-8')