X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/56609b662ea74b79857d89415ac8570df7ff25a1..06ff9e456f0959839236fe955e2efe0055a364e3:/muttjump

diff --git a/muttjump b/muttjump
index fc8f3d4..9cb34b1 100755
--- a/muttjump
+++ b/muttjump
@@ -153,9 +153,9 @@ 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' \
-            -e 's/.\{31\}/&=,/g' -e 's/^\(=,\)\+//g' -e 's/$/=/' \
-            -e 's/\(=,\|=\)\+$/=/g')
+        msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]\+/ /g' \
+            -e 's/[^ ]\{31\}/& /g' -e 's/^ \+//g' -e 's/ *$/=/g' \
+            -e 's/ /=,/g')
         orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
         ;;
     mu)