diff --git a/inc/class_parser.php b/inc/class_parser.php
index c008548b6a..8b525dcb63 100644
--- a/inc/class_parser.php
+++ b/inc/class_parser.php
@@ -450,6 +450,16 @@ function parse_mycode($message, $options=array())
 			$message = preg_replace_callback("#\[img=([1-9][0-9]*)x([1-9][0-9]*) align=(left|right)\](\r\n?|\n?)(https?://([^<>\"']+?))\[/img\]#is", array($this, 'mycode_parse_img_disabled_callback4'), $message);
 		}
 
+		// Convert videos when allow.
+		if(!empty($this->options['allow_videocode']))
+		{
+			$message = preg_replace_callback("#\[video=(.*?)\](.*?)\[/video\]#i", array($this, 'mycode_parse_video_callback'), $message);
+		}
+		else
+		{
+			$message = preg_replace_callback("#\[video=(.*?)\](.*?)\[/video\]#i", array($this, 'mycode_parse_video_disabled_callback'), $message);
+		}
+
 		$message = $this->mycode_auto_url($message);
 
 		$message = str_replace('$', '&#36;', $message);
@@ -497,16 +507,6 @@ function parse_mycode($message, $options=array())
 			}
 		}
 
-		// Convert videos when allow.
-		if(!empty($this->options['allow_videocode']))
-		{
-			$message = preg_replace_callback("#\[video=(.*?)\](.*?)\[/video\]#i", array($this, 'mycode_parse_video_callback'), $message);
-		}
-		else
-		{
-			$message = preg_replace_callback("#\[video=(.*?)\](.*?)\[/video\]#i", array($this, 'mycode_parse_video_disabled_callback'), $message);
-		}
-
 		return $message;
 	}