More work on the notification mailer.