diff --git a/mcomp b/mcomp
index a812f1b..92f4919 100755
--- a/mcomp
+++ b/mcomp
@@ -76,10 +76,7 @@ fi
 		msgid
 		echo
 
-		echo "$(mhdr -d -h from "$1") wrote:"
-		mshow -R "$1" |
-			sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' |
-			sed 's/^/> /'
+		mquote "$1"
 		echo
 	esac
 
diff --git a/mquote b/mquote
new file mode 100755
index 0000000..1a68f50
--- /dev/null
+++ b/mquote
@@ -0,0 +1,12 @@
+#!/bin/sh
+# mquote MSG - format MSG as a quotation
+
+: ${from=$(mhdr -d -h x-original-from "$1")}
+: ${from=$(mhdr -d -h from "$1")}
+: ${from=Someone}
+
+echo "$from wrote:"
+mshow -R "$1" |
+	sed -n '/^-- $/!p;//q' |                   # strip signature
+	sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' |    # strip empty lines
+	sed 's/^/> /'                              # prefix with >