I had this same issue with my iPhone 4, I got bored waiting for a 4.1 jailbreak and restored back to 4.0.1, unfortunately upon doing so it wouldn't let me restore the backup as it was from a higher firmware version. Fortunately my contacts and other stuff are all synced so all I really lost was a few settings which took a few minutes to rectify.