Feature 3435: Continuing work on email notifications