diff --git a/HOME/.local/share/applications/userapp-khalimport.desktop b/HOME/.local/share/applications/userapp-khalimport.desktop
index 1512578..deb4ed7 100644
--- a/HOME/.local/share/applications/userapp-khalimport.desktop
+++ b/HOME/.local/share/applications/userapp-khalimport.desktop
@@ -4,6 +4,6 @@ Name=Khal Import
 Comment=Imports ICS files into Khal
 Type=Application
 Terminal=false
-Exec=xdg-terminal-exec khal import %F
+Exec=footclient --app-id floating_shell --window-size-chars 80x45 khal import %F
 MimeType=text/calendar;
 NoDisplay=true
diff --git a/aerc/aerc.conf b/aerc/aerc.conf
index de2bd17..13a3dc1 100644
--- a/aerc/aerc.conf
+++ b/aerc/aerc.conf
@@ -40,7 +40,7 @@ header-layout=To|From,Cc|Bcc,Subject
 reply-to-self=false
 
 [multipart-converters]
-text/html=pandoc -f markdown -t html
+text/html=pandoc -f markdown+lists_without_preceding_blankline -t html
 
 [filters]
 text/plain=colorize
@@ -69,7 +69,8 @@ image/png=qimgv
 image/jpg=qimgv
 video/*=mpv
 audio/*=mpv --no-video
-text/*=vim
+text/calendar=footclient --app-id floating_shell --window-size-chars 80x45 khal import {}
+text/*=footclient --app-id floating_shell --window-size-chars 80x45 nvim {}
 
 [hooks]
 aerc-startup=aerc :terminal khal interactive \