Fixing mail issue