Fix counting renewal message for renew all functionality