diff --git a/ChangeLog b/ChangeLog
index 4691f3f0b..cf2d703d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+=== Deluge 1.2.0_rc6 (In Development) ===
+==== GtkUI ====
+	* Fix #1104, #735 use path.utf-8 if available
+
 === Deluge 1.2.0_rc5 (17 December 2009) ===
 ==== Web ====
 	* Swap order of buttons in Remove window (Closes #1083)
diff --git a/deluge/ui/common.py b/deluge/ui/common.py
index 4ea999da8..7e2b52208 100644
--- a/deluge/ui/common.py
+++ b/deluge/ui/common.py
@@ -114,7 +114,10 @@ class TorrentInfo(object):
                 prefix = self.__m_name
 
             for index, f in enumerate(self.__m_metadata["info"]["files"]):
-                path = decode_string(os.path.join(prefix, decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding)
+                if "path.utf-8" in f:
+                    path = os.path.join(*f["path.utf-8"])
+                else:
+                    path = decode_string(os.path.join(prefix, decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding)
                 f["index"] = index
                 paths[path] = f
 
@@ -138,8 +141,12 @@ class TorrentInfo(object):
                 prefix = self.__m_name
 
             for f in self.__m_metadata["info"]["files"]:
+                if "path.utf-8" in f:
+                    path = os.path.join(*f["path.utf-8"])
+                else:
+                    path = decode_string(os.path.join(prefix, decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding)
                 self.__m_files.append({
-                    'path': decode_string(os.path.join(prefix, decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding),
+                    'path': path,
                     'size': f["length"],
                     'download': True
                 })