diff --git a/change_log.txt b/change_log.txt
index 12f5aa2a..fccd5e7b 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -2,6 +2,7 @@
 06.10.2011
 - bugfix switch lexer internals depending on mbstring.func_overload
 - bugfix start_year and end_year of {html_select_date} did not use current year as offset base (Issue #53)
+- improvement removed html comments from {mailto} (Forum Topic 20092)
 
 05.10.2011
 - bugfix of problem introduced with r4342 by replacing strlen() with isset()
diff --git a/libs/plugins/function.mailto.php b/libs/plugins/function.mailto.php
index 0f56195c..c8e18fc6 100644
--- a/libs/plugins/function.mailto.php
+++ b/libs/plugins/function.mailto.php
@@ -117,14 +117,12 @@ function smarty_function_mailto($params, $template)
             $ord[] = ord($string[$x]);
         }
 
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n";
-        $_ret .= "<!--\n";
-        $_ret .= "{document.write(String.fromCharCode(";
-        $_ret .= implode(',', $ord);
-        $_ret .= "))";
-        $_ret .= "}\n";
-        $_ret .= "//-->\n";
-        $_ret .= "</script>\n";
+        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n"
+            . "{document.write(String.fromCharCode("
+            . implode(',', $ord)
+            . "))"
+            . "}\n"
+            . "</script>\n";
 
         return $_ret;
     } elseif ($encode == 'hex') {