bind pager,index <backtab> previous-unread
-#macro pager,index p ":<enter>" "do nothing"
+#macro pager,index p "<enter-command><enter>" "do nothing"
##bind index p previous-undeleted
##bind index n next-undeleted
##macro index L "<list-reply><save-message>=store<enter>"
macro index S "<tag-prefix><save-message>=store<enter><sync-mailbox>" "save messages to store"
macro pager S "<save-message>=store<enter><sync-mailbox>" "save message to store"
-macro index,pager E ':set my_editor="$editor"<enter>:set editor="$my_confdir/add-tickle-stamp"<enter><edit><toggle-new><save-message>=resubmit<enter><sync-mailbox>:set editor="$my_editor"<enter>' "schedule message with tickler"
+
+macro index \er '<tag-prefix><save-message>=resubmit<enter><sync-mailbox>' "resubmit messages"
+macro pager \er '<save-message>=resubmit<enter><sync-mailbox>' "resubmit message"
+
+macro index,pager E '<enter-command>source "$my_confdir/supersede-header X-Tickle get-timestamp|"<enter><next-undeleted><enter-command>push \er<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 \ed "<change-folder>=debian<enter>" "go to debian folder"
macro index,pager \eu "<change-folder>=ul<enter>" "go to ul folder"
macro index,pager \ea "<change-folder>=admin<enter>" "go to admin folder"
-macro index,pager \eR ":source $my_confdir/muttrc<enter>" "reload muttrc"
-macro compose \eR ":source $my_confdir/muttrc<enter>" "reload muttrc"
+macro index,pager \eR "<enter-command>source $my_confdir/muttrc<enter>" "reload muttrc"
+macro compose \eR "<enter-command>source $my_confdir/muttrc<enter>" "reload muttrc"
macro index X "<tag-prefix><save-message>=retrain/spam<enter>" "retrain message as spam"
macro pager X "<save-message>=retrain/spam<enter>" "retrain message as spam"
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 ':set my_pipe_decode="$pipe_decode"<enter>:set pipe_decode<enter><pipe-message>/usr/bin/urlview<enter>:set pipe_decode="$my_pipe_decode"<enter>' "invoke urlview"
+macro index,pager \Cb '<enter-command>set my_pipe_decode="$pipe_decode"<enter><enter-command>set pipe_decode<enter><pipe-message>/usr/bin/urlview<enter><enter-command>set pipe_decode="$my_pipe_decode"<enter>' "invoke urlview"
macro compose Y '<edit-fcc><kill-line><enter><send-message>' "send message without storing"
macro compose \Cy '<pgp-menu>cY' "send message without storing or signing"
macro index,pager \eo '<change-folder>imaps://logcheck-todo%40madduck.net:logcheck@imap.madduck.net<enter>' 'go to logcheck todo folder'
#TODO this is a hack until switch-profile does not readd headers.
-macro compose e ':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit-headers>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"
-macro index,pager e ':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"
+macro compose e '<enter-command>set my_editor="$editor"<enter><enter-command>set editor=sensible-editor<enter><edit-headers><enter-command>set editor="$my_editor"<enter>' "invoke normal editor to edit message"
+macro index,pager e '<enter-command>set my_editor="$editor"<enter><enter-command>set editor=sensible-editor<enter><edit><enter-command>set editor="$my_editor"<enter>' "invoke normal editor to edit message"
-macro index \ej ':set my_editor="$editor"<enter>:source "$my_confdir/batch-subject-editor|"<enter><tag-prefix><edit>:set editor="$my_editor"<enter>' "change message subject"
+macro index \ej '<enter-command>set my_editor="$editor"<enter><enter-command>source "$my_confdir/batch-subject-editor|"<enter><tag-prefix><edit><enter-command>set editor="$my_editor"<enter>' "change message subject"
# vim:sw=12:noet:sts=12:ts=12:ft=muttrc