Added support to filter out different attachment types
Added support to extract information from non-multipart messages