summaryrefslogtreecommitdiff
path: root/src/leap/mail/imap/server.py
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
commit8fdaf603e313b9cb938f2f41713862e75f40d583 (patch)
tree13ced370d5b47d95039e41fa455da707739a3d18 /src/leap/mail/imap/server.py
parentb13bcda9e58a65102b9de72d36b95ade7178fd2c (diff)
Default to UTF-8 when there is not charset parsed from the mail contents
Diffstat (limited to 'src/leap/mail/imap/server.py')
-rw-r--r--src/leap/mail/imap/server.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/leap/mail/imap/server.py b/src/leap/mail/imap/server.py
index 10d338a..df510ce 100644
--- a/src/leap/mail/imap/server.py
+++ b/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