From 0963049d1f64530a62a65adef4f008299bb7aa65 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Wed, 18 Nov 2020 10:03:58 +0100
Subject: [PATCH] use utf-8 when unknown charset in parseaddr_unicode()

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

diff --git a/app/email_utils.py b/app/email_utils.py
index b48f34c1..6506a075 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -630,6 +630,11 @@ def parseaddr_unicode(addr) -> (str, str):
             except UnicodeDecodeError:
                 LOG.warning("Cannot decode addr name %s", name)
                 name = ""
+            except LookupError:  # charset is unknown, e.g.
+                LOG.exception(
+                    "Cannot decode %s with %s, use utf-8", decoded_string, charset
+                )
+                name = decoded_string.decode("utf-8")
         else:
             name = decoded_string