Adding ability to check for multipart messages