diff --git a/web/lib/msgslib.ssjs b/web/lib/msgslib.ssjs
index 79c6e4bbe16c8f415956e89f8956be77ecd073cb..3457ed10f712b49335180e849426d5afbfff02e2 100644
--- a/web/lib/msgslib.ssjs
+++ b/web/lib/msgslib.ssjs
@@ -183,7 +183,8 @@ 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\-._\?\,\/\\\+&amp;%\$#\=~\*]*))?[^,.\(\)<>&\s]/gi,function(str) {
+	str=str.replace(/(?:http|https|ftp|telnet|gopher|irc|news)\:\/\/[\w\-\.]+\.[a-zA-Z]+(?::[\w]*)?(?:\/(?:[\w\-._\?\,\/\\\+&amp;%\$#\=~\*]*))?[^,.\(\)\s]/gi,function(str) {
+		str=str.replace(/&gt;.*/,'');
 		var ret='<a href="'+str+'" target="_blank">'+str+'</a>';
 		return(ret);}
 	);