Added support for attachments without content disposition