Added multipart email management