diff --git a/roles/dovecot/templates/dovecot/conf.d/10-mail.conf.j2 b/roles/dovecot/templates/dovecot/conf.d/10-mail.conf.j2
index f74f10a8..dcb8225e 100644
--- a/roles/dovecot/templates/dovecot/conf.d/10-mail.conf.j2
+++ b/roles/dovecot/templates/dovecot/conf.d/10-mail.conf.j2
@@ -28,7 +28,7 @@
 # <doc/wiki/MailLocation.txt>
 #
 # mail_location = mbox:~/mail:INBOX=/var/mail/%u
-mail_location = maildir:~/Mail:INBOX=/var/mail/%u/:INDEX=/var/dovecot-indexes/%u
+mail_location = maildir:~/Mail:INBOX=/var/mail/%u/:INDEX=/var/dovecot-indexes/%u:VOLATILEDIR=/dev/shm/dovecot-%u
 
 # If you need to set multiple mailbox locations or want to change default
 # namespace settings, you can do it by defining namespace sections.
@@ -131,7 +131,7 @@ mail_privileged_group = mail
 
 # Don't use mmap() at all. This is required if you store indexes to shared
 # filesystems (NFS or clustered filesystem).
-#mmap_disable = no
+mmap_disable = yes
 
 # Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
 # since version 3, so this should be safe to use nowadays by default.
@@ -141,7 +141,7 @@ mail_privileged_group = mail
 #   optimized (default): Whenever necessary to avoid losing important data
 #   always: Useful with e.g. NFS when write()s are delayed
 #   never: Never use it (best performance, but crashes can lose data)
-#mail_fsync = optimized
+mail_fsync = always
 
 # Mail storage exists in NFS. Set this to yes to make Dovecot flush NFS caches
 # whenever needed. If you're using only a single mail server this isn't needed.