message_part = email.message_from_string(message_part.decode())
for header in message_part:
+ value = message_part[header]
+
+ # Make sure addresses are properly encoded
+ realname, address = email.utils.parseaddr(value)
+ if realname and address:
+ value = email.utils.formataddr((realname, address))
+
try:
- message.replace_header(header, message_part[header])
+ message.replace_header(header, value)
except KeyError:
- message.add_header(header, message_part[header])
+ message.add_header(header, value)
# Create a MIMEText object out of it
message_part = email.mime.text.MIMEText(