Merge remote-tracking branch 'upstream/master' into z-push-update

This commit is contained in:
Michael Kroes 2015-10-31 03:08:54 -04:00
commit 9b1e04b1e8
2 changed files with 5 additions and 1 deletions

View file

@ -41,6 +41,10 @@ namespace inbox {
special_use = \Trash special_use = \Trash
auto = subscribe auto = subscribe
} }
mailbox Archive {
special_use = \Archive
auto = subscribe
}
# dovevot's standard mailboxes configuration file marks two sent folders # dovevot's standard mailboxes configuration file marks two sent folders
# with the \Sent attribute, just in case clients don't agree about which # with the \Sent attribute, just in case clients don't agree about which

View file

@ -56,7 +56,7 @@ tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
mail_privileged_group=mail \ mail_privileged_group=mail \
first_valid_uid=0 first_valid_uid=0
# Create, subscribe, and mark as special folders: INBOX, Drafts, Sent, Trash, and Spam. # Create, subscribe, and mark as special folders: INBOX, Drafts, Sent, Trash, Spam and Archive.
cp conf/dovecot-mailboxes.conf /etc/dovecot/conf.d/15-mailboxes.conf cp conf/dovecot-mailboxes.conf /etc/dovecot/conf.d/15-mailboxes.conf
# ### IMAP/POP # ### IMAP/POP