Added mail check disable