update mail path after refactor
Merge remote-tracking branch 'refs/remotes/kali/bug/update-mail-path' into develop