Handle encoding errors in headers gracefully.

- Issue #450

1 files changed, 6 insertions, 3 deletions

diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py
index eb12bd1d..b7c6d0ff 100644
--- a/service/pixelated/adapter/mailstore/leap_mailstore.py
+++ b/service/pixelated/adapter/mailstore/leap_mailstore.py
@@ -115,10 +115,13 @@ class LeapMail(Mail):
             return self.remove_duplicates([self._decoded_header_utf_8(v) for v in header_value])
         elif header_value is not None:
             def encode_chunk(content, encoding):
-                return unicode(content, encoding=encoding or 'ascii')
+                return unicode(content, encoding=encoding or 'ascii', errors='ignore')
 
-            encoded_chunks = [encode_chunk(content, encoding) for content, encoding in decode_header(header_value)]
-            return ' '.join(encoded_chunks)  # decode_header strips whitespaces on all chunks, joining over ' ' is only a workaround, not a proper fix
+            try:
+                encoded_chunks = [encode_chunk(content, encoding) for content, encoding in decode_header(header_value)]
+                return ' '.join(encoded_chunks)  # decode_header strips whitespaces on all chunks, joining over ' ' is only a workaround, not a proper fix
+            except UnicodeEncodeError:
+                return unicode(header_value.encode('ascii', errors='ignore'))
 
     def as_dict(self):
         return {