Fix for mailers (2)