Make all messages multipart messages