From 70e3e1e04498c9777222142013b1793dd27a2442 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Jul 2015 11:13:41 +0100 Subject: [PATCH] Move specification of UTF-8 charset to avoid breaking multipart messages (#630). --- src/lib/kdm.cc | 2 -- src/lib/quickmail.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc index 8489eed33..dd20311af 100644 --- a/src/lib/kdm.cc +++ b/src/lib/kdm.cc @@ -254,8 +254,6 @@ email_kdms ( quickmail_add_bcc (mail, Config::instance()->kdm_bcc().c_str ()); } - quickmail_add_header (mail, "Content-Type: text/plain; charset=UTF-8"); - string body = Config::instance()->kdm_email().c_str(); boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ()); boost::algorithm::replace_all (body, "$START_TIME", start.str ()); diff --git a/src/lib/quickmail.cc b/src/lib/quickmail.cc index 8d62e02c9..39e724c68 100644 --- a/src/lib/quickmail.cc +++ b/src/lib/quickmail.cc @@ -40,7 +40,7 @@ #define MAILPART_END 5 #define MAILPART_DONE 6 -static const char* default_mime_type = "text/plain"; +static const char* default_mime_type = "text/plain; charset=UTF-8"; //////////////////////////////////////////////////////////////////////// -- 2.30.2