issue 18983: Fix email problem... once and for all.

...iles can use them.