Add retry into message client