diff --git a/manager/includes/extenders/modxmailer.class.inc.php b/manager/includes/extenders/modxmailer.class.inc.php
index b655e58cc3..b82d2aaac9 100644
--- a/manager/includes/extenders/modxmailer.class.inc.php
+++ b/manager/includes/extenders/modxmailer.class.inc.php
@@ -110,6 +110,17 @@ public function Send() {
 		if(strpos($this->Body, $sanitize_seed)!==false)    $this->Body = str_replace($sanitize_seed, '', $this->Body);
 		if(strpos($this->Subject, $sanitize_seed)!==false) $this->Subject = str_replace($sanitize_seed, '', $this->Subject);
 		
+		$target = array(
+					"sanitized_by_modx& #039"=>"'",
+					"sanitized_by_modx& #145"=>"'",
+					"sanitized_by_modx& #146"=>"'",
+					"sanitized_by_modx& #034"=>"\"",
+					"sanitized_by_modx& #147"=>"\"",
+					"sanitized_by_modx& #148"=>"\"",
+					"""=>"\""
+				);
+		$this->Body = str_replace(array_keys($target), array_values($target), $this->Body);
+
         try {
             if(!$this->PreSend()) return false;
             return $this->PostSend();