Code performance improvements - Tag 6.9.04 release

git-svn-id: https://plugins.svn.wordpress.org/e-mailit/trunk@967028 b8457f37-d9ea-0310-8a92-e5e31aec5664