diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 44c855da2e..15e0f94c4d 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -280,7 +280,7 @@ $template->assign_vars(array(
 	'L_LOGIN_LOGOUT' 	=> $l_login_logout,
 	'L_INDEX' 			=> $user->lang['FORUM_INDEX'],
 
-	'U_PRIVATEMSGS'	=> 'privmsg.'.$phpEx.$SID.'&folder=inbox',
+	'U_PRIVATEMSGS'	=> 'ucp.'.$phpEx.$SID.'&mode=pm&folder=inbox',
 	'U_MEMBERLIST' 	=> 'memberlist.'.$phpEx.$SID,
 	'U_VIEWONLINE' 	=> 'viewonline.'.$phpEx.$SID,
 	'U_MEMBERSLIST' => 'memberlist.'.$phpEx.$SID,
@@ -294,7 +294,6 @@ $template->assign_vars(array(
 	'U_FAQ' 		=> 'faq.'.$phpEx.$SID,
 	'U_SEARCH_SELF'	=> 'search.'.$phpEx.$SID.'&search_id=egosearch',
 	'U_SEARCH_NEW' 	=> 'search.'.$phpEx.$SID.'&search_id=newposts',
-	'U_PRIVATEMSGS_POPUP'	=> 'privmsg.'.$phpEx.$SID.'&mode=newpm',
 	'U_SEARCH_UNANSWERED'	=> 'search.'.$phpEx.$SID.'&search_id=unanswered',
 
 	'S_USER_LOGGED_IN' 		=> ($user->data['user_id'] != ANONYMOUS) ? true : false,
diff --git a/phpBB/templates/subSilver/overall_header.html b/phpBB/templates/subSilver/overall_header.html
index 158be32836..df8e42785b 100644
--- a/phpBB/templates/subSilver/overall_header.html
+++ b/phpBB/templates/subSilver/overall_header.html
@@ -17,7 +17,7 @@
 <!--
 	if ( {PRIVATE_MESSAGE_NEW_FLAG} )
 	{
-		window.open('{U_PRIVATEMSGS_POPUP}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');;
+		window.open('{U_PRIVATEMSGS}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');;
 	}
 //-->
 </script>