Add support for multipart messages