fixes for mail system

API update for another PR in Forestry