Just a note about the plugin that it needs the master branch version of mail.inc.php. I think it could be edited to use the current stable 3.1.1.4 version as well fairly easily (have not worked on it much since the feature is going to be there in the core soon).