summaryrefslogtreecommitdiff
path: root/mail/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-21 10:18:54 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-21 10:18:54 -0300
commitcc40023ca0498609c37d37d42fa21e822e15dc6b (patch)
tree0eff8883fdbd26369f31788c4725f46f216b4afb /mail/src
parent2340415242569db4b54a4e6d2ebd2c8c3076bf7c (diff)
Default to UTF-8 when there is not charset parsed from the mail contents
Diffstat (limited to 'mail/src')
-rw-r--r--mail/src/leap/mail/imap/server.py2
1 files changed, 2 insertions, 0 deletions
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