diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html
index 45e3fcc865..865f0b883c 100644
--- a/phpBB/styles/prosilver/template/memberlist_email.html
+++ b/phpBB/styles/prosilver/template/memberlist_email.html
@@ -2,23 +2,29 @@
 
 <!-- IF S_CONTACT_ADMIN-->
 <h2 class="titlespace">{L_CONTACT_ADMIN}</h2>
-<!-- ELSE -->
+<!-- ELSEIF S_SEND_USER -->
 <h2 class="titlespace">{L_SEND_EMAIL_USER}</h2>
+<!-- ELSE -->
+<h2 class="titlespace">{L_EMAIL_TOPIC}</h2>
 <!-- ENDIF -->
 
 <form method="post" action="{S_POST_ACTION}" id="post">
 
-<div class="panel">
-	<div class="inner">
 	<!-- IF CONTACT_INFO -->
-		<div class="postbody">
-			<div class="content">
-				{CONTACT_INFO}
+	<div class="panel">
+		<div class="inner">
+			<div class="postbody">
+				<div class="content">
+					{CONTACT_INFO}
+				</div>
 			</div>
 		</div>
+	</div>
 		<br class="clear" />
 	<!-- ENDIF -->
 
+	<div class="panel">
+		<div class="inner">
 	<div class="content">
 
 		<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html
index 3b76525af9..13ff4baace 100644
--- a/phpBB/styles/subsilver2/template/memberlist_email.html
+++ b/phpBB/styles/subsilver2/template/memberlist_email.html
@@ -8,8 +8,10 @@
 	<tr>
 	<!-- IF S_CONTACT_ADMIN-->
 		<th colspan="2">{L_CONTACT_ADMIN}</th>
-	<!-- ELSE -->
+	<!-- ELSEIF S_SEND_USER -->
 		<th colspan="2">{L_SEND_EMAIL_USER}</th>
+	<!-- ELSE -->
+		<th colspan="2">{L_EMAIL_TOPIC}</th>
 	<!-- ENDIF -->
 	</tr>
 	<!-- IF ERROR_MESSAGE -->