Upgrade attachment table to include Content-ID and Content-Description
Don't list inlined attachments as attachments