diff --git a/web/lib/msgslib.ssjs b/web/lib/msgslib.ssjs
index 56139778fd0469c87a6e7128e73133ae56c9244e..4adf56c03b8a1a5279bf507d69c06dc6ae7d3f4b 100644
--- a/web/lib/msgslib.ssjs
+++ b/web/lib/msgslib.ssjs
@@ -183,9 +183,10 @@ function idx_to_user(fromidx)
 }
 
 function make_links(str) {
-	str=str.replace(/(?:http|https|ftp|telnet|gopher|irc|news)\:\/\/[\w\-\.]+\.[a-zA-Z]+(?::[\w]*)?(?:\/(?:[\w\-._\?\,\/\\\+&%\$#\=~\*]*))?[^,.\(\)\s]/gi,function(str) {
+	str=str.replace(/(?:http|https|ftp|telnet|gopher|irc|news):\/\/[\w\-\.]+\.[a-zA-Z]+(?::[\w]*)?(?:\/(?:[\w\-._\?\,\/\\\+&%\$#\=~\*]*))?/gi,function(str) {
+//					 | Protocol                                    |Hostname					  | Path                                     |
 		var ret='<a href="'+str+'" target="_blank">'+str+'</a>';
-		var m=str.match(/^(.*)(&gt;.*)$/);
+		var m=str.match(/^(.*)(&gt;|[^,.\(\)\s])$/);
 		if(m!=null)
 			ret='<a href="'+m[1]+'" target="_blank">'+m[1]+'</a>'+m[2];
 		return(ret);}