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

@ehelms Will do... I'll break this out tomorrow.