diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 171751219f..4ba504a988 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -256,7 +256,7 @@ class mcp_queue extends module
 					$template->assign_block_vars('postrow', array(
 						'U_VIEWFORUM'	=> "viewforum.$phpEx$SID&f=" . $row['forum_id'],
 						// Q: Why accessing the topic by a post_id instead of its topic_id?
-						// A: To prevent the post from being hidden because of low karma or wrong encoding
+						// A: To prevent the post from being hidden because of wrong encoding or different charset
 						'U_VIEWTOPIC'	=> "viewtopic.$phpEx$SID&f=" . $row['forum_id'] . '&p=' . $row['post_id'] . (($mode == 'unapproved_posts') ? '#' . $row['post_id'] : ''),
 						'U_VIEW_DETAILS'=> "mcp.$phpEx$SID&i=queue&start=$start&mode=approve_details&f={$forum_id}&p={$row['post_id']}",
 						'U_VIEWPROFILE'	=> ($row['poster_id'] != ANONYMOUS) ? "memberlist.$phpEx$SID&mode=viewprofile&u={$row['poster_id']}" : '',
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 5a066de76f..86e658b526 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -347,6 +347,12 @@ if ($mode2)
 	unset($mode2);
 }
 
+// Make sure we are using the correct module
+if ($mode == 'approve' || $mode == 'disapprove')
+{
+	$module = 'queue';
+}
+
 // Only Moderators can go beyond this point
 if ($user->data['user_id'] == ANONYMOUS)
 {
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html
index af69b50016..22439b90ac 100644
--- a/phpBB/styles/subSilver/template/posting_body.html
+++ b/phpBB/styles/subSilver/template/posting_body.html
@@ -379,24 +379,38 @@ function checkForm()
 	<!-- ENDIF -->
 
 	<!-- IF S_SHOW_ATTACH_BOX or S_SHOW_POLL_BOX -->
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" />&nbsp; <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" /><!-- IF S_SAVE_ALLOWED -->&nbsp; <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF --><!-- IF S_HAS_DRAFTS -->&nbsp; <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF -->&nbsp; <input class="btnlite" type="submit" accesskey="c" tabindex="7" name="cancel" value="{L_CANCEL}" /></td>
-	</tr>
-	<!-- ENDIF -->
-	
-	<!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF -->
-
-	<!-- IF S_SHOW_POLL_BOX -->
-		<!-- INCLUDE posting_poll_body.html -->
-	<!-- ELSEIF S_POLL_DELETE -->
 		<tr>
-			<td class="row1"><span class="genmed"><b>{L_POLL_DELETE}:</b></span></td>
-			<td class="row2"><input type="checkbox" name="poll_delete" /></td>
+			<td class="cat" colspan="2" align="center">
+				<input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" />
+				&nbsp; <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />
+				<!-- IF S_SAVE_ALLOWED -->&nbsp; <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF -->
+				<!-- IF S_HAS_DRAFTS -->&nbsp; <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF -->
+				&nbsp; <input class="btnlite" type="submit" accesskey="c" tabindex="7" name="cancel" value="{L_CANCEL}" />
+			</td>
 		</tr>
+	
+		<!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF -->
+
+		<!-- IF S_SHOW_POLL_BOX -->
+			<!-- INCLUDE posting_poll_body.html -->
+		<!-- ELSEIF S_POLL_DELETE -->
+			<tr>
+				<td class="row1"><span class="genmed"><b>{L_POLL_DELETE}:</b></span></td>
+				<td class="row2"><input type="checkbox" name="poll_delete" /></td>
+			</tr>
+		<!-- ENDIF -->
 	<!-- ENDIF -->
 
 	<tr>
-		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" />&nbsp; <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" /><!-- IF S_SAVE_ALLOWED -->&nbsp; <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF --><!-- IF S_HAS_DRAFTS -->&nbsp; <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF -->&nbsp; <input class="btnlite" type="submit" accesskey="c" tabindex="7" name="cancel" value="{L_CANCEL}" /></td>
+		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}
+			<input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" />
+			&nbsp; <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />
+			<!-- IF not S_SHOW_ATTACH_BOX and not S_SHOW_POLL_BOX -->
+				<!-- IF S_SAVE_ALLOWED -->&nbsp; <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF -->
+				<!-- IF S_HAS_DRAFTS -->&nbsp; <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF -->
+			<!-- ENDIF -->
+			&nbsp; <input class="btnlite" type="submit" accesskey="c" tabindex="7" name="cancel" value="{L_CANCEL}" />
+		</td>
 	</tr>
 </table>