diff --git a/web/lib/msgslib.ssjs b/web/lib/msgslib.ssjs
index 17c343500528cb9a50c9a2a8ea89d9a5cbeeb05d..472fadb9172f05cf88b036ac8575cb4cf6b14b3b 100644
--- a/web/lib/msgslib.ssjs
+++ b/web/lib/msgslib.ssjs
@@ -188,7 +188,7 @@ function make_links(str) {
 		var text=str;
 		var uri=str;
 		var extra='';
-		var m=str.match(/^(.*)((?:>|[\r\n,.\)])+)$/);
+		var m=str.match(/^(.*?)((?:>|[\r\n,.\)])+)$/);
 		if(m!=null) {
 			text=m[1];
 			uri=m[1];