From be510ea1d773a4a3bc22fd35b13f09924c8511a6 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Wed, 18 Nov 2020 10:02:10 +0100
Subject: [PATCH] use utf-8 if unknown charset in get_header_unicode()

---
 app/email_utils.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/email_utils.py b/app/email_utils.py
index 9f0c9cbd..b3b747de 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -603,6 +603,11 @@ def get_header_unicode(header: str):
             return decoded_string.decode(charset)
         except UnicodeDecodeError:
             LOG.warning("Cannot decode header %s", header)
+        except LookupError:  # charset is unknown, e.g.
+            LOG.exception(
+                "Cannot decode %s with %s, use utf-8", decoded_string, charset
+            )
+            return decoded_string.decode("utf-8")
 
     return header