Index: /trunk/server/fedora/config/etc/scripts/prune-mailq
===================================================================
--- /trunk/server/fedora/config/etc/scripts/prune-mailq	(revision 2657)
+++ /trunk/server/fedora/config/etc/scripts/prune-mailq	(revision 2658)
@@ -7,5 +7,5 @@
     $0 list-from
     $0 list-to
-    $0 show-rand [from|to] [regex]
+    $0 show-rand [from regex|to regex]
     $0 email lockers...
     $0 purge-from lockers...
@@ -16,4 +16,5 @@
     exit 1
 }
+
 clean_locker() {
     echo "${1%%@scripts.mit.edu}"
@@ -33,5 +34,5 @@
     if [[ $# -eq 0 ]]; then
 	files=$(ls /var/spool/postfix/deferred/?/* | shuf | head -n 3)
-    else
+    elif [[ $# -eq 2 ]]; then
 	match=$2
 	case "$1" in
@@ -42,8 +43,10 @@
 	msgids=$(mailq | tail -n +2 | grep -v '^ *(' | awk "BEGIN { RS = \"\" } (\$$dir ~ /$match/) { print \$1 }" | shuf | head -n 3)
 	files=$(for msgid in $msgids; do echo /var/spool/postfix/deferred/${msgid:0:1}/$msgid; done)
+    else
+	usage
     fi
     for file in $files; do
         echo ">>>> $file";
-        strings "$file"
+        postcat "$file"
         echo;
     done