From e766174fdd014256516e1c46bedecbbcc215eb48 Mon Sep 17 00:00:00 2001 From: Antonio Corroppoli Date: Fri, 14 Aug 2015 14:48:27 +0200 Subject: [PATCH] Fix UnicodeDecodeError in MessageAttachment headers --- django_mailbox/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/django_mailbox/models.py b/django_mailbox/models.py index eb096c8..7dffdf7 100644 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -261,7 +261,7 @@ class Mailbox(models.Model): msg.save() message_received.send(sender=self, message=msg) - + return msg def record_outgoing_message(self, message): @@ -736,7 +736,10 @@ class MessageAttachment(models.Model): if headers is None: return EmailMessage() if sys.version_info < (3, 0): - headers = headers.encode('utf-8') + try: + headers = headers.encode('utf-8') + except UnicodeDecodeError: + headers = unicode(headers, 'utf-8').encode('utf-8') return email.message_from_string(headers) def _set_dehydrated_headers(self, email_object):