Fix #7731 - telegram improvemnts