diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index c5b33e4ba314f0c52af852273318096bf24fb1ff..b5dedebf293706ea67fd7a2aff107186663ccbb4 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -3,12 +3,12 @@
 # You can create and activate a per-user sieve script (manually or via managesieve),
 # which will execute after this.
 
-require ["fileinto", "regex", "date", "relational", "vacation", "imap4flags", "envelope", "subaddress", "copy", "reject"];
+require ["fileinto", "mailbox", "regex", "date", "relational", "vacation", "imap4flags", "envelope", "subaddress", "copy", "reject"];
 
 <tmpl_if name="move_junk" op="==" value="y">
 # Move spam to spam folder
 if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
-  fileinto "Junk";
+  fileinto :create "Junk";
   # Stop here so that we do not reply on spams
   stop;
 }
@@ -32,7 +32,7 @@ redirect "<tmpl_var name='address'>";
 <tmpl_if name="move_junk" op="==" value="a">
 # Move spam to spam folder
 if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
-  fileinto "Junk";
+  fileinto :create "Junk";
   # Stop here so that we do not reply on spams
   stop;
 }