Moving incomplete work-in-progress "spam folder" stuff to its own branch.