CRAFTERCMS-370: Email notifier improvement