diff --git a/config.prod/src/.env b/config.prod/src/.env
--- a/config.prod/src/.env
+++ b/config.prod/src/.env
@@ -65,6 +65,7 @@
 IMAP_ADMIN_PASSWORD={{ admin_password }}
 IMAP_VERIFY_HOST=false
 IMAP_VERIFY_PEER=false
+IMAP_WITH_GROUPWARE_DEFAULT_FOLDERS=false
 
 SMTP_HOST=172.18.0.13
 SMTP_PORT=10587
diff --git a/config.prod/src/config/imap.php b/config.prod/src/config/imap.php
deleted file mode 100644
--- a/config.prod/src/config/imap.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-return [
-    'uri' => env('IMAP_URI', 'ssl://kolab:11993'),
-    'admin_login' => env('IMAP_ADMIN_LOGIN', 'cyrus-admin'),
-    'admin_password' => env('IMAP_ADMIN_PASSWORD', null),
-    'verify_peer' => env('IMAP_VERIFY_PEER', true),
-    'verify_host' => env('IMAP_VERIFY_HOST', true),
-    'host' => env('IMAP_HOST', '172.18.0.5'),
-    'imap_port' => env('IMAP_PORT', 12143),
-    'guam_port' => env('IMAP_GUAM_PORT', 9143),
-    'default_folders' => [
-        'Drafts' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'mail.drafts',
-            ],
-        ],
-        'Sent' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'mail.sentitems',
-            ],
-        ],
-        'Trash' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'mail.wastebasket',
-            ],
-        ],
-        'Spam' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'mail.junkemail',
-            ],
-        ],
-    ]
-];
diff --git a/src/config/imap.php b/src/config/imap.php
--- a/src/config/imap.php
+++ b/src/config/imap.php
@@ -1,5 +1,67 @@
 <?php
 
+if (!function_exists("imap_defaultFolders")) {
+    function imap_defaultFolders() {
+        $folders = [
+            'Drafts' => [
+                'metadata' => [
+                    '/private/vendor/kolab/folder-type' => 'mail.drafts',
+                ],
+            ],
+            'Sent' => [
+                'metadata' => [
+                    '/private/vendor/kolab/folder-type' => 'mail.sentitems',
+                ],
+            ],
+            'Trash' => [
+                'metadata' => [
+                    '/private/vendor/kolab/folder-type' => 'mail.wastebasket',
+                ],
+            ],
+            'Spam' => [
+                'metadata' => [
+                    '/private/vendor/kolab/folder-type' => 'mail.junkemail',
+                ],
+            ],
+        ];
+        if (env('IMAP_WITH_GROUPWARE_DEFAULT_FOLDERS', true)) {
+            $folders = array_merge($folders, [
+                'Calendar' => [
+                    'metadata' => [
+                        '/private/vendor/kolab/folder-type' => 'event.default',
+                        '/shared/vendor/kolab/folder-type' => 'event',
+                    ],
+                ],
+                'Contacts' => [
+                    'metadata' => [
+                        '/private/vendor/kolab/folder-type' => 'contact.default',
+                        '/shared/vendor/kolab/folder-type' => 'event',
+                    ],
+                ],
+                'Tasks' => [
+                    'metadata' => [
+                        '/private/vendor/kolab/folder-type' => 'task.default',
+                        '/shared/vendor/kolab/folder-type' => 'task',
+                    ],
+                ],
+                'Notes' => [
+                    'metadata' => [
+                        '/private/vendor/kolab/folder-type' => 'note.default',
+                        '/shared/vendor/kolab/folder-type' => 'note',
+                    ],
+                ],
+                'Files' => [
+                    'metadata' => [
+                        '/private/vendor/kolab/folder-type' => 'file.default',
+                        '/shared/vendor/kolab/folder-type' => 'file',
+                    ],
+                ],
+            ]);
+        }
+        return $folders;
+    }
+}
+
 return [
     'uri' => env('IMAP_URI', 'ssl://kolab:11993'),
     'admin_login' => env('IMAP_ADMIN_LOGIN', 'cyrus-admin'),
@@ -9,57 +71,5 @@
     'host' => env('IMAP_HOST', '172.18.0.5'),
     'imap_port' => env('IMAP_PORT', 12143),
     'guam_port' => env('IMAP_GUAM_PORT', 9143),
-    'default_folders' => [
-        'Drafts' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'mail.drafts',
-            ],
-        ],
-        'Sent' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'mail.sentitems',
-            ],
-        ],
-        'Trash' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'mail.wastebasket',
-            ],
-        ],
-        'Spam' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'mail.junkemail',
-            ],
-        ],
-
-        'Calendar' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'event.default',
-                '/shared/vendor/kolab/folder-type' => 'event',
-            ],
-        ],
-        'Contacts' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'contact.default',
-                '/shared/vendor/kolab/folder-type' => 'event',
-            ],
-        ],
-        'Tasks' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'task.default',
-                '/shared/vendor/kolab/folder-type' => 'task',
-            ],
-        ],
-        'Notes' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'note.default',
-                '/shared/vendor/kolab/folder-type' => 'note',
-            ],
-        ],
-        'Files' => [
-            'metadata' => [
-                '/private/vendor/kolab/folder-type' => 'file.default',
-                '/shared/vendor/kolab/folder-type' => 'file',
-            ],
-        ],
-    ]
+    'default_folders' => imap_defaultFolders()
 ];