Mail module: path fix and cleanup