Clean email parsing

Cleaned up parsing of email addresses.  Clean up parsing of alternative
and base email messages.