Added Mail check