diff --git a/Parsedown.php b/Parsedown.php
index e9a8cbd..23f89fd 100755
--- a/Parsedown.php
+++ b/Parsedown.php
@@ -1135,7 +1135,7 @@ class Parsedown
                     'name' => 'a',
                     'text' => $matches[1],
                     'attributes' => array(
-                        'href' => 'mailto:'.$matches[1],
+                        'href' => $this->encodeEmailUrl('mailto:' . $matches[1]),
                     ),
                 ),
             );
@@ -1231,6 +1231,11 @@ class Parsedown
 
         $url = str_replace(array('&', '<'), array('&amp;', '&lt;'), $Link['url']);
 
+        if ("mailto:" === substr($url, 0, 7))
+        {
+            $url = $this->encodeEmailUrl($url);
+        }
+
         if ($Excerpt['text'][0] === '!')
         {
             $Element = array(
@@ -1331,6 +1336,17 @@ class Parsedown
         return $markup;
     }
 
+
+    private function encodeEmailUrl ($email)
+    {
+        $encoded = '';
+
+        for ($x = 0, $_length = strlen($email); $x < $_length; $x ++) {
+            $encoded .= '&#x' . bin2hex($email[$x]) . ';';
+        }
+        return $encoded;
+    }
+
     #
     # Multiton
     #
diff --git a/test/data/email.html b/test/data/email.html
index c40759c..cef6d07 100644
--- a/test/data/email.html
+++ b/test/data/email.html
@@ -1 +1 @@
-<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="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#x6d;&#x65;&#x40;&#x65;&#x78;&#x61;&#x6d;&#x70;&#x6c;&#x65;&#x2e;&#x63;&#x6f;&#x6d;">me@example.com</a></p>
\ No newline at end of file