mail deactivation fixes