Update mail config #vf-35 fixed