diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index ddbceae4de..73604d591b 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -484,28 +484,16 @@ class messenger
 			$use_queue = true;
 		}
 
+		$board_contact = (($config['board_contact_name']) ? '"' . mail_encode($config['board_contact_name']) . '" ' : '') . '<' . $config['board_contact'] . '>';
+
 		if (empty($this->replyto))
 		{
-			if ($config['board_contact_name'])
-			{
-				$this->replyto = '"' . mail_encode($config['board_contact_name']) . '" <' . $config['board_contact'] . '>';
-			}
-			else
-			{
-				$this->replyto = '<' . $config['board_contact'] . '>';
-			}
+			$this->replyto = $board_contact;
 		}
 
 		if (empty($this->from))
 		{
-			if ($config['board_contact_name'])
-			{
-				$this->from = '"' . mail_encode($config['board_contact_name']) . '" <' . $config['board_contact'] . '>';
-			}
-			else
-			{
-				$this->from = '<' . $config['board_contact'] . '>';
-			}
+			$this->from = $board_contact;
 		}
 
 		$encode_eol = ($config['smtp_delivery']) ? "\r\n" : $this->eol;
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5ca2c9ea45..696e82324c 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -525,7 +525,7 @@ $lang = array_merge($lang, array(
 	'CONTACT_EMAIL'					=> 'Contact email address',
 	'CONTACT_EMAIL_EXPLAIN'			=> 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in emails.',
 	'CONTACT_EMAIL_NAME'			=> 'Contact name',
-	'CONTACT_EMAIL_NAME_EXPLAIN'	=> 'This is the contact name that e-mail recipients see. Leave blank to just send the e-mail address',
+	'CONTACT_EMAIL_NAME_EXPLAIN'	=> 'This is the contact name that e-mail recipients will see. If you don’t want to have a contact name, leave this field empty.',
 	'EMAIL_FUNCTION_NAME'			=> 'Email function name',
 	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The email function used to send mails through PHP.',
 	'EMAIL_PACKAGE_SIZE'			=> 'Email package size',