v1.2 - Minor bugfixes, code refactoring

git-svn-id: https://plugins.svn.wordpress.org/wp-jv-custom-email-settings/trunk@966277 b8457f37-d9ea-0310-8a92-e5e31aec5664