added support for extended email formats