slightly better mairix quoting (2)

diff --git a/muttjump b/muttjump
index a950edb3980b9b9d554a666cf7abafc891d489f4..38e8a02505bd04e16c88c684ac8d0f742c32f8ae 100755 (executable)
--- 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.
         # 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/.\{31\}/&=,/g' \
-            -e 's/[~,/=^]\+/=,/g' -e 's/\(=,\)\+/=,/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)
         orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
         ;;
     mu)