Second commit to apply last changes!

git-svn-id: https://plugins.svn.wordpress.org/sexy-contact-form/trunk@1048457 b8457f37-d9ea-0310-8a92-e5e31aec5664