According to this Hollywood Reporter article, following the upcoming second half of this, the sixth season, there will be one more, full 23 episode season - but that will be the last.
Will be interesting to see how they wrap it all up - but we have some time to ponder that - the final season will not be aired until 2007 and maybe into 2008.