diff --git a/lib/marked.js b/lib/marked.js
index 3988e6f6..15f61cb3 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -328,14 +328,15 @@ inline.lexer = function(str) {
           if (cap[2] === '@') {
             var email = mangle(cap[1])
               , mailto = mangle('mailto:') + mailto;
+            out += '<a href="' + mailto + '">'
+              + email
+              + '</a>';
           } else {
             var href = escape(cap[1]);
+            out += '<a href="' + href + '">'
+              + href
+              + '</a>';
           }
-          out += '<a href="' 
-            + (mailto || href) 
-            + '">'
-            + (email || href)
-            + '</a>';
           break;
         case 'strong':
           out += '<strong>'