diff --git a/program/include/main.inc b/program/include/main.inc
index f04636a4d..d914e3ecb 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1088,9 +1088,9 @@ function Q($str, $mode='strict', $newlines=TRUE)
  * Quote a given string. Alias function for rep_specialchars_output
  * @see rep_specialchars_output
  */
-function JQ($str, $mode='strict', $newlines=TRUE)
+function JQ($str)
   {
-  return rep_specialchars_output($str, 'js', $mode, $newlines);
+  return rep_specialchars_output($str, 'js');
   }
 
 
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index b8c391aae..83f170d16 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1214,8 +1214,8 @@ function rcmail_mod_html_body($body, $container_id)
   while ($body != $prev_body)
     {
     $prev_body = $body;
-    $body = preg_replace('/(<[^!][^>]*?\s)(on[^=]+)(=[^>]*?>)/im', '$1__removed=$3', $body);
-    $body = preg_replace('/(<[^!][^>]*?\shref=["\']?)(javascript:)([^>]*?>)/im', '$1null:$3', $body);
+    $body = preg_replace('/(<[^!][^>]*\s)(on[^=>]+)=([^>]+>)/im', '$1__removed=$3', $body);
+    $body = preg_replace('/(<[^!][^>]*\shref=["\']?)(javascript:)([^>]*?>)/im', '$1null:$3', $body);
     }
 
   // resolve <base href>