>> I doubt Apple can fix this before June 2008.

Eh, they could just put a larger back on it and use a bigger battery.

Surprised they haven't done this already. It'd at least shut up one huge
group of whiners constantly bitching about the non-replaceable one in there
now.

Of course such a change would likely incur the need for new FCC testing.