Pruned spam folder

For cleanup, I pulled the work-in-progress "spam folder" stuff into its own branch, as a step toward broader public release.