Now really preserves content ID and disposition information of attachments if provided