X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/0fe964f9fe98ad94eadc5b05bead10a71c9dcf5e..9ef362ae89acc75a6a164e5c213e29f5ab9c1d35:/muttjump

diff --git a/muttjump b/muttjump
index fb9bde0..82b9ea3 100755
--- a/muttjump
+++ b/muttjump
@@ -149,7 +149,7 @@ case $MUTTJUMP_INDEXER in
         # mairix can't quote special characters (~,/=^) in search words. As a
         # workaround, split Message-ID in 31-character long AND-linked
         # substrings.
-        msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]/=,/g' \
+        msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]\+/=,/g' \
             -e 's/.\{31\}/&=,/g' -e 's/^\(=,\)\+//g' -e 's/$/=/' \
             -e 's/\(=,\|=\)\+$/=/g')
         orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
@@ -207,7 +207,8 @@ if [ ! -d "$orig_maildir/cur" ] ; then
     die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
 fi
 
-jump_expr="~i'$msgid'"
+msgid_mutt=$(quote_regexp "$msgid_quoted")
+jump_expr="~i'$msgid_mutt'"
 
 if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then