7 files changed, 23 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 0b13b17bea..13433c389f 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
 # General Information about this style
 name = prosilver
 copyright = © phpBB Limited, 2007
-style_version = 3.1.5
-phpbb_version = 3.1.5
+style_version = 3.1.6
+phpbb_version = 3.1.6
 
 # Defining a different template bitfield
 # template_bitfield = lNg=
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index 25f865e054..c21b676370 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -54,10 +54,12 @@
 		</dl>
 	<!-- ENDIF -->
 
+	<!-- EVENT mcp_topic_options_before -->
 	<dl>
 		<dt><label for="subject">{L_SPLIT_SUBJECT}{L_COLON}</label></dt>
 		<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd>
 	</dl>
+	<!-- EVENT mcp_topic_options_after -->
 	<dl>
 		<dt><label>{L_SPLIT_FORUM}{L_COLON}</label></dt>
 		<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
@@ -153,9 +155,9 @@
 	<div class="action-bar bottom">
 		<div class="pagination">
 			{TOTAL_POSTS}
-			<!-- IF .pagination --> 
+			<!-- IF .pagination -->
 				<!-- INCLUDE pagination.html -->
-			<!-- ELSE --> 
+			<!-- ELSE -->
 				 &bull; {PAGE_NUMBER}
 			<!-- ENDIF -->
 		</div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index d2e8b08525..b7506608d9 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,6 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
 <h2 class="topic-title"><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT viewtopic_topic_title_append --></h2>
+<!-- EVENT viewtopic_topic_title_after -->
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
 <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
 
@@ -68,6 +69,8 @@
 	<!-- EVENT viewtopic_body_pagination_top_after -->
 </div>
 
+<!-- EVENT viewtopic_body_poll_before -->
+
 <!-- IF S_HAS_POLL -->
 	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll">
 
@@ -121,6 +124,8 @@
 	<hr />
 <!-- ENDIF -->
 
+<!-- EVENT viewtopic_body_poll_after -->
+
 <!-- BEGIN postrow -->
 	<!-- EVENT viewtopic_body_postrow_post_before -->
 	<!-- IF postrow.S_FIRST_UNREAD -->
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index f78e417b84..8077c1d51e 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -21,8 +21,8 @@
 # General Information about this style
 name = subsilver2
 copyright = © 2005 phpBB Limited
-style_version = 3.1.5
-phpbb_version = 3.1.5
+style_version = 3.1.6
+phpbb_version = 3.1.6
 
 # Defining a different template bitfield
 # template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 25c8181ddc..7d54510cee 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -10,10 +10,12 @@
 	<tr>
 		<td class="row2" colspan="3" align="center"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td>
 	</tr>
+	<!-- EVENT mcp_topic_options_before -->
 	<tr>
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_SUBJECT}</span></td>
 		<td class="row2" colspan="2"><input class="post" style="width: 350px" type="text" size="35" maxlength="124" name="subject" value="{SPLIT_SUBJECT}" /></td>
 	</tr>
+	<!-- EVENT mcp_topic_options_after -->
 	<tr>
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
 		<td class="row2" colspan="2"><select name="to_forum_id">{S_FORUM_SELECT}</select></td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html
index 1416aa0c10..78ab3e4b8d 100644
--- a/phpBB/styles/subsilver2/template/memberlist_email.html
+++ b/phpBB/styles/subsilver2/template/memberlist_email.html
@@ -48,7 +48,11 @@
 			<td class="row2"><input class="post" type="text" name="name" size="50" value="{NAME}" /></td>
 		</tr>
 		<!-- ENDIF -->
-	<!-- ELSE -->
+		<tr>
+			<td class="row1" width="35%"><b class="genmed">{L_SUBJECT}</b></td>
+			<td class="row2"><input class="post" type="text" name="subject" size="50" tabindex="2" value="{SUBJECT}" /></td>
+		</tr>
+		<!-- ELSE -->
 		<tr>
 			<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}</b></td>
 			<td class="row2"><input class="post" type="email" name="email" size="50" maxlength="100" value="{EMAIL}" /></td>
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index f679d25853..ea64bc837f 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -16,6 +16,7 @@
 
 <div id="pageheader">
 	<h2><!-- EVENT viewtopic_topic_title_prepend --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT viewtopic_topic_title_append --></h2>
+	<!-- EVENT viewtopic_topic_title_after -->
 
 <!-- IF MODERATORS -->
 	<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>
@@ -68,6 +69,7 @@
 			</table>
 		</td>
 	</tr>
+<!-- EVENT viewtopic_body_poll_before -->
 <!-- IF S_HAS_POLL -->
 	<tr>
 		<td class="row2" colspan="2" align="center"><br clear="all" />
@@ -130,6 +132,7 @@
 		</td>
 	</tr>
 <!-- ENDIF -->
+<!-- EVENT viewtopic_body_poll_after -->
 	</table>
 
 <!-- BEGIN postrow -->