X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhpgp.sh;fp=uip%2Fmhpgp.sh;h=1cfa27451d5a486c785d232d494faf289ed82ade;hp=ce4d2c87ea4fbec5708e91bbac7437d1c05e98ef;hb=403e71903f2bb190f83a2cababef05697babec5b;hpb=41ad151c26f230e99d1ec6df0dcc477e72a7e6f7

diff --git a/uip/mhpgp.sh b/uip/mhpgp.sh
index ce4d2c8..1cfa274 100755
--- a/uip/mhpgp.sh
+++ b/uip/mhpgp.sh
@@ -103,6 +103,14 @@ decrypt() {
 		b a' "$FILE" > "$TEMP/outfile"
 
 	if [ "$1" = "plain" ] ; then echo "" >> "$TEMP/outfile" ; fi
+
+	# Replace original header fields by secure copies that some
+	# mail clients (e.g. Enigmail) store within the encrypted and
+	# signed MIME part.
+	for i in `sed -n '/^$/q; /^[ 	]/d; s,:.*,,p' "$TEMP/msg"` ; do
+		anno -delete -comp "$i" "$TEMP/outfile"
+	done
+
 	sed -e 's/
$//' $TEMP/msg >> "$TEMP/outfile" || exit 1
 
 	if [ "$wflag" = "1" ] ; then