Added handling for multipart emails.