diff --git a/Parsedown.php b/Parsedown.php
index 87d612a..c0dbf08 100644
--- a/Parsedown.php
+++ b/Parsedown.php
@@ -1142,8 +1142,14 @@ class Parsedown
 
     protected function inlineEmailTag($Excerpt)
     {
-        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
-        {
+        $hostnameLabel = '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?';
+
+        $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@'
+            . $hostnameLabel . '(?:\.' . $hostnameLabel . ')*';
+
+        if (strpos($Excerpt['text'], '>') !== false
+            and preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches)
+        ){
             $url = $matches[1];
 
             if ( ! isset($matches[2]))
@@ -1479,7 +1485,7 @@ class Parsedown
         {
             $markup .= '>';
 
-            if (!isset($Element['nonNestables'])) 
+            if (!isset($Element['nonNestables']))
             {
                 $Element['nonNestables'] = array();
             }
diff --git a/test/data/email.html b/test/data/email.html
index c40759c..93e0705 100644
--- a/test/data/email.html
+++ b/test/data/email.html
@@ -1 +1,2 @@
-<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>
\ No newline at end of file
+<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>
+<p>html tags shouldn't start an email autolink <strong>first.last@example.com</strong></p>
\ No newline at end of file
diff --git a/test/data/email.md b/test/data/email.md
index 26b7b6c..00b6969 100644
--- a/test/data/email.md
+++ b/test/data/email.md
@@ -1 +1,3 @@
-my email is <me@example.com>
\ No newline at end of file
+my email is <me@example.com>
+
+html tags shouldn't start an email autolink <strong>first.last@example.com</strong>
\ No newline at end of file