- Updated EmailMessageConsumer to comply with core changes