Improved support for multipart messages