diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index ff9867d11c..127d7b2af4 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -852,6 +852,16 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 
 		$post_subject = $row['post_subject'];
 		$message = $row['post_text'];
+		$decoded_message = false;
+
+		if ($show_quote_button && $auth->acl_get('f_reply', $forum_id))
+		{
+			$decoded_message = $message;
+			decode_message($decoded_message, $row['bbcode_uid']);
+
+			$decoded_message = censor_text($decoded_message);
+			$decoded_message = str_replace("\n", "<br />", $decoded_message);
+		}
 
 		if ($row['bbcode_bitfield'])
 		{
@@ -864,16 +874,17 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 		$message = censor_text($message);
 
 		$template->assign_block_vars($mode . '_row', array(
-			'POSTER_NAME' 	=> $poster,
-			'POST_SUBJECT' 	=> $post_subject,
-			'MINI_POST_IMG' => $user->img('icon_post', $user->lang['POST']),
-			'POST_DATE' 	=> $user->format_date($row['post_time']),
-			'MESSAGE' 		=> str_replace("\n", '<br />', $message), 
+			'POSTER_NAME'		=> $poster,
+			'POST_SUBJECT'		=> $post_subject,
+			'MINI_POST_IMG'		=> $user->img('icon_post', $user->lang['POST']),
+			'POST_DATE'			=> $user->format_date($row['post_time']),
+			'MESSAGE'			=> str_replace("\n", '<br />', $message), 
+			'DECODED_MESSAGE'	=> $decoded_message,
 
-			'U_POST_ID'		=> $row['post_id'],
-			'U_MINI_POST'	=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
-			'U_MCP_DETAILS'	=> ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=post_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $user->session_id) : '',
-			'U_QUOTE'		=> ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? 'javascript:addquote(' . $row['post_id'] . ", '" . addslashes($poster) . "')" : '')
+			'U_POST_ID'			=> $row['post_id'],
+			'U_MINI_POST'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
+			'U_MCP_DETAILS'		=> ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=post_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $user->session_id) : '',
+			'U_QUOTE'			=> ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? 'javascript:addquote(' . $row['post_id'] . ", '" . addslashes($poster) . "')" : '')
 		);
 		unset($rowset[$i]);
 	}
diff --git a/phpBB/styles/subSilver/template/posting_topic_review.html b/phpBB/styles/subSilver/template/posting_topic_review.html
index 021789776b..6520ddb803 100644
--- a/phpBB/styles/subSilver/template/posting_topic_review.html
+++ b/phpBB/styles/subSilver/template/posting_topic_review.html
@@ -28,7 +28,7 @@
 						<td>&nbsp;</td>
 						<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
 						<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>
-						<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.U_QUOTE --><a href="{topic_review_row.U_QUOTE}">{QUOTE_IMG}</a><!-- ENDIF --></td>
+						<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.U_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="{topic_review_row.U_QUOTE}">{QUOTE_IMG}</a><!-- ENDIF --></td>
 					</tr>
 					</table>
 				</td>
@@ -42,7 +42,12 @@
 						<td valign="top">
 							<table width="100%" cellspacing="0" cellpadding="2">
 							<tr>
-								<td><div id="message_{topic_review_row.U_POST_ID}"><div class="postbody">{topic_review_row.MESSAGE}</div></div></td>
+								<td>
+									<div class="postbody">{topic_review_row.MESSAGE}</div>
+									<!-- IF topic_review_row.U_QUOTE and topic_review_row.DECODED_MESSAGE -->
+										<div id="message_{topic_review_row.U_POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
+									<!-- ENDIF -->
+								</td>
 							</tr>
 							</table>
 						</td>