diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php
index cf9bd1683b..85b6829feb 100644
--- a/phpBB/admin/admin_mass_email.php
+++ b/phpBB/admin/admin_mass_email.php
@@ -117,11 +117,11 @@ if ( isset($HTTP_POST_VARS['submit']) )
 		$emailer = new emailer($board_config['smtp_delivery']);
 	
 		$email_headers = 'Return-Path: ' . $userdata['board_email'] . "\r\nFrom: " . $board_config['board_email'] . "\r\n";
-		$email_headers .= "Bcc: $bcc_list\r\n";
-		$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\r\n";
+		$email_headers .= 'X-AntiAbuse: Board servername - ' . $board_config['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 .= "Bcc: $bcc_list\r\n";
 
 		$emailer->use_template('admin_send_email');
 		$emailer->email_address($board_config['board_email']);