diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 3bd42ed17f85105dca64639f2fe6e7afc64e0668..9965ebbbbfdf857b81170c386baad4664cf98f09 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -1,5 +1,5 @@
 
-require ["fileinto", "regex", "vacation"];
+require ["fileinto", "regex", "date", "relational", "vacation"];
 
 <tmpl_if name="cc">
 # Send a copy of email to
@@ -29,8 +29,11 @@ if header :contains "X-Spam-Flag" "YES" {
   # Stop here so that we do not reply on spams
   stop;
 }
+
+if allof(currentdate :value "ge" "date" "<tmpl_var name='start_date'>", currentdate :value "le" "date" "<tmpl_var name='end_date'>") {
 vacation  :days 1
   :subject "Out of office reply"
   <tmpl_var name='addresses'>
   "<tmpl_var name='autoresponder_text'>";
+}
 </tmpl_if>
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index a1573c9e31271d9fb30d00fe1d56be36414f1f48..61efb9c0535400b58a4b322dd89cb1bd6b9b10b3 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -112,7 +112,13 @@ class maildeliver_plugin {
 				
 			// Move junk
 			$tpl->setVar('move_junk',$data["new"]["move_junk"]);
-				
+
+			// Set autoresponder start date
+			$tpl->setVar('start_date',$data["new"]["autoresponder_start_date"]);
+
+			// Set autoresponder end date
+			$tpl->setVar('end_date',$data["new"]["autoresponder_end_date"]);
+
 			// Autoresponder
 			$tpl->setVar('autoresponder',$data["new"]["autoresponder"]);