diff --git a/root/includes/trim_message/trim_message.php b/root/includes/trim_message/trim_message.php
index b9b1fc18..d9c3d436 100644
--- a/root/includes/trim_message/trim_message.php
+++ b/root/includes/trim_message/trim_message.php
@@ -49,7 +49,7 @@ class phpbb_trim_message
 	*/
 	public function __construct($message, $bbcode_uid, $length, $append_str = ' [...]', $tolerance = 25)
 	{
-		$this->message			= htmlspecialchars_decode($message);
+		$this->message			= $message;
 		$this->bbcode_uid		= $bbcode_uid;
 		$this->append_str		= $append_str;
 		$this->length			= (int) $length;
diff --git a/root/portal/includes/functions.php b/root/portal/includes/functions.php
index 1ee42909..9238d5ff 100644
--- a/root/portal/includes/functions.php
+++ b/root/portal/includes/functions.php
@@ -401,6 +401,8 @@ function get_sub_taged_string($message, $bbcode_uid, $length)
 {
 	global $phpbb_root_path, $phpEx;
 
+	$message = htmlspecialchars_decode($message);
+
 	if(!class_exists('phpbb_trim_message'))
 	{
 		include($phpbb_root_path . 'includes/trim_message/trim_message.' . $phpEx);