Fix exipick for new message-id format

Broken-by: 46a36afae41f

diff --git a/src/src/exipick.src b/src/src/exipick.src
index c3830f4a53f6debcae7b1504b5e394388b1bc97e..ba847f14f73dd5b692d8391c9c930f408023dac6 100644 (file)
--- a/src/src/exipick.src
+++ b/src/src/exipick.src
@@ -434,10 +434,10 @@ sub get_all_msgs {
     if ($e =~ /^[a-zA-Z0-9]$/) {
       opendir(DD, "$d/$e") || next;
       foreach my $f (grep !/^\./, readdir(DD)) {
     if ($e =~ /^[a-zA-Z0-9]$/) {
       opendir(DD, "$d/$e") || next;
       foreach my $f (grep !/^\./, readdir(DD)) {

-        push(@m, { message => $1, path => "$d/$e" }) if ($f =~ /^(.{16})-H$/);
+        push(@m, { message => $1, path => "$d/$e" }) if ($f =~ /^(.{23}|.{16})-H$/);

       }
       closedir(DD);
       }
       closedir(DD);

-    } elsif ($e =~ /^(.{16})-H$/) {
+    } elsif ($e =~ /^(.{23}|.{16})-H$/) {

       push(@m, { message => $1, path => $d });
     }
   }
       push(@m, { message => $1, path => $d });
     }
   }