diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d939c7b45d..c7eb71998e 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -411,7 +411,7 @@ $lang = array_merge($lang, array(
 	'UCP_PM'					=> 'Private messages',
 	'UCP_PM_COMPOSE'			=> 'Compose message',
 	'UCP_PM_DRAFTS'				=> 'Manage PM drafts',
-	'UCP_PM_OPTIONS'			=> 'Edit options',
+	'UCP_PM_OPTIONS'			=> 'Filtering, categorisation & delivery options',
 	'UCP_PM_POPUP'				=> 'Private messages',
 	'UCP_PM_POPUP_TITLE'		=> 'Private message popup',
 	'UCP_PM_UNREAD'				=> 'Unread messages',
diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html
index 96f6d7591a..151a3f04d2 100644
--- a/phpBB/styles/prosilver/template/ucp_header.html
+++ b/phpBB/styles/prosilver/template/ucp_header.html
@@ -24,7 +24,7 @@
 
 		<!-- IF S_PRIVMSGS -->
 			<!-- BEGIN t_block2 -->
-				<!-- IF S_PRIVMSGS and t_block2.S_FIRST_ROW -->
+				<!-- IF S_PRIVMSGS and not t_block2.S_LAST_ROW -->
 				<ul>
 					<!-- IF t_block2.S_SELECTED -->
 						<li id="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
@@ -32,10 +32,10 @@
 						<li><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
 					<!-- ENDIF -->
 				</ul>
-				<hr />
 				<!-- ENDIF -->
 			<!-- END t_block2 -->
 
+			<hr />
 			<!-- BEGIN folder -->
 				<!-- IF folder.S_FIRST_ROW --><ul><!-- ENDIF -->
 				<!-- IF folder.S_CUR_FOLDER -->
@@ -50,7 +50,7 @@
 
 			<ul>
 		<!-- BEGIN t_block2 -->
-			<!-- IF (S_PRIVMSGS and t_block2.S_ROW_COUNT) or not S_PRIVMSGS -->
+			<!-- IF (S_PRIVMSGS and t_block2.S_LAST_ROW) or not S_PRIVMSGS -->
 				<!-- IF t_block2.S_SELECTED -->
 					<li id="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
 				<!-- ELSE -->