summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alot/message.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/alot/message.py b/alot/message.py
index 90b53ad9..02f3f803 100644
--- a/alot/message.py
+++ b/alot/message.py
@@ -194,13 +194,10 @@ def extract_body(mail):
body_parts = []
for part in mail.walk():
ctype = part.get_content_type()
- enc = part.get_content_charset()
+ enc = part.get_content_charset() or 'ascii'
raw_payload = part.get_payload(decode=True)
if part.get_content_maintype() == 'text':
- if enc:
- raw_payload = unicode(raw_payload, enc, errors='replace')
- else:
- raw_payload = unicode(raw_payload, errors='replace')
+ raw_payload = unicode(raw_payload, enc, errors='replace')
if ctype == 'text/plain':
body_parts.append(raw_payload)
else: