make email feature optional