diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 761402951b..edf42f6a61 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -1,7 +1,7 @@
 <script type="text/javascript">
 <!--
-	var form_name = <!-- IF S_EDIT_DRAFT or S_PRIVMSGS -->'post'<!-- ELSE -->'postform'<!-- ENDIF -->;
-	var text_name = <!-- IF $SIG_EDIT eq 1 -->'signature'<!-- ELSE -->'message'<!-- ENDIF -->;
+	var form_name = 'postform';
+	var text_name = 'message';
 	var load_draft = false;
 	var upload = false;
 
@@ -36,7 +36,7 @@
 		if (document.getElementById(text_name).value.length < 2 && load_draft == false)
 		{
 			if (!upload)
-			{	
+			{
 				alert('{L_EMPTY_MESSAGE}');
 				return false;
 			}
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 32405e53c4..90c4c4911d 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -103,6 +103,7 @@
 			<br /><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300'); return false;">{L_MORE_SMILIES}</a>
 		<!-- ENDIF -->
 
+		<!-- IF BBCODE_STATUS -->
 		<hr />
 		{BBCODE_STATUS}<br />
 		<!-- IF S_BBCODE_ALLOWED -->
@@ -111,8 +112,9 @@
 			{URL_STATUS}<br />
 			{SMILIES_STATUS}
 		<!-- ENDIF -->
+		<!-- ENDIF -->
 		<!-- IF S_EDIT_DRAFT || S_DISPLAY_REVIEW -->
-			<hr />
+			<!-- IF S_DISPLAY_REVIEW --><hr /><!-- ENDIF -->
 			<!-- IF S_EDIT_DRAFT --><strong><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF -->
 			<!-- IF S_DISPLAY_REVIEW --><strong><a href="#review">{L_TOPIC_REVIEW}</a></strong><!-- ENDIF -->
 		<!-- ENDIF -->
@@ -137,6 +139,7 @@
 
 			<!-- BEGIN attach_row -->
 			<dl>
+
 				<dt><label for="comment_list[{attach_row.ASSOC_INDEX}]">{L_FILE_COMMENT}:</label><br />
 				<span><br /><a href="{attach_row.U_VIEW_ATTACHMENT}" class="right">{attach_row.FILENAME}</a></span></dt>
 				<dd><textarea name="comment_list[{attach_row.ASSOC_INDEX}]" id="comment_list[{attach_row.ASSOC_INDEX}]" rows="1" cols="35" class="inputbox">{attach_row.FILE_COMMENT}</textarea></dd>
diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html
index d7d415e403..3e41b83231 100644
--- a/phpBB/styles/prosilver/template/ucp_header.html
+++ b/phpBB/styles/prosilver/template/ucp_header.html
@@ -11,7 +11,7 @@
 </div>
 
 <!-- IF S_COMPOSE_PM -->
-<form id="post" method="post" action="{S_POST_ACTION}"{S_FORM_ENCTYPE}>
+<form id="postform" method="post" action="{S_POST_ACTION}"{S_FORM_ENCTYPE}>
 <!-- ENDIF -->
 
 <div class="panel bg3">
@@ -47,7 +47,7 @@
 		<!-- END t_block2 -->
 			</ul>
 		</div>
-		
+
 		<!-- IF .friends_online or .friends_offline -->
 		<div class="cp-mini">
 			<div class="inner"><span class="corners-top"><span></span></span>
diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html
index 1a787efc35..80805b69f0 100644
--- a/phpBB/styles/prosilver/template/ucp_main_drafts.html
+++ b/phpBB/styles/prosilver/template/ucp_main_drafts.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE ucp_header.html -->
 
-<form id="post" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
+<form id="postform" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
 <h2>{L_TITLE}</h2>
 
@@ -16,7 +16,7 @@
 	</div>
 
 			<fieldset class="submit-buttons">
-				{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+				{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 				<input type="submit" name="submit" value="{L_SAVE}" class="button1" />
 			</fieldset>
 
@@ -53,12 +53,12 @@
 	<!-- ELSE -->
 		<p><strong>{L_NO_SAVED_DRAFTS}</strong></p>
 	<!-- ENDIF -->
-	
+
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
 	<!-- IF .draftrow -->
-		<fieldset class="display-actions">	
+		<fieldset class="display-actions">
 			<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" />
 			<div><a href="#" onclick="marklist('post', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('post', '', false); return false;">{L_UNMARK_ALL}</a></div>
 		</fieldset>