Reverting comment files to state they were in prior to adding code for spam filtering. These changes can now be seen in a new branch. It may make sense to merge this branch (update-mail) into master