diff --git a/roles/ispmail-dovecot/files/10-mail.conf b/roles/ispmail-dovecot/files/10-mail.conf
index 10f4b80..3ef99fc 100644
--- a/roles/ispmail-dovecot/files/10-mail.conf
+++ b/roles/ispmail-dovecot/files/10-mail.conf
@@ -47,12 +47,12 @@ namespace inbox {
   # Hierarchy separator to use. You should use the same separator for all
   # namespaces or some clients get confused. '/' is usually a good one.
   # The default however depends on the underlying mail storage format.
-  #separator = 
+  #separator =
   separator = .
 
   # Prefix required to access this namespace. This needs to be different for
   # all namespaces. For example "Public/".
-  #prefix = 
+  #prefix =
 
   # Physical location of the mailbox. This is in same format as
   # mail_location, which is also the default for it.
@@ -78,14 +78,14 @@ namespace inbox {
   # namespace handles them (empty prefix should always have this as "yes")
   #subscriptions = yes
 
-  mailbox INBOX.Junk {
-    auto = subscribe # autocreate and autosubscribe the Junk mailbox
-    special_use = \Junk
-  }
-  mailbox INBOX.Trash {
-    auto = subscribe # autocreate and autosubscribe the Trash mailbox
-    special_use = \Trash
-  }
+#  mailbox INBOX.Junk {
+#    auto = subscribe # autocreate and autosubscribe the Junk mailbox
+#    special_use = \Junk
+#  }
+#  mailbox INBOX.Trash {
+#    auto = subscribe # autocreate and autosubscribe the Trash mailbox
+#    special_use = \Trash
+#  }
 }
 
 # Example shared namespace configuration
@@ -190,7 +190,7 @@ namespace inbox {
 # WARNING: Never add directories here which local users can modify, that
 # may lead to root exploit. Usually this should be done only if you don't
 # allow shell access for users. <doc/wiki/Chrooting.txt>
-#valid_chroot_dirs = 
+#valid_chroot_dirs =
 
 # Default chroot directory for mail processes. This can be overridden for
 # specific users in user database by giving /./ in user's home directory
@@ -198,7 +198,7 @@ namespace inbox {
 # need to do chrooting, Dovecot doesn't allow users to access files outside
 # their mail directory anyway. If your home directories are prefixed with
 # the chroot directory, append "/." to mail_chroot. <doc/wiki/Chrooting.txt>
-#mail_chroot = 
+#mail_chroot =
 
 # UNIX socket path to master authentication server to find users.
 # This is used by imap (for shared users) and lda.
@@ -209,7 +209,7 @@ namespace inbox {
 
 # Space separated list of plugins to load for all services. Plugins specific to
 # IMAP, LDA, etc. are added to this list in their own .conf files.
-#mail_plugins = 
+#mail_plugins =
 
 ##
 ## Mailbox handling optimizations
@@ -315,7 +315,7 @@ namespace inbox {
 # fallbacks to re-reading the whole mbox file whenever something in mbox isn't
 # how it's expected to be. The only real downside to this setting is that if
 # some other MUA changes message flags, Dovecot doesn't notice it immediately.
-# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK 
+# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK
 # commands.
 #mbox_dirty_syncs = yes
 
diff --git a/roles/ispmail-dovecot/tasks/main.yml b/roles/ispmail-dovecot/tasks/main.yml
index 42ab2f9..19d5350 100644
--- a/roles/ispmail-dovecot/tasks/main.yml
+++ b/roles/ispmail-dovecot/tasks/main.yml
@@ -29,6 +29,9 @@
 - name: Copying LDA configuration (10-lda.conf - enable sieve plugin)
   template: src=15-lda.conf.j2 dest=/etc/dovecot/conf.d/15-lda.conf
   notify: restart dovecot
+- name: Copying mailboxes configuration (15-mailboxes.conf - autocreate folders)
+  copy: src=15-mailboxes.conf dest=/etc/dovecot/conf.d/15-mailboxes.conf
+  notify: restart dovecot
 - name: Copying SQL access configuration (dovecot-ssql.conf.ext)
   template: src=dovecot-sql.conf.ext.j2 dest=/etc/dovecot/dovecot-sql.conf.ext
   notify: restart dovecot