From cc40023ca0498609c37d37d42fa21e822e15dc6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Mon, 21 Oct 2013 10:18:54 -0300
Subject: Default to UTF-8 when there is not charset parsed from the mail
 contents

---
 mail/src/leap/mail/imap/server.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mail/src/leap')

diff --git a/mail/src/leap/mail/imap/server.py b/mail/src/leap/mail/imap/server.py
index 10d338a1..df510ce4 100644
--- a/mail/src/leap/mail/imap/server.py
+++ b/mail/src/leap/mail/imap/server.py
@@ -711,6 +711,8 @@ class LeapMessage(WithMsgFields):
             # Miniparser for: Content-Type: <something>; charset=<charset>
             charset_re = r'''charset=(?P<charset>[\w|\d|-]*)'''
             charset = re.findall(charset_re, em["Content-Type"])[0]
+            if charset is None or len(charset) == 0:
+                charset = "UTF-8"
         except Exception:
             pass
         return charset
-- 
cgit v1.2.3