diff --git a/emailadmin/inc/class.emailadmin_script.inc.php b/emailadmin/inc/class.emailadmin_script.inc.php
index 23253cf3cc..2546741086 100644
--- a/emailadmin/inc/class.emailadmin_script.inc.php
+++ b/emailadmin/inc/class.emailadmin_script.inc.php
@@ -445,7 +445,8 @@ class emailadmin_script {
 					$newscriptbody .= "\tkeep;\n}\n";
 				}
 				$vacation_active = true;
-				$newscriptbody .= "if header :contains ".'"X-Spam-Status" '.'"YES"'."{\n\tstop;\n}\n"; //stop vacation reply if it is spam
+				//$newscriptbody .= "if header :contains ".'"X-Spam-Status" '.'"YES"'."{\n\tstop;\n}\n"; //stop vacation reply if it is spam
+				$newscriptbody .= "if header :regex ".'"X-Spam-Status" '.'"\\\\bYES\\\\b"'."{\n\tstop;\n}\n"; //stop vacation reply if it is spam
 				$newscriptbody .= "vacation :days " . $vacation['days'] . " :addresses [";
 				$first = 1;
 				foreach ($vacation['addresses'] as $vaddress) {
@@ -522,7 +523,7 @@ class emailadmin_script {
 
 		if ($activerules) {
 			$newscripthead .= "require [\"fileinto\"";
-			if ($regexused) $newscripthead .= ",\"regex\"";
+			if ($regexused||($this->vacation&& $vacation_active)) $newscripthead .= ",\"regex\"";
 			if ($rejectused) $newscripthead .= ",\"reject\"";
 			if ($this->vacation && $vacation_active) {
 				$newscripthead .= ",\"vacation\"";