changes to mail config cont'd