fixed all mailer to work with new layout