Fix: mail class