chore(email): Update email text with new copy.

fixes #835
bugzilla #982122

Note, this PR also contains #864.