Added inline disposition & cid for attachements