--- a/VirtualMailManager/Config.py	Thu Jul 22 16:18:38 2010 +0000
+++ b/VirtualMailManager/Config.py	Thu Jul 22 21:20:52 2010 +0000
@@ -332,6 +332,7 @@
                                self.unicode),
                 'format': LCO(str, 'maildir', self.get, check_mailbox_format),
                 'root': LCO(str, 'Maildir', self.unicode),
+                'subscribe': LCO(bool_t, True, self.getboolean),
             },
             'misc': {
                 'base_directory': LCO(str, '/srv/mail', self.get, is_dir),

--- a/man/de/man5/vmm.cfg.5.rst	Thu Jul 22 16:18:38 2010 +0000
+++ b/man/de/man5/vmm.cfg.5.rst	Thu Jul 22 21:20:52 2010 +0000
@@ -330,12 +330,22 @@
   Benutzers. Übliche Namen, je nach verwendetem |mailbox.format|_, sind:
   **Maildir**, **mdbox** oder **sdbox**.
 
+.. _mailbox.subscribe:
+
+``subscribe (Vorgabe: true)`` : *Boolean*
+  Wenn dieser Option der Wert **true** zugewiesen wurde, werden die, gemäß
+  |mailbox.folders|_, erstellen Mailboxen in der subscriptions-Datei des
+  Benutzers gelistet. Sollen die erstellen Mailboxen nicht nicht in der
+  subscriptions-Datei gelistet werden, weisen Sie dieser Option den Wert
+  **false** zu.
+
 Beispiel::
 
   [mailbox]
   folders = Drafts:Sent:Templates:Trash:Lists.Dovecot:Lists.Postfix
   format = maildir
   root = Maildir
+  subscribe = false
 
 
 MISC

--- a/man/man5/vmm.cfg.5.rst	Thu Jul 22 16:18:38 2010 +0000
+++ b/man/man5/vmm.cfg.5.rst	Thu Jul 22 21:20:52 2010 +0000
@@ -316,12 +316,21 @@
   names, depending on the used |mailbox.format|_, are **Maildir**, **mdbox**
   or **sdbox**.
 
+.. _mailbox.subscribe:
+
+``subscribe (default: true)`` : *Boolean*
+  When this option is set to **true**, the mailboxes from the
+  |mailbox.folders|_ option will be listed in the user's subscriptions file.
+  If you don't want to subscribe the created mailboxes, set this option to
+  **false**.
+
 Example::
 
   [mailbox]
   folders = Drafts:Sent:Templates:Trash:Lists.Dovecot:Lists.Postfix
   format = maildir
   root = Maildir
+  subscribe = false
 
 
 MISC

--- a/man/substitute_links_5.rst	Thu Jul 22 16:18:38 2010 +0000
+++ b/man/substitute_links_5.rst	Thu Jul 22 21:20:52 2010 +0000
@@ -1,6 +1,7 @@
 .. Substitutions in section 5
 
 .. |account.password_length| replace:: **password_length**
+.. |mailbox.folders| replace:: **folders**
 .. |mailbox.format| replace:: **format**
 .. |misc.crypt_sha256_rounds| replace:: **crypt_sha256_rounds**
 .. |misc.crypt_sha512_rounds| replace:: **crypt_sha512_rounds**

--- a/vmm.cfg	Thu Jul 22 16:18:38 2010 +0000
+++ b/vmm.cfg	Thu Jul 22 21:20:52 2010 +0000
@@ -34,6 +34,9 @@
 ;    * mdbox:   mdbox
 ;    * sdbox:   sdbox
 root = Maildir
+; Set to true if the mailboxes from the folders option should be listed in
+; the subscriptions file. (Boolean)
+subscribe = true
 
 #
 # Domain settings