3 files changed, 5 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index 6716147d6c..afe2c68489 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -1052,8 +1052,6 @@ class ucp_pm extends ucp
 
 					if ($to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) && $to_userdata['user_active'])
 					{
-						$email_headers = 'From: ' . $config['board_email'] . "\nReturn-Path: " . $config['board_email'] . "\r\n";
-
 						$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($config['script_path']));
 						$script_name = ($script_name != '') ? $script_name . '/privmsg.'.$phpEx : 'privmsg.'.$phpEx;
 						$server_name = trim($config['server_name']);
@@ -1061,11 +1059,11 @@ class ucp_pm extends ucp
 						$server_port = ($config['server_port'] <> 80) ? ':' . trim($config['server_port']) . '/' : '/';
 
 						include($phpbb_root_path . 'includes/emailer.'.$phpEx);
-						$emailer = new emailer($config['smtp_delivery']);
+						$emailer = new emailer();
 
 						$emailer->use_template('privmsg_notify', $to_userdata['user_lang']);
-						$emailer->extra_headers($email_headers);
-						$emailer->email_address($to_userdata['user_email']);
+						$emailer->from($config['board_email']);
+						$emailer->to($to_userdata['user_email']);
 						$emailer->set_subject(); //$lang['Notification_subject']
 
 						$emailer->assign_vars(array(
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index fea23ccbe6..b217455cb9 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -216,7 +216,7 @@ class ucp_register extends ucp
 				if ($config['email_enable'])
 				{
 					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
-					$emailer = new emailer($config['smtp_delivery']);
+					$emailer = new emailer();
 				
 					$emailer->template($email_template, $user->data['user_lang']);
 					$emailer->replyto($config['board_contact']);
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index 25ee678b07..16101a95c3 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -58,7 +58,7 @@ class ucp_remind extends ucp
 					$db->sql_query($sql);
 
 					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
-					$emailer = new emailer($config['smtp_delivery']);
+					$emailer = new emailer();
 
 					$emailer->use_template('user_activate_passwd', $row['user_lang']);
 					$emailer->to($row['user_email']);