Add support for multipart messages to import