fixes #7666, #7667, #7668 - errata mail notifications

True, I'm fine with using helpers in the future if we ever need to change these or add more.  Don't want to create a premature abstraction.