More work on the SMTP Notifications Gateway Provider