From 6deeac85a27670d99cd6e76e4db4e9f820c1f644 Mon Sep 17 00:00:00 2001
From: Ekrem KAYA <webmaster@e-piksel.com>
Date: Wed, 20 Sep 2017 19:13:16 +0300
Subject: [PATCH] Warning: autocreate plugin is deprecated, use mailbox { auto
 } setting instead

---
 install/rhel/6/dovecot/conf.d/20-imap.conf | 34 +++++++++++++---------
 install/rhel/7/dovecot/conf.d/20-imap.conf | 34 +++++++++++++---------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/install/rhel/6/dovecot/conf.d/20-imap.conf b/install/rhel/6/dovecot/conf.d/20-imap.conf
index 5ee2c517..2e740d49 100644
--- a/install/rhel/6/dovecot/conf.d/20-imap.conf
+++ b/install/rhel/6/dovecot/conf.d/20-imap.conf
@@ -3,18 +3,24 @@
 ##
 
 protocol imap {
-mail_plugins = $mail_plugins autocreate
-}
+  namespace inbox {
+    inbox = yes
 
-plugin {
-  autocreate = Trash
-  autocreate2 = Spam
-  autocreate3 = Sent
-  autocreate4 = Drafts
-  #autocreate5 = Custom
-  autosubscribe = Trash
-  autosubscribe2 = Spam
-  autosubscribe3 = Sent
-  autosubscribe4 = Drafts
-  #autosubscribe5 = Custom
-}
+    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
diff --git a/install/rhel/7/dovecot/conf.d/20-imap.conf b/install/rhel/7/dovecot/conf.d/20-imap.conf
index 5ee2c517..2e740d49 100644
--- a/install/rhel/7/dovecot/conf.d/20-imap.conf
+++ b/install/rhel/7/dovecot/conf.d/20-imap.conf
@@ -3,18 +3,24 @@
 ##
 
 protocol imap {
-mail_plugins = $mail_plugins autocreate
-}
+  namespace inbox {
+    inbox = yes
 
-plugin {
-  autocreate = Trash
-  autocreate2 = Spam
-  autocreate3 = Sent
-  autocreate4 = Drafts
-  #autocreate5 = Custom
-  autosubscribe = Trash
-  autosubscribe2 = Spam
-  autosubscribe3 = Sent
-  autosubscribe4 = Drafts
-  #autosubscribe5 = Custom
-}
+    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