--- 4.5.16/exim.conf-SpamBlockerTechnology-v4.5.16.txt	2019-06-16 18:40:04.919892034 -0600
+++ 4.5.17/exim.conf-SpamBlockerTechnology-v4.5.17.txt	2019-07-16 05:56:47.036012336 -0600
@@ -1,4 +1,4 @@
-# SpamBlockerTechnology* powered exim.conf, Version 4.5.16
+# SpamBlockerTechnology* powered exim.conf, Version 4.5.17
 # August 15, 2018
 # Exim configuration file for DirectAdmin
 # Requires exim.pl as distributed by DirectAdmin here:
@@ -868,7 +868,7 @@
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  directory = /home/$local_part/Maildir/
+  directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/passwd}{$value}}}}/Maildir/"
   directory_mode = 770
   create_directory = true
   maildir_format
@@ -884,7 +884,7 @@
   delivery_date_add
   directory_mode = 770
   envelope_to_add
-  directory = /home/${lookup{$domain}lsearch*{/etc/virtual/domainowners}{$value}}/imap/${domain}/${local_part}/Maildir
+  directory = "${extract{5}{:}{${lookup{${lookup{$domain}lsearch*{/etc/virtual/domainowners}{$value}}}lsearch{/etc/passwd}{$value}}}}/imap/${domain}/${local_part}/Maildir"
   maildir_format
   group = mail
   mode = 660
