Okay, so I've read that in order to make Mail.app work with the unlocked 2.0 firmware, that you have to set up the iPhone as a new phone in iTunes. Is there any guide that explains how to do this and yet still keep contacts the same as they were before the upgrade?
I know that you can use OpenSSH to fix this which I could do myself no problem, but this is for a relative who I have to explain how to do it over the internet, so doing it right in iTunes would definitely be preferred, and since I don't have iTunes or an iPhone myself, I'm not entirely sure how to do that.
After you restore iTunes gives you two options... set up as new or from back-up. Choose New... then go to the Info tab and under Contacts, check "Sync contacts with" and choose the one you used the first time. For me it was "windows contacts".