added work with mailer