refactoring, testing, deprecating, EmailMessageListener