diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 8bfd9b72bb..671f6cceb2 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -83,7 +83,7 @@ function format_display(&$message, &$signature, $uid, $siguid, $html, $bbcode, $
 	global $auth, $forum_id, $config, $censors, $user, $bbcode, $phpbb_root_path;
 
 	// Second parse bbcode here
-	$message = $bbcode->bbcode_second_pass($message, $uid);
+	$bbcode->bbcode_second_pass($message, $uid);
 
 	// If we allow users to disable display of emoticons we'll need an appropriate 
 	// check and preg_replace here
@@ -102,7 +102,7 @@ function format_display(&$message, &$signature, $uid, $siguid, $html, $bbcode, $
 	{
 		$signature = trim($signature);
 
-		$signature = $bbcode->bbcode_second_pass($signature, $siguid);
+		$bbcode->bbcode_second_pass($signature, $siguid);
 
 		$signature = (!$config['enable_smilies']) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $signature) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $phpbb_root_path . $config['smilies_path'], $signature);
 
diff --git a/phpBB/posting.php b/phpBB/posting.php
index dc92ad4a85..020622013e 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -483,7 +483,6 @@ if ($submit || $preview || $refresh)
 
 	$current_time = time();
 
-
 	// If replying/quoting and last post id has changed
 	// give user option to continue submit or return to post
 	// notify and show user the post made between his request and the final submit
@@ -769,7 +768,7 @@ if (!sizeof($error) && $preview)
 
 	$preview_message = $message_parser->message;
 	format_display($preview_message, $preview_signature, $message_parser->bbcode_uid, $preview_signature_uid, $enable_html, $enable_bbcode, $enable_urls, $enable_smilies, $enable_sig);
-
+	
 	// Poll Preview
 	if (($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id && empty($poll_last_vote))) && ($auth->acl_get('f_poll', $forum_id) || $auth->acl_get('m_edit', $forum_id)))
 	{
@@ -1468,7 +1467,7 @@ function topic_review($topic_id, $forum_id, $is_inline_review = false)
 
 		if ($row['bbcode_bitfield'])
 		{
-			$bbcode->bbcode_second_pass(&$message, $row['bbcode_uid'], $row['bbcode_bitfield']);
+			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
 		}
 
 		if (count($censors['match']))