diff --git a/chrome/content/unsafelinks.js b/chrome/content/unsafelinks.js
index 6ab86169c2df0db25074c5f8905d2708a2e7947f..076d860a846a73a44b87705286896e61d71bf36d 100644
--- a/chrome/content/unsafelinks.js
+++ b/chrome/content/unsafelinks.js
@@ -45,7 +45,7 @@ var unsafelinks = {
     },
 
     // Regular expression matching a safelinks-encoded URL.
-    urlRegex: /https?:\/\/(?:.+?\.)?safelinks\.protection\.outlook\.com\/([A-Za-z0-9\-\._~:\/\?#\[\]@!$&'\(\)\*\+,;\=%]*)/gi,
+    urlRegex: /https?:\/\/(?:.+?\.)?safelinks\.protection\.outlook\.com\/(?:[^\?]+)?([A-Za-z0-9\-\._~:\/\?#\[\]@!$&'\(\)\*\+,;\=%]*)/gi,
 
     replacer: function(url, queryString){
         // Extract the "url" parameter from the URL, if it exists.
diff --git a/manifest.json b/manifest.json
index 1e2b72fc45b6cd3168ffb3e845e9ea5df4298b2a..8167046a64014eec4c2c5f52e3d0d9718227679e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "Un-Safelinks",
     "description": "Replace URLs which have been rewritten by Office 365 Advanced Threat Protection with the original URL.",
-    "version": "1.3.3",
+    "version": "1.4",
     "author": "Anton Sarukhanov",
     "homepage_url": "https://github.com/antsar/unsafelinks",
     "applications": {