diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 67922a03e..f692b7caf 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -6030,14 +6030,14 @@
         postID: data.no,
         threadID: data.resto || data.no,
         boardID: boardID,
-        name: Build.unescape(data.name),
+        name: data.name,
         capcode: data.capcode,
         tripcode: data.trip,
         uniqueID: data.id,
-        email: Build.unescape(data.email),
-        subject: Build.unescape(data.sub),
+        email: data.email,
+        subject: data.sub,
         flagCode: data.country,
-        flagName: Build.unescape(data.country_name),
+        flagName: data.country_name,
         date: data.now,
         dateUTC: data.time,
         comment: {
@@ -6053,7 +6053,7 @@
         };
       } else if (data.ext) {
         o.file = {
-          name: (Build.unescape(data.filename)) + data.ext,
+          name: data.filename + data.ext,
           timestamp: "" + data.tim + data.ext,
           url: boardID === 'f' ? "//i.4cdn.org/" + boardID + "/" + (encodeURIComponent(data.filename)) + data.ext : "//i.4cdn.org/" + boardID + "/" + data.tim + data.ext,
           height: data.h,
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 2a8f5f0e3..4e3d872ed 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -6059,14 +6059,14 @@
         postID: data.no,
         threadID: data.resto || data.no,
         boardID: boardID,
-        name: Build.unescape(data.name),
+        name: data.name,
         capcode: data.capcode,
         tripcode: data.trip,
         uniqueID: data.id,
-        email: Build.unescape(data.email),
-        subject: Build.unescape(data.sub),
+        email: data.email,
+        subject: data.sub,
         flagCode: data.country,
-        flagName: Build.unescape(data.country_name),
+        flagName: data.country_name,
         date: data.now,
         dateUTC: data.time,
         comment: {
@@ -6082,7 +6082,7 @@
         };
       } else if (data.ext) {
         o.file = {
-          name: (Build.unescape(data.filename)) + data.ext,
+          name: data.filename + data.ext,
           timestamp: "" + data.tim + data.ext,
           url: boardID === 'f' ? "//i.4cdn.org/" + boardID + "/" + (encodeURIComponent(data.filename)) + data.ext : "//i.4cdn.org/" + boardID + "/" + data.tim + data.ext,
           height: data.h,
diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 14c61f1a7..1e3df44fe 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -33,24 +33,24 @@ Build =
   postFromObject: (data, boardID) ->
     o =
       # id
-      postID:   data.no
-      threadID: data.resto or data.no
-      boardID:  boardID
+      postID:    data.no
+      threadID:  data.resto or data.no
+      boardID:   boardID
       # info
-      name:     Build.unescape data.name
-      capcode:  data.capcode
-      tripcode: data.trip
-      uniqueID: data.id
-      email:    Build.unescape data.email
-      subject:  Build.unescape data.sub
-      flagCode: data.country
-      flagName: Build.unescape data.country_name
-      date:     data.now
-      dateUTC:  data.time
-      comment:  {innerHTML: data.com or ''}
+      name:      data.name
+      capcode:   data.capcode
+      tripcode:  data.trip
+      uniqueID:  data.id
+      email:     data.email
+      subject:   data.sub
+      flagCode:  data.country
+      flagName:  data.country_name
+      date:      data.now
+      dateUTC:   data.time
+      comment:   {innerHTML: data.com or ''}
       # thread status
-      isSticky: !!data.sticky
-      isClosed: !!data.closed
+      isSticky:  !!data.sticky
+      isClosed:  !!data.closed
       isArchived: !!data.archived
       # file
     if data.filedeleted
@@ -58,7 +58,7 @@ Build =
         isDeleted: true
     else if data.ext
       o.file =
-        name:      (Build.unescape data.filename) + data.ext
+        name:      data.filename + data.ext
         timestamp: "#{data.tim}#{data.ext}"
         url: if boardID is 'f'
           "//i.4cdn.org/#{boardID}/#{encodeURIComponent data.filename}#{data.ext}"
diff --git a/src/General/UI.coffee b/src/General/UI.coffee
index 877632bcb..549393044 100755
--- a/src/General/UI.coffee
+++ b/src/General/UI.coffee
@@ -163,6 +163,7 @@ UI = do ->
     onFocus: (e) =>
       e.stopPropagation()
       @focus e.target
+
     focus: (entry) ->
       while focused = $.x 'parent::*/child::*[contains(@class,"focused")]', entry
         $.rmClass focused, 'focused'
diff --git a/src/Quotelinks/QuoteThreading.coffee b/src/Quotelinks/QuoteThreading.coffee
index b26fdc6af..df190c6c4 100755
--- a/src/Quotelinks/QuoteThreading.coffee
+++ b/src/Quotelinks/QuoteThreading.coffee
@@ -27,6 +27,7 @@ QuoteThreading =
     Thread.callbacks.push
       name: 'Quote Threading'
       cb:   @setThread
+
     Post.callbacks.push
       name: 'Quote Threading'
       cb:   @node
@@ -35,6 +36,22 @@ QuoteThreading =
   children: {}
   inserted: {}
 
+  disconnect: ->
+    return unless Conf['Quote Threading'] and g.VIEW is 'thread'
+
+    Header.menu.rmEntry @entry
+
+    delete @enabled
+    delete @controls
+    delete @entry
+
+    @parent   = {}
+    @children = {}
+    @inserted = {}
+
+    Thread.callbacks.disconnect 'Quote Threading'
+    Post.callbacks.disconnect   'Quote Threading'
+
   setThread: ->
     QuoteThreading.thread = @
     $.asap (-> !Conf['Thread Updater'] or $ '.navLinksBot > .updatelink'), ->