Mail module : fixing file names