changes in mail class