Updated Notification Mailer