- Patch from Michael Peters to fix a bug in email address handling: