Merge #11686: add missing entries to email __all__ lists.

Original patch by Steffen Daode Nurpmeso