diff --git a/dovecot/defaults/main.yml b/dovecot/defaults/main.yml
index f65607181db8d1a8c6ce952cd854fd71dbf95886..b253b5b000199a992e9fb8527cc1b2f595bf7d23 100644
--- a/dovecot/defaults/main.yml
+++ b/dovecot/defaults/main.yml
@@ -35,6 +35,8 @@ dovecot_sieve: 'file:~/sieve;active=~/.dovecot.sieve'
 
 # These variables were introduced for compatibility to a certain setup.
 # They may disappear without prior notice and/or may not work as expected.
+dovecot_lda_mailbox_autocreate: false
+dovecot_lda_mailbox_autosubscribe: false
 dovecot_auth_realms: []
 dovecot_auth_default_realm: ''
 dovecot_auth_krb5_keytab: ''
diff --git a/dovecot/templates/conf.d/15-lda.conf.j2 b/dovecot/templates/conf.d/15-lda.conf.j2
index 47e83ded6f4c9a62796ca70dcd849816342aa528..cdce6e3394deba423e0393702c7b449c4ebcb768 100644
--- a/dovecot/templates/conf.d/15-lda.conf.j2
+++ b/dovecot/templates/conf.d/15-lda.conf.j2
@@ -37,10 +37,10 @@
 #lda_original_recipient_header =
 
 # Should saving a mail to a nonexistent mailbox automatically create it?
-#lda_mailbox_autocreate = no
+lda_mailbox_autocreate = {{ 'yes' if dovecot_lda_mailbox_autocreate else 'no' }}
 
 # Should automatically created mailboxes be also automatically subscribed?
-#lda_mailbox_autosubscribe = no
+lda_mailbox_autosubscribe = {{ 'yes' if dovecot_lda_mailbox_autosubscribe else 'no' }}
 
 protocol lda {
   # Space separated list of plugins to load (default is global mail_plugins).