diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 9965ebbbbfdf857b81170c386baad4664cf98f09..e680462762467229eb936135d0207eb7122dacd3 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -1,4 +1,3 @@
-
 require ["fileinto", "regex", "date", "relational", "vacation"];
 
 <tmpl_if name="cc">
@@ -30,9 +29,9 @@ if header :contains "X-Spam-Flag" "YES" {
   stop;
 }
 
-if allof(currentdate :value "ge" "date" "<tmpl_var name='start_date'>", currentdate :value "le" "date" "<tmpl_var name='end_date'>") {
+if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
 vacation  :days 1
-  :subject "Out of office reply"
+  :subject "<tmpl_var name='autoresponder_subject'>"
   <tmpl_var name='addresses'>
   "<tmpl_var name='autoresponder_text'>";
 }