email recipient refactoring and new hook