diff --git a/extensions/irc/xul/content/handlers.js b/extensions/irc/xul/content/handlers.js
index c14b2aeee085..3125ab42a63c 100644
--- a/extensions/irc/xul/content/handlers.js
+++ b/extensions/irc/xul/content/handlers.js
@@ -107,13 +107,15 @@ function onTabClick (e, id)
 
 function onMessageViewClick(e)
 {
-    if (e.which != 1)
+    if ((e.which != 1) && (e.which != 2))
         return;
     
     var cx = getMessagesContext(null, e.target);
     var command;
     
-    if (e.metaKey || e.altKey)
+    if (e.which == 2)
+        command = client.prefs["messages.middleClick"];
+    else if (e.metaKey || e.altKey)
         command = client.prefs["messages.metaClick"];
     else if (e.ctrlKey)
         command = client.prefs["messages.ctrlClick"];
diff --git a/extensions/irc/xul/content/prefs.js b/extensions/irc/xul/content/prefs.js
index 08b99943e4d0..b8bf69acf28a 100644
--- a/extensions/irc/xul/content/prefs.js
+++ b/extensions/irc/xul/content/prefs.js
@@ -96,6 +96,7 @@ function initPrefs()
          ["messages.click",     "goto-url"],
          ["messages.ctrlClick", "goto-url-newwin"],
          ["messages.metaClick", "goto-url-newtab"],
+         ["messages.middleClick", "goto-url-newtab"],
          ["motif.dark",         "chrome://chatzilla/skin/output-dark.css"],
          ["motif.light",        "chrome://chatzilla/skin/output-light.css"],
          ["motif.default",      "chrome://chatzilla/skin/output-default.css"],
diff --git a/extensions/irc/xul/content/static.js b/extensions/irc/xul/content/static.js
index cf2f531dbc10..9da82733a744 100644
--- a/extensions/irc/xul/content/static.js
+++ b/extensions/irc/xul/content/static.js
@@ -34,7 +34,7 @@
  *  Samuel Sieb, samuel@sieb.net, MIRC color codes, munger menu, and various
  */
 
-const __cz_version   = "0.9.54";
+const __cz_version   = "0.9.57";
 const __cz_condition = "green";
 
 var warn;