diff --git a/include/plaintext.php b/include/plaintext.php
index 30ea5d9eed..559e0a0e83 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -128,10 +128,9 @@ function get_attachment_data($body) {
 	if ($matches[1] != "")
 		$title = $matches[1];
 
-	//$title = htmlentities($title, ENT_QUOTES, 'UTF-8', false);
 	$title = bbcode(html_entity_decode($title, ENT_QUOTES, 'UTF-8'), false, false, true);
+	$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
 	$title = str_replace(array("[", "]"), array("[", "]"), $title);
-
 	if ($title != "")
 		$data["title"] = $title;