diff --git a/include/items.php b/include/items.php
index 5b27559357..0398f54588 100644
--- a/include/items.php
+++ b/include/items.php
@@ -903,6 +903,12 @@ function add_page_info_data($data) {
 	if ($no_photos AND ($data["type"] == "photo"))
 		return("");
 
+	// If the link contains BBCode stuff, make a short link out of this to avoid parsing problems
+	if (strpos($data["url"], '[') OR strpos($data["url"], ']')) {
+		require_once("include/network.php");
+		$data["url"] = short_link($data["url"]);
+	}
+
 	if (($data["type"] != "photo") AND is_string($data["title"]))
 		$text .= "[bookmark=".$data["url"]."]".trim($data["title"])."[/bookmark]";