diff --git a/.muttrc b/.muttrc
--- a/.muttrc
+++ b/.muttrc
@@ -97,6 +97,17 @@ macro attach,compose \Cb "<pipe-entry> u
 # Turn a text/plain markdown part into text/html
 macro compose \eh "F mutt-md2html \ny^T^Utext/html\n" 'htmlify'
 
+# Turn a text/plain markdown part into proper multipart
+macro compose \em \
+"<enter-command>set pipe_decode<enter>\
+<pipe-entry>~/bin/mutt-md2multipart /tmp/$hostname<enter>\
+<enter-command>unset pipe-decode<enter>\
+a^U/tmp/$hostname/msg.txt\n^Da^U/tmp/$hostname/msg.html\n^D^T^Utext/html; charset=utf-8\n\
+=DTT&d^U\n" \
+"multipartify"
+
+shutdown-hook 'shell-escape rm -rf /tmp/$hostname'
+
 push <first-entry>
 
 # Appearance