Added correct parsing when the filename or name of an attachment is in embedded in the Content-Type header.