diff --git a/emencia/django/newsletter/models.py b/emencia/django/newsletter/models.py index bbdddef..c69670b 100644 --- a/emencia/django/newsletter/models.py +++ b/emencia/django/newsletter/models.py @@ -3,6 +3,7 @@ from smtplib import SMTPHeloError from datetime import datetime from datetime import timedelta +from email.header import Header from django.db import models from django.utils.encoding import smart_str @@ -138,7 +139,7 @@ def vcard_format(self): def mail_format(self): if self.first_name and self.last_name: - return '%s %s <%s>' % (self.last_name, self.first_name, self.email) + return Header('%s %s <%s>' % (self.last_name, self.first_name, self.email), 'utf-8').encode() return self.email mail_format.short_description = _('mail format') diff --git a/emencia/django/newsletter/utils/newsletter.py b/emencia/django/newsletter/utils/newsletter.py index 6ffb8fc..46e2b56 100644 --- a/emencia/django/newsletter/utils/newsletter.py +++ b/emencia/django/newsletter/utils/newsletter.py @@ -11,11 +11,12 @@ def body_insertion(content, insertion, end=False): if not content.startswith('