Added mail dir support