-folder-hook "" "macro index S \":unset wait_key\n:set pipe_split\n|/home/short/bin/razor-report\n:unset pipe_split\n:set wait_key\ns=spamo-mutt\n\""
-folder-hook "=spam" "macro index S \":unset wait_key\n:set pipe_split\n|/home/short/bin/razor-report\n:unset pipe_split\n:set wait_key\nWN\ct~T\n\""
-macro editor \ew "^a [WAS: ^e]^a"
+folder-hook "" "macro index S \":unset wait_key\n|spamassassin --report\n:set wait_key\ns=spamo-mutt\n\""
+folder-hook "=spam" "macro index S \":unset wait_key\n|spamassassin --report\n:set wait_key\nWN\ct~T\n\""
+folder-hook "" "macro pager S \":unset wait_key\n|spamassassin --report\n:set wait_key\ns=spamo-mutt\n\""
+folder-hook "=spam" "macro pager S \":unset wait_key\n|spamassassin --report\n:set wait_key\n\""
+folder-hook "" "macro index H \":unset wait_key\n|spamassassin --revoke\n:set wait_key\nWN\ct~T\n\""
+folder-hook "" "macro pager H \":unset wait_key\n|spamassassin --revoke\n:set wait_key\n\""
+macro editor \ew "^a [^e]^a"