added mailer
fix merges