diff --git a/index.php b/index.php
index 207b42b..351d3da 100644
--- a/index.php
+++ b/index.php
@@ -285,7 +285,7 @@
 			if(!empty($row['comment'])) {
 				$comment = $row['comment'];
 				$comment = preg_replace('/^&gt;(?!&gt;\d).+/m', '<strong class="quote">$0</strong>', $comment);
-				$comment = preg_replace('/(?:https?|mailto|tel|ftp):[^\s,]+/m', '<a href="$0" target="_blank">$0</a>', $comment);
+				$comment = preg_replace('/(?:https?|mailto|tel|ftp):.+?(?=\s|,|&lt;|<|$)/m', '<a href="$0" target="_blank">$0</a>', $comment);
 				$comment = preg_replace_callback('/&gt;&gt;\s*(\d+)/', 'quote_link', $comment);
 				$comment = str_replace("\n", "<br />", $comment);
 				echo "<div>$comment</div>";