Android GTalk and googlemail vs. gmail account

Yesterday I discoverered an option in my googlemail settings offering me to switch from my @googlemail.com to @gmail.com account. I did something stupid and clicked on that link….. and went to bed. Half an hour later I got notified by my GTalk Android client that it couldn't reconnect to my account because of a credential error.

After lots of reading and some tests I was able to revert it back…

Here's what worked for me:

1. Change my gmail account password in order for the gtalk client to notice there's something wrong with its cached data.
2. Install eBuddy to be able to test GTalk independentely from any cached account info (eBuddy allows multiple accounts)
3. Create a second account in eBuddy for my @gmail.com account and make sure it works
4. Go to my google account settings (from gcal) and verify it's @gmail.com there to
5. Take a break of an hour (I believe that was decisive)
6. Go back to gmail settings and revert back to @googlemail.com
7. Check that the @googlemail.com account works again using eBuddy
8. Kill GTalk service in Android and restart GTalk
9. Voila!

I've read many posts suggesting reverting back to @googlemail.com and some people seemed to have problems with that. As a matter of fact I did all this twice as it didn't work the first time. I believe the break (maybe for the account info to get synced) was decisive.