Turns out this is how you do it without breaking non-multipart email.