Fix for mailers (1)