Upgrade to mail-notifier2
Update to mail-listener2