diff --git a/src/modules/stack/install/mail/ee_mod_setup_dovecot.sh b/src/modules/stack/install/mail/ee_mod_setup_dovecot.sh
index 5c3d1dd4..b4a7a3ad 100644
--- a/src/modules/stack/install/mail/ee_mod_setup_dovecot.sh
+++ b/src/modules/stack/install/mail/ee_mod_setup_dovecot.sh
@@ -59,6 +59,11 @@ function ee_mod_setup_dovecot()
 	|| ee_lib_error "Unable to setup Dovecot SSL certificate path, exit status = " $?
 
 	# Setting Dovecot init.d script
-	cp -v /usr/share/easyengine/mail/dovecot /etc/init.d/dovecot &>> $EE_COMMAND_LOG \
+	cp -v /usr/share/easyengine/mail/dovecot /etc/init.d/dovecot &>> $EE_COMMAND_LOG
+
+	# Add autocreate plugin
+	sed -i "s'#mail_plugins = \$mail_plugins'mail_plugins = \$mail_plugins autocreate'" /etc/dovecot/conf.d/20-imap.conf \
+	|| ee_lib_error "Unable to setup Dovecot autocreate plugin, exit status = " $?
+	cat /usr/share/easyengine/mail/autocreate >> /etc/dovecot/conf.d/20-imap.conf
 
 }
diff --git a/src/modules/stack/install/mail/ee_mod_setup_mailscan.sh b/src/modules/stack/install/mail/ee_mod_setup_mailscan.sh
index 811242e5..841fb4f5 100644
--- a/src/modules/stack/install/mail/ee_mod_setup_mailscan.sh
+++ b/src/modules/stack/install/mail/ee_mod_setup_mailscan.sh
@@ -23,4 +23,8 @@ function ee_mod_setup_mailscan()
 	|| ee_lib_error "Unable to setup Amavis, exit status = " $?
 	cat /usr/share/easyengine/mail/amavis-master.cf >> /etc/postfix/master.cf
 
+	# Configure ClamAv and Amavis to each other files
+	adduser clamav amavis &>> $EE_COMMAND_LOG
+	adduser amavis clamav &>> $EE_COMMAND_LOG
+	chmod -R 775 /var/lib/amavis/tmp &>> $EE_COMMAND_LOG
 }
diff --git a/templates/mail/autocreate b/templates/mail/autocreate
new file mode 100644
index 00000000..66a68eb0
--- /dev/null
+++ b/templates/mail/autocreate
@@ -0,0 +1,10 @@
+plugin {
+autocreate = Trash
+autocreate2 = Junk
+autocreate3 = Drafts
+autocreate4 = Sent
+autosubscribe = Trash
+autosubscribe2 = Junk
+autosubscribe3 = Drafts
+autosubscribe4 = Sent
+}