Email added, Intents refactored