fixed in mail, mail names and export