##macro index L "<list-reply><save-message>=store<enter>"
macro index,pager S "<save-message>=store<enter><sync-mailbox>" "save message to store"
-macro index,pager E "<save-message>=tickle/" "save message to tickler"
+macro index,pager E ':set my_editor="$editor"<enter>:set editor="$my_confdir/add-tickle-stamp"<enter><edit><toggle-new><save-message>=tickler<enter><sync-mailbox>:set editor="$my_editor"<enter>' "schedule message with tickler"
-macro index,pager \eS "<change-folder>=store<enter>" "go to store folder"
+macro index,pager \eS "<decode-save>"
+macro index,pager \eU "<undelete-subthread>"
+macro index,pager \eD "<delete-subthread>"
+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 \ei "<change-folder>=inbox<enter>" "go to inbox 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 X "<save-message>=retrain/spam<enter>" "retrain message as spam"
macro index,pager Z "<save-message>=retrain/ham<enter>" "retrain message as ham"
-macro index,pager \Cb "<pipe-message>/usr/bin/urlview<enter>" "invoke urlview"
+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 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"
#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 ':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"
# vim:sw=12:noet:sts=12:ts=12:ft=muttrc