hotfix for mail endpoint