(Issue 777) Improve email spam score