some small changes to make it easier to parse the email reply