diff --git a/README.md b/README.md
index 0a12038..d7946f1 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Deploy with composer:
 ```json
 ...
 "require": {
-    "kristuff/abuseipdb": "^1.0-stable"
+    "kristuff/abuseipdb": "^1.1-stable"
 },
 ```
 
diff --git a/lib/ApiBase.php b/lib/ApiBase.php
index e48440b..9adf14c 100644
--- a/lib/ApiBase.php
+++ b/lib/ApiBase.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    1.0
+ * @version    1.1
  * @copyright  2020-2022 Kristuff
  */
 
diff --git a/lib/ApiHandler.php b/lib/ApiHandler.php
index 9549260..2cee02c 100644
--- a/lib/ApiHandler.php
+++ b/lib/ApiHandler.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    1.0
+ * @version    1.1
  * @copyright  2020-2022 Kristuff
  */
 
@@ -34,7 +34,7 @@ class ApiHandler extends ApiBase
     /**
      * @var string
      */
-    const VERSION = 'v1.0'; 
+    const VERSION = 'v1.1'; 
 
     /**
      * The ips to remove from report messages
@@ -469,8 +469,8 @@ class ApiHandler extends ApiBase
         }
 
         // If we're reporting spam, further munge any email addresses in the report
-        $emailPattern = "/[^@\s]*@[^@\s]*\.[^@\s]*/";
-        $message = preg_replace($emailPattern, "*", $message);
+        $emailPattern   = "/\b[A-Z0-9!#$%&'*`\/?^{|}~=+_.-]+@[A-Z0-9.-]+\b/i";
+        $message        = preg_replace($emailPattern, "*", $message);
         
         // Make sure message is less 1024 chars
         return substr($message, 0, 1024);
diff --git a/lib/ApiResponse.php b/lib/ApiResponse.php
index 92f866a..3e451f0 100644
--- a/lib/ApiResponse.php
+++ b/lib/ApiResponse.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    1.0
+ * @version    1.1
  * @copyright  2020-2022 Kristuff
  */
 
diff --git a/lib/CurlTrait.php b/lib/CurlTrait.php
index ee71cf0..667fdda 100644
--- a/lib/CurlTrait.php
+++ b/lib/CurlTrait.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    1.0
+ * @version    1.1
  * @copyright  2020-2022 Kristuff
  */
 
diff --git a/lib/InvalidPermissionException.php b/lib/InvalidPermissionException.php
index dcc6157..8ec9bc1 100644
--- a/lib/InvalidPermissionException.php
+++ b/lib/InvalidPermissionException.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    1.0
+ * @version    1.1
  * @copyright  2020-2022 Kristuff
  */
 
diff --git a/lib/QuietApiHandler.php b/lib/QuietApiHandler.php
index a272d58..632b140 100644
--- a/lib/QuietApiHandler.php
+++ b/lib/QuietApiHandler.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    1.0
+ * @version    1.1
  * @copyright  2020-2022 Kristuff
  */