diff --git a/target/dovecot/10-mail.conf b/target/dovecot/10-mail.conf
index 1cb957a4..5405178e 100644
--- a/target/dovecot/10-mail.conf
+++ b/target/dovecot/10-mail.conf
@@ -2,6 +2,7 @@
 ## Mailbox locations and namespaces
 ##
 
+# TODO The following comment block probably needs further refinements
 # Location for users' mailboxes. The default is empty, which means that Dovecot
 # tries to find the mailboxes automatically. This won't work if the user
 # doesn't yet have any mail, so you should explicitly tell Dovecot the full
@@ -10,13 +11,13 @@
 # If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u)
 # isn't enough. You'll also need to tell Dovecot where the other mailboxes are
 # kept. This is called the "root mail directory", and it must be the first
-# path given in the mail_driver+mail_path settings.
+# path of `mail_path`.
 
 # ref: https://doc.dovecot.org/main/core/config/mail_location.html#mail_driver
 mail_driver = maildir
 # ref: https://doc.dovecot.org/main/core/config/mail_location.html#mail_path
-mail_path = /var/mail/%d/%n
-mail_home = /var/mail/%d/%n/home/
+mail_path = /var/mail/%{user | domain}/%{user | username}
+mail_home = /var/mail/%{user | domain}/%{user | username}/home
 
 # If you need to set multiple mailbox locations or want to change default
 # namespace settings, you can do it by defining namespace sections.