More work on incoming email parsing