Google Desktop should do that. Also, have a look at Gizmo's current newsletter and look at his Tip of the Month on how to add notes to your files.

         http://techsupportalert.com/issues/al_current.htm

Maybe that would help reduce this problem in future.