Added support for @yahoo.com addresses