diff --git a/upload/includes/functions_post.php b/upload/includes/functions_post.php
index a5dfadfce..054d69812 100644
--- a/upload/includes/functions_post.php
+++ b/upload/includes/functions_post.php
@@ -732,7 +732,7 @@ function topic_review ($topic_id)
 	// Fetch posts data
 	$review_posts = DB()->fetch_rowset("
 		SELECT
-			p.*, pt.post_text
+			p.*, pt.post_text,
 			IF(p.poster_id = ". ANONYMOUS .", p.post_username, u.username) AS username, u.user_id
 		FROM
 			". BB_POSTS      ." p,
diff --git a/upload/privmsg.php b/upload/privmsg.php
index 382345705..fe7b87ca8 100644
--- a/upload/privmsg.php
+++ b/upload/privmsg.php
@@ -916,27 +916,6 @@ else if ( $save && $mark_list && $folder != 'savebox' && $folder != 'outbox' )
 }
 else if ( $submit || $refresh || $mode != '' )
 {
-	//
-	// Toggles
-	//
-	if ( !$bb_cfg['allow_bbcode'] )
-	{
-		$bbcode_on = 0;
-	}
-	else
-	{
-		$bbcode_on = ($submit || $refresh) ? (int) empty($_POST['disable_bbcode']) : $bb_cfg['allow_bbcode'];
-	}
-
-	if ( !$bb_cfg['allow_smilies'] )
-	{
-		$smilies_on = 0;
-	}
-	else
-	{
-		$smilies_on = ($submit || $refresh) ? (int) empty($_POST['disable_smilies']) : $bb_cfg['allow_smilies'];
-	}
-
 	if (IS_USER && $submit && $mode != 'edit')
 	{
 		//
@@ -1093,13 +1072,13 @@ else if ( $submit || $refresh || $mode != '' )
 				}
 			}
 
-			$sql_info = "INSERT INTO " . BB_PRIVMSGS . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_bbcode, privmsgs_enable_smilies)
-				VALUES (" . PRIVMSGS_NEW_MAIL . ", '" . str_replace("\'", "''", $privmsg_subject) . "', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '". USER_IP ."', $bbcode_on, $smilies_on)";
+			$sql_info = "INSERT INTO " . BB_PRIVMSGS . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip)
+				VALUES (" . PRIVMSGS_NEW_MAIL . ", '" . str_replace("\'", "''", $privmsg_subject) . "', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '". USER_IP ."')";
 		}
 		else
 		{
 			$sql_info = "UPDATE " . BB_PRIVMSGS . "
-				SET privmsgs_type = " . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '" . str_replace("\'", "''", $privmsg_subject) . "', privmsgs_from_userid = " . $userdata['user_id'] . ", privmsgs_to_userid = " . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '". USER_IP ."', privmsgs_enable_bbcode = $bbcode_on, privmsgs_enable_smilies = $smilies_on
+				SET privmsgs_type = " . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '" . str_replace("\'", "''", $privmsg_subject) . "', privmsgs_from_userid = " . $userdata['user_id'] . ", privmsgs_to_userid = " . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '". USER_IP ."'
 				WHERE privmsgs_id = $privmsg_id";
 		}
 
@@ -1437,8 +1416,6 @@ else if ( $submit || $refresh || $mode != '' )
 		'SUBJECT' => htmlCHR($privmsg_subject),
 		'USERNAME' => $to_username,
 		'MESSAGE' => $privmsg_message,
-		'SMILIES_STATUS' => $smilies_status,
-		'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid("faq.php?mode=bbcode") . '" target="_phpbbcode">', '</a>'),
 		'FORUM_NAME' => $lang['PRIVATE_MESSAGE'],
 
 		'BOX_NAME' => $l_box_name,
@@ -1448,11 +1425,7 @@ else if ( $submit || $refresh || $mode != '' )
 		'SAVEBOX' => $savebox_url,
 
 		'POSTING_TYPE_TITLE' => $post_a,
-		'L_DISABLE_BBCODE' => $lang['DISABLE_BBCODE_PM'],
-		'L_DISABLE_SMILIES' => $lang['DISABLE_SMILIES_PM'],
 
-		'S_BBCODE_CHECKED' => ( !$bbcode_on ) ? ' checked="checked"' : '',
-		'S_SMILIES_CHECKED' => ( !$smilies_on ) ? ' checked="checked"' : '',
 		'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields,
 		'S_POST_ACTION' => append_sid("privmsg.php"),
 
diff --git a/upload/templates/default/posting.tpl b/upload/templates/default/posting.tpl
index ebaac5b3e..636dc3c41 100644
--- a/upload/templates/default/posting.tpl
+++ b/upload/templates/default/posting.tpl
@@ -115,15 +115,13 @@
 </tr>
 
 <!-- IF SHOW_VIRTUAL_KEYBOARD --><!-- INCLUDE kb.tpl --><!-- ENDIF -->
-
+<!-- IF IN_PM -->
+<!-- ELSEIF LOGGED_IN -->
 <tr>
 	<td class="row1 vTop pad_4" valign="top">
 		<p><b>{L_OPTIONS}</b></p>
 	</td>
 	<td class="row2">
-
-	<!-- IF IN_PM -->
-	<!-- ELSEIF LOGGED_IN -->
 	<div class="floatL">
 		<table class="borderless inline">
 		<!-- IF SHOW_UPDATE_POST_TIME -->
@@ -140,11 +138,9 @@
 		<!-- ENDIF -->
 		</table>
 	</div>
-	<!-- ENDIF / LOGGED_IN -->
-
 	</td>
 </tr>
-
+<!-- ENDIF / LOGGED_IN -->
 <!-- BEGIN switch_type_toggle -->
 <tr>
 	<td colspan="2" class="row2 tCenter pad_6">{S_TYPE_TOGGLE}</td>