diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py
index 415973d3d..0c87330bc 100644
--- a/ietf/doc/views_draft.py
+++ b/ietf/doc/views_draft.py
@@ -1272,7 +1272,7 @@ def request_publication(request, name):
 
     m = Message()
     m.frm = request.user.person.formatted_email()
-    (m.to, m.cc) = gather_address_lists('pubreq_rfced',doc=doc)
+    (m.to, m.cc) = gather_address_lists('pubreq_rfced',doc=doc).as_strings()
     m.by = request.user.person
 
     next_state = State.objects.get(used=True, type="draft-stream-%s" % doc.stream.slug, slug="rfc-edit")
@@ -1302,7 +1302,7 @@ def request_publication(request, name):
             send_mail_message(request, m)
 
             # IANA copy
-            (m.to, m.cc) = gather_address_lists('pubreq_rfced_iana',doc=doc)
+            (m.to, m.cc) = gather_address_lists('pubreq_rfced_iana',doc=doc).as_strings()
             send_mail_message(request, m, extra=extra_automation_headers(doc))
 
             e = DocEvent(doc=doc, type="requested_publication", rev=doc.rev, by=request.user.person)
diff --git a/ietf/submit/mail.py b/ietf/submit/mail.py
index 1014ea6ea..43db7285e 100644
--- a/ietf/submit/mail.py
+++ b/ietf/submit/mail.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
+# Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -111,7 +111,7 @@ def announce_to_lists(request, submission):
             pass
     m.subject = 'I-D Action: %s-%s.txt' % (submission.name, submission.rev)
     m.frm = settings.IDSUBMIT_ANNOUNCE_FROM_EMAIL
-    (m.to, m.cc) = gather_address_lists('sub_announced',submission=submission)
+    (m.to, m.cc) = gather_address_lists('sub_announced',submission=submission).as_strings()
     if m.cc:
         m.reply_to = m.cc
     m.body = render_to_string('submit/announce_to_lists.txt',
@@ -133,7 +133,7 @@ def announce_new_wg_00(request, submission):
             pass
     m.subject = 'I-D Action: %s-%s.txt' % (submission.name, submission.rev)
     m.frm = settings.IDSUBMIT_ANNOUNCE_FROM_EMAIL
-    (m.to, m.cc) = gather_address_lists('sub_new_wg_00',submission=submission)
+    (m.to, m.cc) = gather_address_lists('sub_new_wg_00',submission=submission).as_strings()
     if m.cc:
         m.reply_to = m.cc
     m.body = render_to_string('submit/announce_to_lists.txt',
@@ -323,7 +323,8 @@ def submit_message_from_message(message,body,by=None):
             bcc = message.get('bcc',''),
             reply_to = message.get('reply_to',''),
             body = body,
-            time = utc_from_string(message.get('date', ''))
+            time = utc_from_string(message.get('date', '')),
+            content_type = message.get('content_type', 'text/plain'),
     )
     return msg