From 84b4c1108695ac0af1f582c0145537c11a9b4cf7 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Wed, 24 Mar 2021 10:08:11 +0100
Subject: [PATCH] handle UnicodeEncodeError in encode()

---
 app/email_utils.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/email_utils.py b/app/email_utils.py
index e4737776..384c1377 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -710,7 +710,12 @@ def to_bytes(msg: Message):
                 LOG.warning(
                     "as_bytes fails with SMTPUTF8 policy, try converting to string"
                 )
-                return msg.as_string().encode()
+                msg_string = msg.as_string()
+                try:
+                    return msg_string.encode()
+                except UnicodeEncodeError as e:
+                    LOG.w("can't encode msg, err:%s", e)
+                    return msg_string.encode(errors="replace")
 
 
 def should_add_dkim_signature(domain: str) -> bool: