--- old/metamutt	2003-08-08 16:26:19.000000000 +0100
+++ new/metamutt	2003-08-08 17:22:29.000000000 +0100
@@ -31,6 +31,11 @@
 # Many thanks for reporting bugs and introducing new features to
 # Moritz Barsnick, Ulli Horlacher, Urs Janßen, and Martin Ramsch.
 #
+# !SVW
+#   Modifications to use digest2mime.sh rather than cat if it is
+#   available.
+# !ESVW
+#
 ##########################################################################
 #
 #   Copyright (C) 1997-2000  Roland Rosenfeld <roland@spinnaker.de>
@@ -51,6 +56,14 @@
 #
 ##########################################################################
 
+# SVW Mod
+DIGESTTOMIME="`which digest2mime.sh 2> /dev/null`"
+if [ ! -x "${DIGESTTOMIME}" ]; then
+    DIGESTTOMIME=cat
+fi
+#    DIGESTTOMIME=cat
+# ESVW Mod
+
 umask 077
 
 tmpdir=${TMPDIR-/tmp}/metamutt.$$
@@ -70,7 +83,10 @@
         -- ) shift; break;;
         -e|-p ) shift;;
         -m ) shift 2;;
-	-D ) fmopt='-ds cat'
+# SVW Mod
+#	-D ) fmopt='+1 -ds cat'
+	-D ) fmopt="+1 -ds ${DIGESTTOMIME}"
+# ESVW Mod
 	     digest='yes'
 	     shift;;
         * )  break;;