db/utils: handle mail with bogus encodings

I've run into this with misconfigured git-send-email messages, where the
encoding is utf-8, but the declared encoding is true or 8bit.

1 files changed, 5 insertions, 0 deletions

diff --git a/alot/db/utils.py b/alot/db/utils.py
index 88e2b0f2..ef51a8b5 100644
--- a/alot/db/utils.py
+++ b/alot/db/utils.py
@@ -366,6 +366,11 @@ def extract_body(mail, types=None, field_key='copiousoutput'):
             raw_payload = payload.encode('raw-unicode-escape')
             try:
                 payload = raw_payload.decode(enc)
+            except LookupError:
+                # In this case the email has an unknown encoding, fall back to
+                # guessing
+                enc = helper.guess_encoding(raw_payload)
+                payload = raw_payload.decode(enc)
             except UnicodeDecodeError:
                 pass
         elif cte != '7bit':