Handle multipart emails a little better