IPhone :: Camera Roll Displaying Wrong Pictures?

I have a 4S running on iOS 5.0. I reset my phone a few weeks ago when I was playing around, and I restored it from my iCloud backup. Everything was fine except the filename counter for my pictures was also reset to IMG0001. I transfer pictures to my computer regularly so now I have many pictures with duplicated names, such as IMG0001.JPG and IMG0001 (2).JPG. This is much of an annoyance but I can live with that.

However I have even weirder things happening now. Let's say before I reset my phone I had shot a vidoe and the name was IMG0010.MOV. After the reset of course the video is gone, and I take pictures with my phone as usual. So I took a picture whose name as IMG0010.JPG again, and when I try to see it in the camera roll, I see the first frame of my old video! In the thumbnail view it is the right picture, but when I tap on it to view it, it shows my newly taken picture for about half a second, and then displays my old video. I guess there must be some old cache on my phone that override the picture display. Does anyone know how to fix it?

I should add that the picture is also displayed wrongly in my photo stream folder on the phone. On the other hand when I access the picture from the computer (in the DCIM folder, and in the synced photo stream folder) it is the right one. But I want to view the pictures on my phone! I can't take my computer with me anytime!

Info:
iPhone 4S, iOS 5.0.1