3 files changed, 8 insertions, 7 deletions
diff --git a/roles/IMAP/files/etc/dovecot/conf.d/10-mail.conf b/roles/IMAP/files/etc/dovecot/conf.d/10-mail.conf
index 2c5f34f..9c24645 100644
--- a/roles/IMAP/files/etc/dovecot/conf.d/10-mail.conf
+++ b/roles/IMAP/files/etc/dovecot/conf.d/10-mail.conf
@@ -64,42 +64,43 @@ namespace inbox {
   # extension. You'll most likely also want to set list=no. This is mostly
   # useful when converting from another server with different namespaces which
   # you want to deprecate but still keep working. For example you can create
   # hidden namespaces with prefixes "~/mail/", "~%u/mail/" and "mail/".
   #hidden = no
 
   # Show the mailboxes under this namespace with LIST command. This makes the
   # namespace visible for clients that don't support NAMESPACE extension.
   # "children" value lists child mailboxes, but hides the namespace prefix.
   #list = yes
 
   # Namespace handles its own subscriptions. If set to "no", the parent
   # namespace handles them (empty prefix should always have this as "yes")
   #subscriptions = yes
 }
 
 namespace virtual {
   prefix = virtual/
   separator = /
   location = virtual:/etc/dovecot/virtual:INDEX=~/virtual
-  list = no
+  list = yes
   hidden = no
+  subscriptions = no
 }
 
 # Example shared namespace configuration
 #namespace {
   #type = shared
   #separator = /
 
   # Mailboxes are visible under "shared/user@domain/"
   # %%n, %%d and %%u are expanded to the destination user.
   #prefix = shared/%%u/
 
   # Mail location for other users' mailboxes. Note that %variables and ~/
   # expands to the logged in user's data. %%n, %%d, %%u and %%h expand to the
   # destination user's data.
   #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u
 
   # Use the default namespace for saving subscriptions.
   #subscriptions = no
 
   # List the shared/ namespace only if there are visible shared mailboxes.
diff --git a/roles/IMAP/files/etc/dovecot/conf.d/15-mailboxes.conf b/roles/IMAP/files/etc/dovecot/conf.d/15-mailboxes.conf
index e110f28..6aa5c22 100644
--- a/roles/IMAP/files/etc/dovecot/conf.d/15-mailboxes.conf
+++ b/roles/IMAP/files/etc/dovecot/conf.d/15-mailboxes.conf
@@ -1,45 +1,45 @@
 ##
 ## Mailbox definitions
 ##
 
 # NOTE: Assumes "namespace inbox" has been defined in 10-mail.conf.
 namespace inbox {
 
   #mailbox name {
     # auto=create will automatically create this mailbox.
     # auto=subscribe will both create and subscribe to the mailbox.
     #auto = no
 
     # Space separated list of IMAP SPECIAL-USE attributes as specified by
     # RFC 6154: \All \Archive \Drafts \Flagged \Junk \Sent \Trash
     #special_use =
   #}
 
   # These mailboxes are widely used and could perhaps be created automatically:
-  mailbox TRASH {
+  mailbox Trash {
     auto = create
     special_use = \Trash
   }
-  mailbox DRAFTS {
+  mailbox Drafts {
     auto = create
     special_use = \Drafts
   }
-  mailbox SENT {
+  mailbox Sent {
     auto = subscribe
     special_use = \Sent
   }
-  mailbox SPAM {
+  mailbox Junk {
     auto = create
     special_use = \Junk
   }
 
   # If you have a virtual "All messages" mailbox:
   mailbox virtual/All {
     special_use = \All
   }
 
   # If you have a virtual "Flagged" mailbox:
   mailbox virtual/Flagged {
     special_use = \Flagged
   }
 }
diff --git a/roles/IMAP/files/etc/dovecot/conf.d/90-plugin.conf b/roles/IMAP/files/etc/dovecot/conf.d/90-plugin.conf
index 6e60f0f..aed06c0 100644
--- a/roles/IMAP/files/etc/dovecot/conf.d/90-plugin.conf
+++ b/roles/IMAP/files/etc/dovecot/conf.d/90-plugin.conf
@@ -1,21 +1,21 @@
 ##
 ## Plugin settings
 ##
 
 # All wanted plugins must be listed in mail_plugins setting before any of the
 # settings take effect. See <doc/wiki/Plugins.txt> for list of plugins and
 # their configuration. Note that %variable expansion is done for all values.
 
 plugin {
   antispam_backend = spool2dir
 
-  antispam_trash = TRASH
+  antispam_trash = Trash
   antispam_unsure_pattern_ignorecase = MailTrain;MailTrain/*
-  antispam_spam = SPAM
+  antispam_spam = Junk
 
   # The first %%lu is replaced by the current time.
   # The second %%lu is replaced by a counter to generate unique names.
   # These two tokens MUST be present in the template!
   antispam_spool2dir_spam    = /home/mail/spamspool/%u-%%10lu-%%06lu.spam
   antispam_spool2dir_notspam = /home/mail/spamspool/%u-%%10lu-%%06lu.ham
 }