Added email feature flags; use full names for pylint disables