diff --git a/res/js/component/history.js b/res/js/component/history.js
index 5e555f2bd6ad7f3df70e997faa2c2252dd336f36..0306d39001cde403ff7ed8c5cbe9857a06a7c9e3 100644
--- a/res/js/component/history.js
+++ b/res/js/component/history.js
@@ -63,7 +63,6 @@ class HistoryView {
         this.index %= this.elements.length;
         if (this.elements[this.index])
             this.elements[this.index].focus(true);
-        console.log(this.index);
     }
     navigateLater() {
         if (this.elements[this.index])
@@ -75,7 +74,6 @@ class HistoryView {
             this.index %= this.elements.length;
         if (this.elements[this.index])
             this.elements[this.index].focus(true);
-        console.log(this.index);
     }
     resetNavigation() {
         if (this.elements[this.index])
@@ -84,6 +82,6 @@ class HistoryView {
     }
     truncate() {
         while (this.elements.length > HISTORY_MAX_LENGTH)
-            this.list.removeChild(this.elements.shift().elem);
+            this.list.removeChild(this.elements.pop().elem);
     }
 }
\ No newline at end of file
diff --git a/res/js/component/history.jsx b/res/js/component/history.jsx
index b709b74230a88a4188fca3cbdece2a6b59c20db8..dad4dcbd4be4f076507fb5e5f3141753eaceff3c 100644
--- a/res/js/component/history.jsx
+++ b/res/js/component/history.jsx
@@ -79,8 +79,6 @@ class HistoryView {
 
         if (this.elements[this.index])
             this.elements[this.index].focus(true);
-
-        console.log(this.index);
     }
 
     navigateLater() {
@@ -95,8 +93,6 @@ class HistoryView {
 
         if (this.elements[this.index])
             this.elements[this.index].focus(true);
-
-        console.log(this.index);
     }
 
     resetNavigation() {
@@ -108,6 +104,6 @@ class HistoryView {
 
     truncate() {
         while (this.elements.length > HISTORY_MAX_LENGTH)
-            this.list.removeChild(this.elements.shift().elem);
+            this.list.removeChild(this.elements.pop().elem);
     }
 }
\ No newline at end of file
diff --git a/res/js/util/mirccolorhandler.js b/res/js/util/mirccolorhandler.js
index 458d963f60f85072194df86e48c4579abf05fbf2..076eb5d8ce2e8188467a27e46467878f0a441aa5 100644
--- a/res/js/util/mirccolorhandler.js
+++ b/res/js/util/mirccolorhandler.js
@@ -50,8 +50,11 @@ class MircColorHandler {
                 elem.classList.add('irc_highlight');
             return elem;
         };
+        const unescape = function (str) {
+            return str.replace(/&lt;/g, '<').replace(/&gt;/g, '>');
+        };
         const apply = function (lastTag, str, i, normalCount, nodes) {
-            const s = str.substr(i - normalCount, normalCount);
+            const s = unescape(str.substr(i - normalCount, normalCount));
             if (normalCount === 0)
                 return;
             if (lastTag.tagName === 'A')