diff --git a/plugins/kolab_folders/kolab_folders.php b/plugins/kolab_folders/kolab_folders.php
index b4846374..01c025cf 100644
--- a/plugins/kolab_folders/kolab_folders.php
+++ b/plugins/kolab_folders/kolab_folders.php
@@ -27,7 +27,7 @@ class kolab_folders extends rcube_plugin
 {
     public $task = '?(?!login).*';
 
-    public $types = array('mail', 'event', 'journal', 'task', 'note', 'contact');
+    public $types = array('mail', 'event', 'journal', 'task', 'note', 'contact', 'configuration');
     public $mail_types = array('drafts', 'sentitems', 'outbox', 'wastebasket', 'junkemail');
     private $rc;
 
@@ -167,10 +167,6 @@ class kolab_folders extends rcube_plugin
      */
     function folder_form($args)
     {
-        if ($args['options']['is_root']) {
-            return $args;
-        }
-
         if (!$this->metadata_support()) {
             return $args;
         }
@@ -187,6 +183,10 @@ class kolab_folders extends rcube_plugin
             return $args;
         }
 
+        if ($args['options']['is_root']) {
+            return $args;
+        }
+
         $mbox = strlen($args['name']) ? $args['name'] : $args['parent_name'];
 
         if (isset($_POST['_ctype'])) {
diff --git a/plugins/kolab_folders/localization/en_US.inc b/plugins/kolab_folders/localization/en_US.inc
index 86040eb8..70867bc4 100644
--- a/plugins/kolab_folders/localization/en_US.inc
+++ b/plugins/kolab_folders/localization/en_US.inc
@@ -9,6 +9,7 @@ $labels['foldertypejournal'] = 'Journal';
 $labels['foldertypetask'] = 'Tasks';
 $labels['foldertypenote'] = 'Notes';
 $labels['foldertypecontact'] = 'Contacts';
+$labels['foldertypeconfiguration'] = 'Configuration';
 
 $labels['default'] = 'Default';
 $labels['inbox'] = 'Inbox';
diff --git a/plugins/kolab_folders/localization/pl_PL.inc b/plugins/kolab_folders/localization/pl_PL.inc
index 8bd00e65..95177cd8 100644
--- a/plugins/kolab_folders/localization/pl_PL.inc
+++ b/plugins/kolab_folders/localization/pl_PL.inc
@@ -8,6 +8,7 @@ $labels['foldertypejournal'] = 'Dziennik';
 $labels['foldertypetask'] = 'Zadania';
 $labels['foldertypenote'] = 'Notatki';
 $labels['foldertypecontact'] = 'Kontakty';
+$labels['foldertypeconfiguration'] = 'Konfiguracja';
 $labels['default'] = 'Domyślny';
 $labels['inbox'] = 'Odebrane';
 $labels['drafts'] = 'Szkice';