diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index 80915820e..793c93595 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -3,13 +3,13 @@ import window from 'window';
 import $ from '$';
 import _ from '_';
 import ko from 'ko';
+import Autolinker from 'Autolinker';
+
 import {$win, $div, dropdownVisibility, data as GlobalsData} from 'Common/Globals';
 import {ComposeType, EventKeyCode, SaveSettingsStep, FolderType} from 'Common/Enums';
 import {Mime} from 'Common/Mime';
 import {jassl} from 'Common/Jassl';
 
-import Autolinker from 'Autolinker';
-
 const trim = $.trim;
 const inArray = $.inArray;
 const isArray = _.isArray;
@@ -744,18 +744,18 @@ export function settingsSaveHelperSubscribeFunction(remote, settingName, type, f
 export function findEmailAndLinks(html)
 {
 //	return html;
-	return Autolinker.link(html, {
+	return Autolinker ? Autolinker.link(html, {
 		newWindow: true,
 		stripPrefix: false,
 		urls: true,
 		email: true,
-		twitter: false,
+		mention: false,
 		phone: false,
 		hashtag: false,
-		replaceFn: function(autolinker, match) {
-			return !(autolinker && match && 'url' === match.getType() && match.matchedText && 0 !== match.matchedText.indexOf('http'));
+		replaceFn: function(match) {
+			return !(match && 'url' === match.getType() && match.matchedText && 0 !== match.matchedText.indexOf('http'));
 		}
-	});
+	}) : html;
 }
 
 /**
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index fb6402e93..ea27ddfc1 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -167,9 +167,9 @@
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.0.tgz"
     },
     "autolinker": {
-      "version": "0.28.0",
-      "from": "autolinker@0.28.0",
-      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.28.0.tgz"
+      "version": "1.1.0",
+      "from": "autolinker@1.1.0",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.1.0.tgz"
     },
     "autoprefixer": {
       "version": "6.4.0",
@@ -2446,9 +2446,9 @@
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
     },
     "js-cookie": {
-      "version": "2.1.2",
-      "from": "js-cookie@>=2.1.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.1.2.tgz"
+      "version": "2.1.3",
+      "from": "js-cookie@2.1.3",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.1.3.tgz"
     },
     "js-tokens": {
       "version": "2.0.0",
@@ -3505,11 +3505,13 @@
       "dependencies": {
         "isarray": {
           "version": "1.0.0",
-          "from": "isarray@>=1.0.0 <1.1.0"
+          "from": "isarray@1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
         },
         "readable-stream": {
           "version": "2.1.5",
-          "from": "readable-stream@>=2.0.0 <3.0.0"
+          "from": "readable-stream@2.1.5",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
         }
       }
     },
@@ -4362,11 +4364,13 @@
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@>=0.2.6 <0.3.0"
+              "from": "async@0.2.10",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "yargs": {
               "version": "3.10.0",
-              "from": "yargs@>=3.10.0 <3.11.0"
+              "from": "yargs@3.10.0",
+              "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
             }
           }
         },
diff --git a/package.json b/package.json
index 8039a8b1e..f5496f83d 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "Progress.js": "github:usablica/progress.js",
-    "autolinker": "^0.28.0",
+    "autolinker": "^1.1.0",
     "babel-core": "6.14.0",
     "babel-eslint": "^6.1.2",
     "babel-loader": "^6.2.5",
@@ -91,7 +91,7 @@
     "jquery-mousewheel": "^3.1.13",
     "jquery-scrollstop": "^1.2.0",
     "jquery.backstretch": "^2.1.13",
-    "js-cookie": "^2.1.2",
+    "js-cookie": "^2.1.3",
     "json-loader": "^0.5.4",
     "json3": "^3.3.2",
     "knockout": "^3.4.0",