Fix inconsequent use of utf7_encode which causes problems with creating/renaming