Small cleanup, use email.parser.Parser