diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee
index 3364d8286..35addf319 100755
--- a/src/Linkification/Linkify.coffee
+++ b/src/Linkification/Linkify.coffee
@@ -90,7 +90,7 @@ Linkify =
     | # This should account for virtually all links posted without http:
     ([-a-z\d]+[.])+(
       aero|asia|biz|cat|com|coop|info|int|jobs|mobi|moe|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[a-z]{2}
-    )([:/]|(?!.))
+    )([:/]|(?![^\s'"]))
     | # IPv4 Addresses
     [\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}
     | # E-mails