diff --git a/.mutt/cachepurge.sh b/.mutt/cachepurge.sh
index 73cd5118..1f79c44b 100755
--- a/.mutt/cachepurge.sh
+++ b/.mutt/cachepurge.sh
@@ -15,5 +15,5 @@ while IFS= read -r i; do
 	rm "$i"
 	[ $(du -s . | cut -f1 -d'	') -lt $CACHE_LIMIT ] && exit
 done <<EOF
-$(ls -rt $(find . -type f))
+$(ls -rt "$(find . -type f)")
 EOF
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 084d5edf..de24ed97 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -69,6 +69,7 @@ set mime_forward_rest=yes
 set pager_index_lines=8
 
 ## Encoding
+set rfc2047_parameters=yes
 set send_charset="us-ascii:utf-8"
 
 ## Remove delay between mailbox switches.