Adding switch to turn mail sending on/off