Move specification of UTF-8 charset to avoid breaking multipart messages (#630).

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 8489eed3352d34cb45e1bfa83bf6126d0d2b591a..dd20311afefee83ab331fb9adf0c1b9f5eee11b4 100644 (file)
--- 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 8d62e02c9c074fb6cd41284ec7ed4b00634ec9b5..39e724c6800cb81c68b8fcc975c4dc6b836c5ffb 100644 (file)
--- 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";
 
 ////////////////////////////////////////////////////////////////////////