This will allow, e.g., the character `@` in the email identity. Also adds a test case. Fixes #557 (cherry picked from commit 45cadbd4f3)
45cadbd4f3