Mailer gets configurable via props
code cleanup