diff --git a/client/js/chat.js b/client/js/chat.js
index 1154ebcf..672a0411 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -395,10 +395,19 @@ $(function() {
 	
 	Handlebars.registerHelper(
 		"uri", function(text) {
-			text = escape(text);
-			return URI.withinString(text, function(url) {
-				return "<a href='" + url.replace(/^www/, "//www") + "' target='_blank'>" + url + "</a>";
+			var urls = [];
+			text = URI.withinString(text, function(url) {
+				urls.push(url);
+				return "{" + (urls.length - 1) + "}";
 			});
+			text = escape(text);
+			for (var i in urls) {
+				text = text.replace(
+					"{" + i + "}",
+					"<a href='" + urls[i].replace(/^www/, "//www") + "' target='_blank'>" + urls[i] + "</a>"
+				);
+			}
+			return text;
 		}
 	);