9a5d37cbc5be0bae532baafeb8df0616e10f3824 from master; add UTF-8 content type to KDM emails.

3 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9972399c8..17a774ab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-05-09  Carl Hetherington  <cth@carlh.net>
 
+	* Add UTF-8 content type to KDM emails to try to fix #549.
+
 	* Disable OK until a download succeeds in the certificate
 	downloader (#404).
 
diff --git a/TO_PORT b/TO_PORT
index 8db0f7a26..1379650b3 100644
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-01919a9e691375de4eb0069bc8cf179bee4dd7b6
 1d63d0309d071254fcf4da65d3710e94fadd38e8
 0c0211871d0be5b3409adfc88d2979ca5b439b0a
 wscript/cscript etc. cleanups
diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 3f88bbd9d..8949736f8 100644
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -253,6 +253,8 @@ email_kdms (
 		if (!Config::instance()->kdm_bcc().empty ()) {
 			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 ());