From 1ba92ce862d72bf28db9f8ac806b7dc93ce78869 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 26 Nov 2014 19:35:46 +0100 Subject: [PATCH] Convert to string before calling the method. see #643 Conflicts: modoboa/extensions/amavis/sql_listing.py --- modoboa/extensions/amavis/sql_email.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modoboa/extensions/amavis/sql_email.py b/modoboa/extensions/amavis/sql_email.py index 6b804778e..4ef59808a 100644 --- a/modoboa/extensions/amavis/sql_email.py +++ b/modoboa/extensions/amavis/sql_email.py @@ -36,15 +36,13 @@ class SQLemail(Email): @property def msg(self): - """ - """ + """Get message's content.""" import email if self._msg is None: qmails = get_connector().get_mail_content(self.mailid) - self._msg = email.message_from_string( - "".join([qm.mail_text for qm in qmails]) - ) + mail_text = "".join([qm.mail_text for qm in qmails]) + self._msg = email.message_from_string(mail_text.encode("utf-8")) self._parse(self._msg) return self._msg