[HOTFIX] Broken maill class