Updated and tested on version 3.9.

git-svn-id: https://plugins.svn.wordpress.org/xmail-the-right-way/trunk@894940 b8457f37-d9ea-0310-8a92-e5e31aec5664