diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php
index 06412c2a7..2e9a4431d 100644
--- a/upload/includes/bbcode.php
+++ b/upload/includes/bbcode.php
@@ -497,7 +497,7 @@ class bbcode
 	function init_replacements ()
 	{
 		$tpl         = $this->tpl;
-		$img_url_exp = 'http://[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png)';
+		$img_url_exp = 'http://[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png)([a-z0-9/?&%;][^\[\]]*)?';
 		$email_exp   = '[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+';
 		$url_exp     = '[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?';