More thoughts on DataFeed and NotificationMessage emails