Deal with inconsistent changes to email addresses (bug 905984)