add ability to deal with alternate email formatting