6 files changed, 69 insertions, 5 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index f1c03672c3..2fd97986f7 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -770,6 +770,24 @@ ucp_pm_viewmessage_custom_fields_before
 * Purpose: Add data before the custom fields on the user profile when viewing
 a private message
 
+ucp_pm_viewmessage_post_buttons_after
+===
+* Locations:
+    + styles/prosilver/template/ucp_pm_viewmessage.html
+    + styles/subsilver2/template/ucp_pm_viewmessage.html
+* Since: 3.1.0-RC3
+* Purpose: Add post button to private messages (next to edit, quote etc), at 
+the end of the list.
+
+ucp_pm_viewmessage_post_buttons_before
+===
+* Locations:
+    + styles/prosilver/template/ucp_pm_viewmessage.html
+    + styles/subsilver2/template/ucp_pm_viewmessage.html
+* Since: 3.1.0-RC3
+* Purpose: Add post button to private messages (next to edit, quote etc), at 
+the start of the list.
+
 ucp_pm_viewmessage_print_head_append
 ===
 * Locations:
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 35bb844170..df1e722fa4 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -115,7 +115,7 @@ class ucp_prefs
 						*
 						* @event core.ucp_prefs_personal_update_data
 						* @var	array	data		Submitted display options data
-						* @var	array	sql_ary		Display options data we udpate
+						* @var	array	sql_ary		Display options data we update
 						* @since 3.1.0-a1
 						*/
 						$vars = array('data', 'sql_ary');
@@ -294,7 +294,7 @@ class ucp_prefs
 						*
 						* @event core.ucp_prefs_view_update_data
 						* @var	array	data		Submitted display options data
-						* @var	array	sql_ary		Display options data we udpate
+						* @var	array	sql_ary		Display options data we update
 						* @since 3.1.0-a1
 						*/
 						$vars = array('data', 'sql_ary');
@@ -420,7 +420,7 @@ class ucp_prefs
 						*
 						* @event core.ucp_prefs_post_update_data
 						* @var	array	data		Submitted display options data
-						* @var	array	sql_ary		Display options data we udpate
+						* @var	array	sql_ary		Display options data we update
 						* @since 3.1.0-a1
 						*/
 						$vars = array('data', 'sql_ary');
@@ -451,6 +451,24 @@ class ucp_prefs
 			break;
 		}
 
+		/**
+		* Modify UCP preferences data before the page load
+		*
+		* @event core.ucp_prefs_modify_common
+		* @var	array	data		Array with current/submitted UCP options data
+		* @var	array	error		Errors data
+		* @var	string	mode		UCP prefs operation mode
+		* @var	string	s_hidden_fields		Hidden fields data
+		* @since 3.1.0-RC3
+		*/
+		$vars = array(
+			'data',
+			'error',
+			'mode',
+			's_hidden_fields',
+		);
+		extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_modify_common', compact($vars)));
+
 		$template->assign_vars(array(
 			'L_TITLE'			=> $user->lang['UCP_PREFS_' . strtoupper($mode)],
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5af3ad4fbc..a58aec43cd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -821,6 +821,7 @@ $lang = array_merge($lang, array(
 		1	=> 'Viewed %d time',
 		2	=> 'Viewed %d times',
 	),
+	'VIEWING_CONTACT_ADMIN'		=> 'Viewing contact page',
 	'VIEWING_FAQ'				=> 'Viewing FAQ',
 	'VIEWING_MEMBERS'			=> 'Viewing member details',
 	'VIEWING_ONLINE'			=> 'Viewing who is online',
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 9f33bc04f7..489c1c901a 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -67,6 +67,7 @@
 
 		<!-- IF U_DELETE or U_EDIT or U_QUOTE or U_REPORT -->
 		<ul class="post-buttons">
+			<!-- EVENT ucp_pm_viewmessage_post_buttons_before -->
 			<!-- IF U_EDIT -->
 				<li>
 					<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button icon-button edit-icon"><span>{L_POST_EDIT_PM}</span></a>
@@ -87,6 +88,7 @@
 					<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button icon-button quote-icon"><span>{L_POST_QUOTE_PM}</span></a>
 				</li>
 			<!-- ENDIF -->
+			<!-- EVENT ucp_pm_viewmessage_post_buttons_after -->
 		</ul>
 		<!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
index be1e27c5f3..9536b1f8c5 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
@@ -104,7 +104,19 @@
 </tr>
 
 <tr class="row1">
-	<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}" class="imageset">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}" class="imageset">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF U_EDIT --><a href="{U_EDIT}" class="imageset">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF U_QUOTE --><a href="{U_QUOTE}" class="imageset">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
+	<td>
+		<div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">
+			&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}" class="imageset">{PROFILE_IMG}</a> <!-- ENDIF -->
+			<!-- IF U_EMAIL --><a href="{U_EMAIL}" class="imageset">{EMAIL_IMG}</a> <!-- ENDIF -->
+		&nbsp;</div>
+		<div class="gensmall" style="float: {S_CONTENT_FLOW_END};">
+			<!-- EVENT ucp_pm_viewmessage_post_buttons_before -->
+			<!-- IF U_EDIT --><a href="{U_EDIT}" class="imageset">{EDIT_IMG}</a> <!-- ENDIF -->
+			<!-- IF U_QUOTE --><a href="{U_QUOTE}" class="imageset">{QUOTE_IMG}</a> <!-- ENDIF -->
+			<!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->
+			<!-- EVENT ucp_pm_viewmessage_post_buttons_after -->
+		&nbsp;</div>
+	</td>
 </tr>
 
 <tr>
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 4c897c58aa..a03a81a15e 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -295,8 +295,21 @@ while ($row = $db->sql_fetchrow($result))
 		break;
 
 		case 'memberlist':
-			$location = (strpos($row['session_page'], 'mode=viewprofile') !== false) ? $user->lang['VIEWING_MEMBER_PROFILE'] : $user->lang['VIEWING_MEMBERS'];
 			$location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx");
+
+			if (strpos($row['session_page'], 'mode=viewprofile') !== false)
+			{
+				$location = $user->lang['VIEWING_MEMBER_PROFILE'];
+			}
+			else if (strpos($row['session_page'], 'mode=contactadmin') !== false)
+			{
+				$location = $user->lang['VIEWING_CONTACT_ADMIN'];
+				$location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin');
+			}
+			else
+			{
+				$location = $user->lang['VIEWING_MEMBERS'];
+			}
 		break;
 
 		case 'mcp':