#608843 iwatch: Trouble with utf8 characters in filenames (+ 2 possible fixes)