-##macro index L "<list-reply><save-message>=store<enter>"
-macro index S "<tag-prefix><save-message>=store<enter>" "save messages to store"
-macro pager S "<save-message>=store<enter>" "save message to store"
-
-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 \es "<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><clear-flag>n<enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter>" "decode message to current folder"
+macro pager \es "<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><clear-flag>n<enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter>" "decode message to current folder"
+macro index \eS "<tag-prefix><save-message><<enter>" "save messages to store"
+macro pager \eS "<save-message><<enter>" "save message to store"
+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><save-message>=resubmit<enter>' "schedule messages with tickler"