diff --git a/web/lib/msgslib.ssjs b/web/lib/msgslib.ssjs
index 874375cf46fd19fe1ffd857e9a2bc4b579a165b2..524c0e16e36d81821b12e9c21eb97647d79b6538 100644
--- a/web/lib/msgslib.ssjs
+++ b/web/lib/msgslib.ssjs
@@ -188,11 +188,16 @@ function make_links(str) {
 		var text=str;
 		var uri=str;
 		var extra='';
-		var m=str.match(/^([\x00-\xff]*?)((?:>|[\r\n,.\)])+)$/);
+		var m=str.match(/^([\x00-\xff]*?)((?:\r?\n\r?\n).*)$)
+		if(m!=null) {
+			str=m[1];
+			extra=m[2];
+		}
+		m=str.match(/^([\x00-\xff]*?)((?:>|[\r\n,.\)])+)$/);
 		if(m!=null) {
 			text=m[1];
 			uri=m[1];
-			extra=m[2];
+			extra=m[2]+extra;
 		}
 		uri=uri.replace(/[\r\n]/g,'');
 		var ret='<a href="'+uri+'" target="_blank">'+text+'</a>'+extra;