Merge pull request #22908 from jrburke/bug1001629-email-notification-close-blank

Bug 1001629: email notification clear triggers failure in startup r=asuth