diff --git a/index.html b/index.html
index cac5e34..208f005 100644
--- a/index.html
+++ b/index.html
@@ -25,6 +25,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-touch/1.8.0/angular-touch.min.js" integrity="sha512-Fv9vdYa1UF171Mgs1hGeRXULvHflaw78t5EPI/cG6pVp9SjhjlhfL2ifdkwxEP0EBAhlA02UuE8mEjm65CYYpw==" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.10.2/underscore-min.js" integrity="sha512-HKvDCFVKg8ZPGjecy6on7UECEpE76Y86h3GaE4JMCz+deFWdjcW/tWnh0hCfaBvURvlOa9f5CNVzt7EFkulYbw==" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/emojione/2.2.7/lib/js/emojione.min.js" integrity="sha256-9cBkVeU53NiJ9/BdcJta3HbERAmf5X9DE2WvL8V+gDs=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery-linkify/2.1.9/linkify.min.js" integrity="sha512-kxj7VjlzsQgiku2vbRcZI0FJ0dXmPsiRLugiRxJrCROusKHaFfX/hGDD1/L/R0Y+xI8zlA2B5nm6USapz7nQbg==" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery-linkify/2.1.9/linkify-string.min.js" integrity="sha512-CMBjJdVIcw7zafkE+uedZCnw6r4ABU1Fev5xA7db0D097/NzhO6Ajo2kdZFOQ+y0kg9sE/t44bPAwuuNhUVIcQ==" crossorigin="anonymous"></script>
     <script type="text/javascript" src="3rdparty/inflate.min.js"></script>
     <script type="text/javascript" src="js/localstorage.js"></script>
     <script type="text/javascript" src="js/weechat.js"></script>
diff --git a/js/filters.js b/js/filters.js
index 193abcf..8fe607c 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -66,7 +66,21 @@ weechat.filter('conditionalLinkify', ['$filter', function($filter) {
         if (!text || disable) {
             return text;
         }
-        return $filter('linky')(text, '_blank', {rel:'noopener noreferrer'});
+
+        return linkifyStr(text, {
+            className: '',
+            attributes: {
+                rel: 'noopener noreferrer'
+            },
+            target: {
+                url: '_blank'
+            },
+            validate: {
+                email: function () {
+                    return false; //Do not linkify emails
+                }
+            }
+          });
     };
 }]);
 
diff --git a/package.json b/package.json
index d7ae807..e741902 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "karma": "^5.1.0",
     "karma-jasmine": "~3.1",
     "karma-junit-reporter": "~2.0",
-    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "linkifyjs": "^2.1.9",
     "protractor": "^7.0.0",
     "shelljs": "^0.8.4",
     "uglify-js": "^3.10.0"
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 43c86e7..0216f59 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -10,6 +10,8 @@ module.exports = function(config){
       'bower_components/angular-sanitize/angular-sanitize.js',
       'bower_components/angular-touch/angular-touch.js',
       'bower_components/underscore/underscore.js',
+      'node_modules/linkifyjs/dist/linkify.js',
+      'node_modules/linkifyjs/dist/linkify-string.js',
       'js/localstorage.js',
       'js/weechat.js',
       'js/irc-utils.js',
diff --git a/test/unit/filters.js b/test/unit/filters.js
index ebd6e39..4f0e189 100644
--- a/test/unit/filters.js
+++ b/test/unit/filters.js
@@ -10,6 +10,22 @@ describe('Filters', function() {
         expect($filter('irclinky')).not.toBeNull();
     }));
 
+    describe('conditionalLinkify', function() {
+        it('should create links from an url', inject(function($filter) {
+            var url = 'asdf https://a.example.com/wiki/asdf_qwer_(rivi%C3%A8re) Some text.',
+                link = 'asdf <a href="https://a.example.com/wiki/asdf_qwer_(rivi%C3%A8re)" target="_blank" rel="noopener noreferrer">https://a.example.com/wiki/asdf_qwer_(rivi%C3%A8re)</a> Some text.',
+                result = $filter('conditionalLinkify')(url);
+            expect(result).toEqual(link);        
+        }));
+
+        it('should not make emails into links', inject(function($filter) {
+            var url = 'asdf@gmail.com',
+                link = 'asdf@gmail.com',
+                result = $filter('conditionalLinkify')(url);
+            expect(result).toEqual(link);        
+        }));
+    });
+
     describe('irclinky', function() {
         it('should not mess up text', inject(function(irclinkyFilter) {
             expect(irclinkyFilter('foo')).toEqual('foo');
@@ -23,9 +39,9 @@ describe('Filters', function() {
             expect(irclinkyFilter('<"#foo">')).toEqual('<"<a href="#" onclick="openBuffer(\'#foo">\');">#foo"></a>');
         }));
 
-        it('should not touch links created by `linky`', inject(function(linkyFilter, DOMfilterFilter) {
+        it('should not touch links created by `linky`', inject(function($filter, DOMfilterFilter) {
             var url = 'http://foo.bar/#baz',
-                link = linkyFilter(url, '_blank'),
+                link = $filter('conditionalLinkify')(url),
                 result = DOMfilterFilter(link, 'irclinky').$$unwrapTrustedValue();
             expect(result).toEqual(link);
         }));
@@ -84,9 +100,9 @@ describe('Filters', function() {
             expect(result).toEqual(expected);
         }));
 
-        it('should never lock up like in bug #688', inject(function(linkyFilter, DOMfilterFilter) {
+        it('should never lock up like in bug #688', inject(function($filter, DOMfilterFilter) {
             var msg = '#crash http://google.com',
-                linked = linkyFilter(msg),
+                linked = $filter('conditionalLinkify')(msg),
                 irclinked = DOMfilterFilter(linked, 'irclinky');
             // With the bug, the DOMfilterFilter call ends up in an infinite loop.
             // I.e. if we ever got this far, the bug is fixed.