SpamMark implemented. Needs a little design cleanup.
Merge remote-tracking branch 'origin/master'