Added back the mail override setting