diff --git a/mozilla/extensions/irc/xul/content/static.js b/mozilla/extensions/irc/xul/content/static.js
index d302271cb29..98e396b56b1 100644
--- a/mozilla/extensions/irc/xul/content/static.js
+++ b/mozilla/extensions/irc/xul/content/static.js
@@ -487,9 +487,13 @@ function updateTitle (obj)
         case "IRCServer":
         case "IRCNetwork":
             var serv = "", nick = "";
-            serv  = o.server.connection.host;
-
-            nick = o.server.me.properNick;
+            if (o.server)
+            {
+                serv  = o.server.connection.host;
+                if (o.server.me)
+                    nick = o.server.me.properNick;
+            }
+            
             if (nick) /* user might be disconnected, nick would be undefined */
                 tstring += "user '" + nick + "' ";
             
diff --git a/mozilla/extensions/irc/xul/manifest.rdf b/mozilla/extensions/irc/xul/manifest.rdf
index 92cfb116a5f..7e428fe3e3e 100644
--- a/mozilla/extensions/irc/xul/manifest.rdf
+++ b/mozilla/extensions/irc/xul/manifest.rdf
@@ -33,6 +33,15 @@
     </chrome:packages>
   </RDF:Description>
 
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://global/content/tasksOverlay.xul"/>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://global/content/tasksOverlay.xul">
+    <RDF:li>chrome://chatzilla/content/chatzillaOverlay.xul</RDF:li>
+  </RDF:Seq>
+
   <!-- skin information -->
   <RDF:Description about="urn:mozilla:skin:modern/1.0"
         chrome:displayName="Modern"