diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index 54e5f0ff71..ca9a4cc659 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -277,7 +277,7 @@ else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id )
 	include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 	$emailer = new emailer($board_config['smtp_delivery']);
 
-	$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+	$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 	$emailer->use_template('group_request', $moderator['user_lang']);
 	$emailer->email_address($moderator['user_email']);
@@ -559,7 +559,7 @@ else if ( $group_id )
 					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 					$emailer = new emailer($board_config['smtp_delivery']);
 
-					$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+					$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 					$emailer->use_template('group_added', $row['user_lang']);
 					$emailer->email_address($row['user_email']);
@@ -714,7 +714,7 @@ else if ( $group_id )
 						include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 						$emailer = new emailer($board_config['smtp_delivery']);
 
-						$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\nBcc: " . $email_addresses . "\r\n";
+						$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\nBcc: " . $email_addresses . "\n";
 
 						$emailer->use_template('group_approved');
 						$emailer->email_address($userdata['user_email']);
diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php
index b95d719a0c..641f0f21ce 100755
--- a/phpBB/includes/emailer.php
+++ b/phpBB/includes/emailer.php
@@ -176,7 +176,7 @@ class emailer
 		//
 		// Add date and encoding type
 		//
-		$universal_extra = "MIME-Version: 1.0\r\nContent-type: text/plain; charset=" . $this->encoding . "\r\nContent-transfer-encoding: 8bit\r\nDate: " . gmdate('D, d M Y H:i:s', time()) . " UT\r\n";
+		$universal_extra = "MIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . gmdate('D, d M Y H:i:s', time()) . " UT\n";
 		$this->extra_headers = $universal_extra . $this->extra_headers; 
 
 		if ( $this->use_smtp )
diff --git a/phpBB/includes/functions_post.php b/phpBB/includes/functions_post.php
index 0df119c892..9de8b08fc9 100644
--- a/phpBB/includes/functions_post.php
+++ b/phpBB/includes/functions_post.php
@@ -630,7 +630,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 			$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
 			$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
 
-			$email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+			$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 			$update_watched_sql = '';
 			if ( $row = $db->sql_fetchrow($result) )
diff --git a/phpBB/includes/usercp_activate.php b/phpBB/includes/usercp_activate.php
index eaed7ec719..f8da8e13bf 100644
--- a/phpBB/includes/usercp_activate.php
+++ b/phpBB/includes/usercp_activate.php
@@ -62,7 +62,7 @@ if ( $row = $db->sql_fetchrow($result) )
 			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 			$emailer = new emailer($board_config['smtp_delivery']);
 
-			$email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+			$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 			$emailer->use_template('admin_welcome_activated', $row['user_lang']);
 			$emailer->email_address($row['user_email']);
diff --git a/phpBB/includes/usercp_email.php b/phpBB/includes/usercp_email.php
index 38330494fd..1b1a0569c2 100644
--- a/phpBB/includes/usercp_email.php
+++ b/phpBB/includes/usercp_email.php
@@ -94,11 +94,11 @@ if ( $result = $db->sql_query($sql) )
 					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 					$emailer = new emailer($board_config['smtp_delivery']);
 
-					$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
-					$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\r\n";
-					$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\r\n";
-					$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\r\n";
-					$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
+					$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\nFrom: " . $userdata['user_email'] . "\n";
+					$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
+					$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
+					$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
+					$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\n";
 
 					$emailer->use_template('profile_send_email', $user_lang);
 					$emailer->email_address($user_email);
@@ -117,7 +117,7 @@ if ( $result = $db->sql_query($sql) )
 
 					if ( !empty($HTTP_POST_VARS['cc_email']) )
 					{
-						$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
+						$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\nFrom: " . $userdata['user_email'] . "\n";
 						$emailer->use_template('profile_send_email');
 						$emailer->email_address($userdata['user_email']);
 						$emailer->set_subject($subject);
diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php
index 78210acc7e..1299b5e8f3 100644
--- a/phpBB/includes/usercp_register.php
+++ b/phpBB/includes/usercp_register.php
@@ -424,7 +424,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 				include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 				$emailer = new emailer($board_config['smtp_delivery']);
 
-				$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+				$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 				$emailer->use_template('user_activate', stripslashes($user_lang));
 				$emailer->email_address($email);
@@ -543,7 +543,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 			$emailer = new emailer($board_config['smtp_delivery']);
 
-			$email_headers = "From: " . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+			$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 			$emailer->use_template($email_template, stripslashes($user_lang));
 			$emailer->email_address($email);
diff --git a/phpBB/includes/usercp_sendpasswd.php b/phpBB/includes/usercp_sendpasswd.php
index 240d40a002..3290db6ee0 100644
--- a/phpBB/includes/usercp_sendpasswd.php
+++ b/phpBB/includes/usercp_sendpasswd.php
@@ -65,7 +65,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 			$emailer = new emailer($board_config['smtp_delivery']);
 
-			$email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+			$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 			$emailer->use_template('user_activate_passwd', $row['user_lang']);
 			$emailer->email_address($row['user_email']);
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index 70d87c1ed4..c2934369a5 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -1127,7 +1127,7 @@ else if ( $submit || $refresh || $mode != '' )
 
 			if ( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) && $to_userdata['user_active'] )
 			{
-				$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+				$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 				$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path']));
 				$script_name = ( $script_name != '' ) ? $script_name . '/privmsg.'.$phpEx : 'privmsg.'.$phpEx;