fix mail issue