diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -497,9 +497,10 @@ let g:neocomplcache_filename_include_exp
 
 
 " {{{ Commands
-command! MailPreview     enew | set bt=nofile | silent exe '!mutt-md2html # > #.~htm~'
+" Preview markdown mail -- I edit with headers so I box them in a code block.
+command! MailPreview     enew | set bt=nofile | 0r # | exe 'norm 0O```<Esc>}O```' | silent exe '%!mutt-md2html > #.~htm~'
                            \ | silent exe '0r !links -dump #.~htm~' | silent exe '!rm -f #.~htm~' | 0
-command! MailPreviewHTML enew | set bt=nofile | execute '0r !mutt-md2html #' | 0
+command! MailPreviewHTML enew | set bt=nofile | 0r # | exe 'norm 0O```<Esc>}O```' | silent exe '%!mutt-md2html' | 0
 
 if !exists(":DiffOrig")
   " Diff unsaved buffer