fixes for mail system
Merge branch 'master' of git://github.com/mezz/ForestryAPI into mezz-master
Merge branch 'mezz-master'