diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 1f1c1acb6a..ffcc826f7b 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1234,7 +1234,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 
 	// Parse the message and subject
 	$message = censor_text($row['post_text']);
-	$message = str_replace("\n", '<br />', $message);
 
 	// Second parse bbcode here
 	if ($row['bbcode_bitfield'])
@@ -1242,6 +1241,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
 	}
 
+	$message = str_replace("\n", '<br />', $message);
+
 	// Always process smilies after parsing bbcodes
 	$message = smiley_text($message);