Now supports Content-ID and Multipart/related