diff --git a/web/lib/msgslib.ssjs b/web/lib/msgslib.ssjs
index 3457ed10f712b49335180e849426d5afbfff02e2..ba34c54805e0084edfed036e56c17050c6dc65b4 100644
--- a/web/lib/msgslib.ssjs
+++ b/web/lib/msgslib.ssjs
@@ -184,8 +184,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(/>.*/,'');
-		var ret='<a href="'+str+'" target="_blank">'+str+'</a>';
+		var ret='<a href="'+uristr+'" target="_blank">'+str+'</a>';
+		var m=str.match(/^(.*)(&gt;.*)$/,'');
+		if(m!=null)
+			var ret='<a href="'+m[1]+'" target="_blank">'+m[1]+'</a>'+m[2];
 		return(ret);}
 	);
 	return(str);