Preparing for multipart email support.