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

I have added code and a unit test to verify that when the filename of an attachment is in the Content-Type in stead of the Content-Disposition header, the filename is still correctly parsed.