macro index S "<tag-prefix><enter-command> set my_weed=\$weed<enter><enter-command> set my_resolve=\$resolve<enter><enter-command> set noweed noresolve<enter><decode-save><<enter><next-entry><enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter>" "decode message to $record folder"
macro pager S "<enter-command> set my_weed=\$weed<enter><enter-command> set my_resolve=\$resolve<enter><enter-command> set noweed noresolve<enter><decode-save><<enter><next-entry><enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter><display-toggle-weed><display-toggle-weed>" "decode message to $record folder"
-macro index,pager E '<enter-command> source "$my_confdir/supersede-header X-Tickle get-timestamp|"<enter><next-undeleted><enter-command> push S<enter>' "schedule messages with tickler"
+macro index,pager E '<enter-command> source "$my_confdir/supersede-header X-Tickle get-timestamp|"<enter><next-undeleted><save-message>=resubmit<enter>' "schedule messages with tickler"
macro index,pager \ex '<enter-command> source "$my_confdir/remove-header X-Postponed|"<enter>' "release postponed messages"
-macro index,pager \es "<change-folder>=store<enter>" "go to store folder"
-macro index,pager \ec "<change-folder>=debian/debconf<enter>" "go to debconf folder"
-macro index,pager \ed "<change-folder>=debian<enter>" "go to debian folder"
-macro index,pager \ei "<change-folder>=inbox<enter>" "go to inbox folder"
-macro index,pager \ea "<change-folder>=ardex<enter>" "go to ardex folder"
-macro index,pager \ek "<change-folder>=kbkg<enter>" "go to kbkg folder"
-macro index,pager \eu "<change-folder>=uniwh<enter>" "go to uniwh folder"
-macro index,pager \et "<change-folder>=toni<enter>" "go to toni folder"
+macro index,pager \e, "<change-folder><<enter>" "go to $record folder"
+macro index,pager \e. "<change-folder>><enter>" "go to $spool folder"
+macro index,pager \e1 "<change-folder>!<enter>" "go to inbox folder"
bind index \eT tag-thread
bind index,pager \eK mail-key
macro index Z "<tag-prefix><save-message>=retrain/ham<enter>" "retrain message as ham"
macro pager Z "<save-message>=retrain/ham<enter>" "retrain message as ham"
-macro index,pager \Cb "<enter-command> set my_pipe_decode=\$pipe_decode<enter><enter-command> set pipe_decode<enter><pipe-message>/usr/bin/urlscan<enter><enter-command> set pipe_decode=\$my_pipe_decode<enter>" "invoke urlscan"
+macro index,pager,attach,compose \Cb "<enter-command> set my_pipe_decode=\$pipe_decode<enter><enter-command> set pipe_decode<enter><pipe-message>/usr/bin/urlscan<enter><enter-command> set pipe_decode=\$my_pipe_decode<enter>" "invoke urlscan"
macro compose Y '<edit-fcc><kill-line><enter><send-message>' "send message without storing"
macro compose \Cy '<pgp-menu>c<send-message>' "send message without signing"