fixed the mail class