Improve mailer templates