diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 5236a2e9f1..d3e0abfbcb 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -397,6 +397,10 @@ if($total_topics || $total_announcements)
 		{
 			$topic_title = preg_replace($orig_word, $replacement_word, stripslashes($topic_rowset[$i]['topic_title']));
 		}
+		else
+		{
+			$topic_title = stripslashes($topic_rowset[$i]['topic_title']);
+		}
 
 		$topic_type = $topic_rowset[$i]['topic_type'];
 
@@ -413,7 +417,6 @@ if($total_topics || $total_announcements)
 			$topic_type = "";
 		}
 
-
 		$topic_id = $topic_rowset[$i]['topic_id'];
 
 		$replies = $topic_rowset[$i]['topic_replies'];
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index ff7b4a9059..243c995632 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -637,8 +637,6 @@ for($i = 0; $i < $total_posts; $i++)
 		$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
 	}
 
-	$message = make_clickable($message);
-
 	$message = ($user_sig != "") ? ereg_replace("\[addsig]$", "<br /><br />_________________<br />" . $user_sig, $message) : ereg_replace("\[addsig]$", "", $message);
 
 	if( count($orig_word) )
@@ -647,6 +645,8 @@ for($i = 0; $i < $total_posts; $i++)
 		$message = preg_replace($orig_word, $replacement_word, $message);
 	}
 
+	$message = make_clickable($message);
+
 	if($board_config['allow_smilies'] && $postrow[$i]['enable_smilies'])
 	{
 		$message = smilies_pass($message);