diff --git a/lib/marked.js b/lib/marked.js
index 3708e3d7..850ef61e 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -312,7 +312,9 @@ inline.lexer = function(str) {
         break;
       case 'autolink':
         if (cap[2] === '@') {
-          text = mangle(cap[1].split(':').pop());
+          text = cap[1][6] === ':'
+            ? mangle(cap[1].substring(7))
+            : mangle(cap[1]);
           href = mangle('mailto:') + text;
         } else {
           text = escape(cap[1]);