iPhone 4. iOS 4.1. Mail App.

I set up Google sync using the instructions from Google found here:
http://www.google.com/support/mobile/bin/answer.py?answer=138740&topic=14252

And now Yahoo Mail won't work: I get his error:
The IMAP server "apple.imap.mail.yahoo.com" is not responding. Check your network connection and that you entered the correct information in the "Incoming Mail Server" field.

Network fine, login info fine.

Settings - Accounts - Yahoo! - Account Info:

I don't see "Incoming Mail Server"
Only see "Outgoing Mail Server" set to: Yahoo! SMTP Server

Mail.app won't remember my Yahoo! password, but Gmail is working now with Push!
:/