diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 66903cc2c9..504aa44dae 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1868,8 +1868,8 @@ function make_clickable($text, $server_url = false)
 		// Be sure to not let the matches cross over. ;)
 
 		// relative urls for this board
-		$magic_url_match[] = '#(^|[\n \]]|\()(' . preg_quote($server_url, '#') . ')/(([^[ \t\n\r<"\'\)&]+|&(?!lt;|quot;))*)#i';
-		$magic_url_replace[] = '$1<!-- l --><a href="$2/$3">$3</a><!-- l -->';
+		$magic_url_match[] = '#(^|[\n \]]|\()(' . preg_quote($server_url, '#') . ')/(([^[ \t\n\r<"\'\)&]+|&(?!lt;|quot;))*)#ie';
+		$magic_url_replace[] = "'\$1<!-- l --><a href=\"\$2/' . preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}/', '\\1', '\$3') . '\">' . preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}/', '\\1', '\$3') . '</a><!-- l -->'";
 
 		// matches a xxxx://aaaaa.bbb.cccc. ...
 		$magic_url_match[] = '#(^|[\n \]]|\()([\w]+:/{2}.*?([^[ \t\n\r<"\'\)&]+|&(?!lt;|quot;))*)#ie';
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 90b48e402a..5d9a192cbf 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -744,12 +744,31 @@ class bbcode_firstpass extends bbcode
 		if ($valid)
 		{
 			$this->parsed_items['url']++;
-		
+
 			if (!preg_match('#^[\w]+?://.*?#i', $url))
 			{
 				$url = 'http://' . $url;
 			}
 
+			$url_info = parse_url($url);
+			$script_test_path = explode('/', $url_info['path']);
+			$test_url = $url_info['scheme'] . '://' . $url_info['host'];
+			if (!empty($url_info['port']))
+			{
+				$test_url .= ':' . $url_info['port'];
+			}
+
+			// We take our test url and stick on the first bit of text we get to check if we are really at the domain. If so, lets go!
+			if ($test_url . '/' . $script_test_path[1] == generate_board_url())
+			{
+				$url_info['query'] = preg_replace('/(?:&amp;|^)sid=[0-9a-f]{32}/', '', $url_info['query']);
+				$url = $test_url . $url_info['path'] . '?' . $url_info['query'];
+				if (!empty($url_info['fragment']))
+				{
+					$url .= $url_info['fragment'];
+				}
+			}
+
 			return ($var1) ? '[url=' . $this->bbcode_specialchars($url) . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($var2) . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($url) . '[/url:' . $this->bbcode_uid . ']'; 
 		}