diff --git a/lib/marked.js b/lib/marked.js
index 0b7180ff..f233b76d 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -730,6 +730,7 @@ InlineLexer.prototype.smartypants = function(text) {
  */
 
 InlineLexer.prototype.mangle = function(text) {
+  if (!this.options.mangle) return text;
   var out = ''
     , l = text.length
     , i = 0
@@ -1232,6 +1233,7 @@ marked.defaults = {
   breaks: false,
   pedantic: false,
   sanitize: false,
+  mangle: true,
   smartLists: false,
   silent: false,
   highlight: null,
diff --git a/man/marked.1 b/man/marked.1
index f89f1a7b..b9bdc8c2 100644
--- a/man/marked.1
+++ b/man/marked.1
@@ -61,6 +61,9 @@ Use smarter list behavior than the original markdown.
 .BI \-\-lang\-prefix\ [\fIprefix\fP]
 Set the prefix for code block classes.
 .TP
+.BI \-\-mangle
+Mangle email addresses.
+.TP
 .BI \-\-no\-sanitize,\ \-no-etc...
 The inverse of any of the marked options above.
 .TP