From 4666d21f63b844949d54004dbd8f57004beac14b Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Tue, 10 Nov 2020 17:26:24 +0100
Subject: [PATCH] email.message_from_string can also throw KeyError when
 'content-transfer-encoding' is absent

---
 app/email_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/email_utils.py b/app/email_utils.py
index 3fdff783..e0f89b1a 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -636,7 +636,7 @@ def copy(msg: Message) -> Message:
     try:
         # prefer the unicode way
         return email.message_from_string(msg.as_string())
-    except UnicodeEncodeError:
+    except (UnicodeEncodeError, ValueError):
         LOG.warning("as_string() fails, try to_bytes")
         return email.message_from_bytes(to_bytes(msg))