From 07c5e33bc4ba392b0a7a0bc6440bc21522247057 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Mon, 22 Jul 2019 18:19:55 +0000
Subject: [PATCH] Added conditional decoding of bytes subject text, before
 interpolating into a new unicode string.  - Legacy-Id: 16577

---
 ietf/utils/mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index 2b5ab23af..9392236ed 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -165,7 +165,7 @@ def copy_email(msg, to, toUser=False, originalBcc=None):
     # Overwrite the From: header, so that the copy from a development or
     # test server doesn't look like spam.
     new['From'] = settings.DEFAULT_FROM_EMAIL
-    new['Subject'] = '[Django %s] %s' % (settings.SERVER_MODE, msg.get('Subject', '[no subject]'))
+    new['Subject'] = '[Django %s] %s' % (settings.SERVER_MODE, force_text(msg.get('Subject', '[no subject]')))
     new['To'] = to
     send_smtp(new)