BZ-8860:BZ-8861:BZ-8862: Email Notification Issues