Added fields parameter in Mailer override expressions