summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-07-06 11:13:41 +0100
committerCarl Hetherington <cth@carlh.net>2015-07-06 11:13:41 +0100
commit70e3e1e04498c9777222142013b1793dd27a2442 (patch)
tree7b14835b25e48aca305a24d2557d1f86af268910 /src/lib
parent3bb6308d1b17aa643021bddc82e954029076f780 (diff)
Move specification of UTF-8 charset to avoid breaking multipart messages (#630).
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/kdm.cc2
-rw-r--r--src/lib/quickmail.cc2
2 files changed, 1 insertions, 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";
////////////////////////////////////////////////////////////////////////