Deal with aliases correctly with no mailboxes dir

Merged Paul Cammish requested to merge kelduum_issue317 into bullseye-testing