Mailer Class updated