X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/176ccbf20313c18865fbb64898b5c7f7376acacb..20f8d188cc9cdf12a8a2c6d9c4490ee3b694a294:/.mutt/add-tickle-stamp

diff --git a/.mutt/add-tickle-stamp b/.mutt/add-tickle-stamp
index 4adf491..b0c0ba1 100755
--- a/.mutt/add-tickle-stamp
+++ b/.mutt/add-tickle-stamp
@@ -22,9 +22,9 @@ else
   case "$arg" in
     *[0-9]w) date="now + ${arg%w} weeks 00:00";;
     *[0-9]m) date="now + ${arg%m} months 00:00";;
-    *[0-9]h) date="now + ${arg%h} hours";;
     *[0-9]d) date="now + ${arg%d} days 00:00";;
-    @#[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+    *[0-9]h) date="now + ${arg%h} hours";;
+    @[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
       date="@${arg#@}";;
     *' '*) date="$args";;
     *[!0-9]*) 
@@ -40,7 +40,8 @@ tickle=$(date +'%s (%c)' -d "$date")
 TMPFILE="$(tempfile -d /tmp -p tickle)"
 trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 
-formail -i "X-Tickle: $tickle" < $file > $TMPFILE
+formail -i "X-Tickle: $tickle" < $file \
+  | formail -R X-Postponed X-Was-Postponed > $TMPFILE
 
 [ -w "$file" ] && mv $TMPFILE $file