Committing this so that I can try and get SPAMEvaluationDialog working. I
though this commit may be related, guess not.

P.S. JAVA HELLA QUICK