Fix for #855320, and bad CID/Content-ID header matching caused by Outlook
Express not properly including a content-id header.