Tweak email formatting for Issue #1012.

See issue #1012