X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/220e7295f53434bca273cb9a516da29bdb0dd5bb..5a1903d94c625beed84792f64db7aeaf8ea0e5a7:/muttjump

diff --git a/muttjump b/muttjump
index 0a45d1d..fb01b40 100755
--- a/muttjump
+++ b/muttjump
@@ -46,6 +46,8 @@ MAIRIX=${MAIRIX:-mairix}
 MU=${MU:-mu}
 NMZMAIL=${NMZMAIL:-nmzmail}
 SCREEN=${SCREEN:-screen}
+FORMAIL=${FORMAIL:-formail}
+REFORMAIL=${REFORMAIL:-reformail}
 
 function die () {
     echo -e >&2 "$0: $1"
@@ -70,7 +72,13 @@ if ! type -p $MUTT >/dev/null ; then
 fi
 
 # search for Message-ID in STDIN
-msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
+if type -p $FORMAIL >/dev/null ; then
+    msgid=$(formail -c -z -x Message-ID | head -n1)
+elif type -p $REFORMAIL >/dev/null ; then
+    msgid=$(reformail -c -x Message-ID: | head -n1)
+else
+    msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
+fi
 if [ -z "$msgid" ] ; then
     die "could not find Message-ID header in standard input"
 fi