diff --git a/install/rhel/6/dovecot/conf.d/20-imap.conf b/install/rhel/6/dovecot/conf.d/20-imap.conf
index 2e740d49..fe1d2d75 100644
--- a/install/rhel/6/dovecot/conf.d/20-imap.conf
+++ b/install/rhel/6/dovecot/conf.d/20-imap.conf
@@ -2,25 +2,15 @@
 ## IMAP specific settings
 ##
 
-protocol imap {
-  namespace inbox {
-    inbox = yes
-
-    mailbox Trash {
-      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
-      special_use = \Trash
-    }
-    mailbox Sent {
-      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
-      special_use = \Sent
-    }
-    mailbox Spam {
-      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
-      special_use = \Junk
-    }
-    mailbox Drafts {
-      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
-      special_use = \Drafts
-    }
-  }
-}
\ No newline at end of file
+plugin {
+  autocreate = Trash
+  autocreate2 = Spam
+  autocreate3 = Sent
+  autocreate4 = Drafts
+  #autocreate5 = Custom
+  autosubscribe = Trash
+  autosubscribe2 = Spam
+  autosubscribe3 = Sent
+  autosubscribe4 = Drafts
+  #autosubscribe5 = Custom
+}
diff --git a/install/rhel/7/dovecot/conf.d/20-imap.conf b/install/rhel/7/dovecot/conf.d/20-imap.conf
index 2e740d49..fe1d2d75 100644
--- a/install/rhel/7/dovecot/conf.d/20-imap.conf
+++ b/install/rhel/7/dovecot/conf.d/20-imap.conf
@@ -2,25 +2,15 @@
 ## IMAP specific settings
 ##
 
-protocol imap {
-  namespace inbox {
-    inbox = yes
-
-    mailbox Trash {
-      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
-      special_use = \Trash
-    }
-    mailbox Sent {
-      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
-      special_use = \Sent
-    }
-    mailbox Spam {
-      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
-      special_use = \Junk
-    }
-    mailbox Drafts {
-      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
-      special_use = \Drafts
-    }
-  }
-}
\ No newline at end of file
+plugin {
+  autocreate = Trash
+  autocreate2 = Spam
+  autocreate3 = Sent
+  autocreate4 = Drafts
+  #autocreate5 = Custom
+  autosubscribe = Trash
+  autosubscribe2 = Spam
+  autosubscribe3 = Sent
+  autosubscribe4 = Drafts
+  #autosubscribe5 = Custom
+}