-#macro index,pager z |"sa-learn --no-sync --ham\n"
-#macro index,pager Z |"sa-learn --no-sync --spam\n"
-macro index,pager <Esc>s "<Enter>q"|"spamassassin -d | ~/mail/bin/spamcop.py\nj"
-macro index,pager <Esc>z "<Enter>q:set editor='vim -s ~/mail/misc/spamcop.vim'\nr:set editor=vim.sh\nqn"
+macro index,pager <Esc>s <Enter><exit> \
+ "<pipe-message>spamassassin -d | ~/mail/bin/spamcop.py<Enter> \
+ <next-undeleted>"
+macro index,pager <Esc>z \
+ "<Enter><exit>:set editor='vim -s ~/mail/misc/spamcop.vim'<Enter> \
+ r:set editor=vim.sh<Enter><exit><next-undeleted>"