Improves mailer variables and from