diff --git a/src/sh/notmuch.sh b/src/sh/notmuch.sh
index 942854f..1b46156 100644
--- a/src/sh/notmuch.sh
+++ b/src/sh/notmuch.sh
@@ -38,6 +38,14 @@ nm_message_get_part() {
   $NOTMUCH show --part="$2" id:"$1"
 }
 
+# Print part of message, but this automatically converts to the current
+# encoding.
+# @argument $1: message id
+# @argument $2: part number
+nm_message_get_text_part() {
+  $NOTMUCH show --part="$2" --format=text id:"$1" | awk 'BEGIN { RS="\x0c"; FS="\n" } /^part{/ { for (i=2; i<NF;i++) print $i }'
+}
+
 # Add/remove a tag
 # @argument $1: [+/-]tag
 # @argument $2: query
diff --git a/src/sh/preview.sh b/src/sh/preview.sh
index af5cfa7..39355aa 100644
--- a/src/sh/preview.sh
+++ b/src/sh/preview.sh
@@ -14,7 +14,12 @@ preview_message() {
   html="${3:-}"
   nr="$(nm_message_part_nr "$messageid" "$html")"
   [ ! "$nr" ] && [ ! "$html" ] && html="html" && nr="$(nm_message_part_nr "$messageid" "html")"
-  [ "$html" ] && parser="$PANDOC" || parser="cat"
   nm_message_header "$messageid" | $CATEMAIL
-  [ "$nr" ] && (nm_message_get_part "$messageid" "$nr" | $parser | $CATMD)
+  if [ "$nr" ]; then
+    if [ "$html" ]; then
+      nm_message_get_part "$messageid" "$nr" | $PANDOC | $CATMD
+    else
+      nm_message_get_text_part "$messageid" "$nr" | $CATMD
+    fi
+  fi
 }