i think this will fix the mail class issue