Merge pull request #292 from lowjoel/attachment-parsing
Attachment parsing

(main@f3bd855eafd338cd4586f47fc236eacc043adca7)