From a1d65da0bd9d29698737164b728baa9097a72198 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 16 Dec 2014 16:41:13 +0100 Subject: [PATCH] Convert to string only if necessary --- modoboa/extensions/amavis/sql_email.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modoboa/extensions/amavis/sql_email.py b/modoboa/extensions/amavis/sql_email.py index 4ef59808a..2722f09a8 100644 --- a/modoboa/extensions/amavis/sql_email.py +++ b/modoboa/extensions/amavis/sql_email.py @@ -42,7 +42,9 @@ class SQLemail(Email): if self._msg is None: qmails = get_connector().get_mail_content(self.mailid) mail_text = "".join([qm.mail_text for qm in qmails]) - self._msg = email.message_from_string(mail_text.encode("utf-8")) + if type(mail_text) is unicode: + mail_text = mail_text.encode("utf-8") + self._msg = email.message_from_string(mail_text) self._parse(self._msg) return self._msg