2 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/message/form.php b/phpBB/includes/message/form.php
index 2da5406a63..13909e1938 100644
--- a/phpBB/includes/message/form.php
+++ b/phpBB/includes/message/form.php
@@ -39,7 +39,7 @@ abstract class phpbb_message_form
 
 		$this->errors = array();
 
-		$this->message = new phpbb_message($config['board_contact'], $config['server_name']);
+		$this->message = new phpbb_message($config['server_name']);
 		$this->message->set_sender_from_user($this->user);
 	}
 
diff --git a/phpBB/includes/message/message.php b/phpBB/includes/message/message.php
index b0948f940a..1e4f0f65d8 100644
--- a/phpBB/includes/message/message.php
+++ b/phpBB/includes/message/message.php
@@ -17,7 +17,6 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_message
 {
-	protected $board_contact;
 	protected $server_name;
 
 	protected $subject = '';
@@ -36,9 +35,8 @@ class phpbb_message
 
 	protected $recipients;
 
-	public function __construct($board_contact, $server_name)
+	public function __construct($server_name)
 	{
-		$this->board_contact = $board_contact;
 		$this->server_name = $server_name;
 	}
 
@@ -171,7 +169,7 @@ class phpbb_message
 			$messenger->subject(htmlspecialchars_decode($this->subject));
 
 			$messenger->assign_vars(array(
-				'BOARD_CONTACT'	=> $this->board_contact,
+				'BOARD_CONTACT'	=> generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin',
 				'TO_USERNAME'	=> htmlspecialchars_decode($recipient['to_name']),
 				'FROM_USERNAME'	=> htmlspecialchars_decode($this->sender_name),
 				'MESSAGE'		=> htmlspecialchars_decode($this->body))