diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index c37b186946..13d3e20e1a 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -342,14 +342,15 @@ function mcp_warn_user_view($id, $mode, $action)
 
 	$sql_where = ($user_id) ? "user_id = $user_id" : "username = '" . $db->sql_escape($username) . "'";
 
-	$sql = 'SELECT * FROM ' . USERS_TABLE . " WHERE $sql_where";
+/*	$sql = 'SELECT * FROM ' . USERS_TABLE . " WHERE $sql_where";
 	$result = $db->sql_query($sql);
 
 	if (!$userrow = $db->sql_fetchrow($result))
 	{
 		trigger_error($user->lang['NO_USER']);
 	}
-	$db->sql_freeresult($result);
+	$db->sql_freeresult($result);*/
+	$userrow = get_userdata($user_id);
 
 	$user_id = $userrow['user_id'];
 
@@ -390,29 +391,38 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0)
 	if ($send_pm)
 	{
 		include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
+		include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
+
+		$userrow['user_lang'] = (file_exists($phpbb_root_path . 'language/' . $userrow['user_lang'] . "/mcp.$phpEx")) ? $userrow['user_lang'] : $config['default_lang'];
+		include($phpbb_root_path . 'language/' . $userrow['user_lang'] . "/mcp.$phpEx");
+
+		$message_parser = new parse_message();
+		$message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning);
+		$message_md5 = md5($message_parser->message);
+		$message_parser->parse(false, true, true, true, false, false, true);
 
 		$pm_data = array(
 			'from_user_id'			=> $user->data['user_id'],
 			'from_user_ip'			=> $user->data['user_ip'],
 			'from_username'			=> $user->data['username'],
 			'enable_sig'			=> false,
-			'enable_bbcode'			=> false,
+			'enable_bbcode'			=> true,
 			'enable_html' 			=> false,
-			'enable_smilies'		=> false,
+			'enable_smilies'		=> true,
 			'enable_urls'			=> false,
 			'icon_id'				=> 0,
-			'message_md5'			=> 0,
-			'bbcode_bitfield'		=> 0,
-			'bbcode_uid'			=> '',
-			'message'				=> $warning, // TODO: The message sent to the user should either be templated from the language pack or set in the board config
+			'message_md5'			=> (int) $message_md5,
+			'bbcode_bitfield'		=> (int) $message_parser->bbcode_bitfield,
+			'bbcode_uid'			=> $message_parser->bbcode_uid,
+			'message'				=> $message_parser->message,
 			'address_list'			=> array('u' => array($userrow['user_id'] => 'to')),
 		);
 
-		submit_pm('post', 'Warning Issued', $pm_data, false, false); // TODO: The topic should either be in the language of the recipient or set in the board config
+		submit_pm('post', $lang['WARNING_PM_SUBJECT'], $pm_data, false, false);
 	}
 
 	add_log('admin', 'LOG_USER_WARNING', $userrow['username']);
-	add_log('user', $userrow['user_id'], 'LOG_USER_GENERAL', $warning); // TODO: Need a relevant language entry for this such that it is displayed as a warning in the notes
+	add_log('user', $userrow['user_id'], 'LOG_USER_WARNING_BODY', $warning);
 
 	$sql_ary = array(
 		'user_id'		=> $userrow['user_id'],
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 0483dd4286..b82cdb86a7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -218,6 +218,7 @@ $lang = array_merge($lang, array(
 	'LOG_USER_FEEDBACK'		=> '<b>Added user feedback</b><br />&#187; %s',
 	'LOG_USER_GENERAL'		=> '%s',
 	'LOG_USER_WARNING'		=> '<b>Added user warning</b><br />&#187;%s',
+	'LOG_USER_WARNING_BODY'	=> '<b>The following warning was issued to this user</b><br />&#187;%s',
 
 	'MARK'				=> 'Mark',
 	'MARK_ALL'			=> 'Mark all',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index c7ce6cdcb5..d5dfc78a93 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -279,6 +279,8 @@ $lang = array_merge($lang, array(
 	'VIEW_DETAILS'			=> 'View Details',
 
 	'WARNED_USERS'			=> 'Warned Users',
+	'WARNING_PM_BODY'		=> 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
+	'WARNING_PM_SUBJECT'	=> 'Board Warning Issued',
 
 	'YOU_SELECTED_TOPIC'	=> 'You selected topic number %d: %s',