This will allow, e.g., the character `@` in the email identity. Also adds a test case. Fixes #557
Fixes #526