! show_email cleanup (fixes #2500)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2504 from Oldiesmann/release-2.1

! show_email cleanup (fixes #2500)