Taking the liberty to use this as an opportunity to kill the
usage of "e-mail".

Suggested by: @Antonio-Prado

(cherry picked from commit d988799a)