diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 0c00c00a..7600373a 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -745,7 +745,7 @@ format-flowed=true
 #
 # Example (obviously, this requires that you write your main text/plain body
 # using the markdown syntax):
-text/html=pandoc -f markdown -t html --standalone
+text/html=mailfmt --markdown-safe | pandoc -f markdown -t html --standalone
 
 [filters]
 #
diff --git a/.config/kak/autoload/filetype.kak b/.config/kak/autoload/filetype.kak
index 98c49c8a..b1d3093c 100644
--- a/.config/kak/autoload/filetype.kak
+++ b/.config/kak/autoload/filetype.kak
@@ -90,7 +90,7 @@ hook global WinSetOption filetype=mail %~
     		ui-scrolloff-disable
     	}
     } catch %{
-        set-option window formatcmd '/home/fic/dev/utils/mail-utils/format.py'
+        set-option window formatcmd 'mailfmt'
         set-option window comment_line '>'
         try autospell-enable
         hook -group mail-auto-format window BufWritePre .* format