diff --git a/data/conf/dovecot/dovecot.conf b/data/conf/dovecot/dovecot.conf
index ecd3c38e..934a4f2f 100644
--- a/data/conf/dovecot/dovecot.conf
+++ b/data/conf/dovecot/dovecot.conf
@@ -12,8 +12,9 @@ disable_plaintext_auth = yes
 #mail_nfs_index = yes
 #mail_nfs_storage = yes
 login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c %k"
-mail_plugins = quota acl zlib listescape mail_crypt mail_crypt_acl
 mail_home = /var/vmail/%d/%n
+mail_location = maildir:~/
+mail_plugins = quota acl zlib listescape mail_crypt mail_crypt_acl mail_log notify
 mail_attachment_fs = crypt:set_prefix=mail_crypt_global:posix:
 mail_attachment_dir = /var/attachments
 mail_attachment_min_size = 128k
@@ -177,7 +178,7 @@ namespace {
     type = shared
     separator = /
     prefix = Shared/%%u/
-    location = auto:%%h/:INDEX=~/Shared/%%u:CONTROL=~/Shared/%%u
+    location = maildir:%%h/:INDEX=~/Shared/%%u;CONTROL=~/Shared/%%u
     subscriptions = no
     list = children
 }
@@ -218,22 +219,22 @@ service managesieve-login {
   }
   service_count = 1
   process_min_avail = 2
-  vsz_limit = 256 M
+  vsz_limit = 1G
 }
 service imap-login {
   service_count = 1
   process_limit = 500
-  vsz_limit = 256 M
+  vsz_limit = 1G
   user = dovenull
 }
 service pop3-login {
   service_count = 1
-  vsz_limit = 256 M
+  vsz_limit = 1G
 }
 service imap {
   executable = imap imap-postlogin
   user = vmail
-  vsz_limit = 256 M
+  vsz_limit = 1G
 }
 service managesieve {
   process_limit = 256
@@ -253,7 +254,7 @@ userdb {
 }
 protocol imap {
   imap_metadata = yes
-  mail_plugins = quota imap_quota imap_acl acl zlib imap_zlib imap_sieve listescape mail_crypt mail_crypt_acl
+  mail_plugins = quota imap_quota imap_acl acl zlib imap_zlib imap_sieve listescape mail_crypt mail_crypt_acl notify mail_log
 }
 mail_attribute_dict = file:%h/dovecot-attributes
 protocol lmtp {
@@ -305,6 +306,10 @@ plugin {
 
   # Enable compression while saving, lz4 Dovecot v2.2.11+
   zlib_save = lz4
+
+  mail_log_events = delete undelete expunge copy mailbox_delete mailbox_rename
+  mail_log_fields = uid box msgid size
+  mail_log_cached_only = yes
 }
 dict {
   sqlquota = mysql:/usr/local/etc/dovecot/sql/dovecot-dict-sql-quota.conf
@@ -328,4 +333,8 @@ service stats {
   }
 }
 imap_max_line_length = 2 M
+auth_cache_verify_password_with_worker = yes
+auth_cache_negative_ttl = 0
+auth_cache_ttl = 30 s
+auth_cache_size = 2 M
 !include_try /usr/local/etc/dovecot/extra.conf