X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Femailer.cc;h=5e645457d32f8ed7b99ca4126ba14fb55767960d;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=78cbfea8d3fae2fddb67e8162ae98797ecf870fe;hpb=6c19b21e12f73ce63edd406ea617ff25bcc9bfea;p=dcpomatic.git

diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc
index 78cbfea8d..5e645457d 100644
--- a/src/lib/emailer.cc
+++ b/src/lib/emailer.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -44,6 +45,7 @@ Emailer::Emailer (string from, list<string> to, string subject, string body)
 	, _offset (0)
 {
 	boost::algorithm::replace_all (_body, "\n", "\r\n");
+	boost::algorithm::replace_all (_body, "\0", " ");
 }
 
 void
@@ -108,11 +110,11 @@ Emailer::send (string server, int port, string user, string password)
 	      << "From: " << _from << "\r\n";
 
 	if (!_cc.empty ()) {
-		email << "Cc: " << address_list (_cc);
+		email << "Cc: " << address_list (_cc) << "\r\n";
 	}
 
 	if (!_bcc.empty ()) {
-		email << "Bcc: " << address_list (_bcc);
+		email << "Bcc: " << address_list (_bcc) << "\r\n";
 	}
 
 	string const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";