diff --git a/addons/linkify/linkify.js b/addons/linkify/linkify.js
index 92089929..19d08b67 100644
--- a/addons/linkify/linkify.js
+++ b/addons/linkify/linkify.js
@@ -26,8 +26,8 @@
         hostClause = domainBodyClause + '\\.' + tldClause,
         pathClause = '([\\/\\w\\.-]*)*\\/?',
         bodyClause = hostClause + pathClause,
-        start = '(?:^|\\s+)(',
-        end = ')($|\\s+)',
+        start = '(?:^|\\s+|\\(+|\\[+)(',
+        end = ')($|\\s+|\\)+|\\]+)',
         urlClause = start + protocolClause + '?' + bodyClause + end,
         urlRegex = new RegExp(urlClause);