config: default-settings-import - Auto-subscribe to mailbox defaults

diff --git a/src/config/default-settings-import.h b/src/config/default-settings-import.h
index ea93d364d8d883318e0e9c533ffb3c095f078d2b..78ec0c95ad0b74e6394bc5a3db054c9580e6b5ff 100644 (file)
--- a/src/config/default-settings-import.h
+++ b/src/config/default-settings-import.h
@@ -45,15 +45,19 @@ static const char *mailbox_defaults =
 "  namespace inbox {\n"
 "    inbox = yes\n"
 "    mailbox Drafts {\n"
+"      auto = subscribe\n"
 "      special_use = \\Drafts\n"
 "    }\n"
 "    mailbox Junk {\n"
+"      auto = subscribe\n"
 "      special_use = \\Junk\n"
 "    }\n"
 "    mailbox Sent {\n"
+"      auto = subscribe\n"
 "      special_use = \\Sent\n"
 "    }\n"
 "    mailbox Trash {\n"
+"      auto = subscribe\n"
 "      special_use = \\Trash\n"
 "    }\n"
 "  }\n"

diff --git a/src/lib-settings/settings-history-core.txt b/src/lib-settings/settings-history-core.txt
index 8b642cf9acce5c6eacec4938e897d65cfa58ab7f..38e185743d9bd1edf17941a63385de9752d6832b 100644 (file)
--- a/src/lib-settings/settings-history-core.txt
+++ b/src/lib-settings/settings-history-core.txt
@@ -1,5 +1,9 @@
 # default <setting-path> <old-default> <ce-version> <pro-version>
 # rename <old-setting-key> <new-setting-key> <ce-version> <pro-version>
+default        @mailbox_defaults/english/namespace/inbox/mailbox/Drafts/mailbox_auto   no      2.4.3   3.2.0
+default        @mailbox_defaults/english/namespace/inbox/mailbox/Junk/mailbox_auto     no      2.4.3   3.2.0
+default        @mailbox_defaults/english/namespace/inbox/mailbox/Sent/mailbox_auto     no      2.4.3   3.2.0
+default        @mailbox_defaults/english/namespace/inbox/mailbox/Trash/mailbox_auto    no      2.4.3   3.2.0
 default        service/doveadm/service_extra_groups    $SET:default_internal_group     2.4.3   3.2.0
 default        service/imap/service_extra_groups       $SET:default_internal_group     2.4.3   3.2.0
 default        service/imap-urlauth-worker/service_extra_groups        $SET:default_internal_group     2.4.3   3.2.0