diff -u8pdNr orig/chrome.manifest forsb/chrome.manifest
--- orig/chrome.manifest	2008-05-17 02:25:40.000000000 +0200
+++ forsb/chrome.manifest	2009-01-19 18:50:22.000000000 +0100
@@ -4,16 +4,17 @@ content	infolister	content/
 overlay	chrome://browser/content/browser.xul	chrome://infolister/content/overlay.xul
 
 # Thunderbird
 overlay	chrome://messenger/content/mailWindowOverlay.xul	chrome://infolister/content/tb-overlay.xul
 overlay	chrome://messenger/content/messengercompose/messengercompose.xul	chrome://infolister/content/overlay-compose.xul
 
 # Sunbird
 overlay	chrome://calendar/content/calendar.xul	chrome://infolister/content/sb-overlay.xul
+overlay	chrome://sunbird/content/calendar.xul	chrome://infolister/content/sb-overlay.xul
 
 # SeaMonkey
 overlay	chrome://navigator/content/navigator.xul	chrome://infolister/content/sm-overlay.xul
 
 
 skin	infolister	classic/1.0	skin/
 style	chrome://global/content/customizeToolbar.xul	chrome://infolister/skin/toolbar-button.css
 
diff -u8pdNr orig/content/common.js forsb/content/common.js
--- orig/content/common.js	2008-05-11 15:22:18.000000000 +0200
+++ forsb/content/common.js	2009-01-19 19:10:04.000000000 +0100
@@ -12,16 +12,17 @@ var InfoListerWindows = {
   // windows we work with
   Info: 0, Prefs: 1, Browser: 2, Mail: 3, Calendar: 4, Any: 5,
 
   urls: ["chrome://infolister/content/infolister.xul",
          "chrome://infolister/content/prefs/prefs.xul",
          "chrome://browser/content/browser.xul",
          "chrome://messenger/content/messenger.xul",
          "chrome://calendar/content/calendar.xul",
+         "chrome://sunbird/content/calendar.xul",
          "chrome://infolister/content/infolister.xul" // this qualifies as "any", right?
          ],
   winTypeStrings: ["infolister:infowindow", "infolister:prefwindow",
   "navigator:browser", "" /* mail */ , "calendarMainWindow" /*calendar*/, "" /* any */],
 
   get windowMediator() {
     return ILHelpers.getService("appshell/window-mediator;1", "nsIWindowMediator");
   },
diff -u8pdNr orig/content/sb-overlay.xul forsb/content/sb-overlay.xul
--- orig/content/sb-overlay.xul	2008-05-11 15:22:18.000000000 +0200
+++ forsb/content/sb-overlay.xul	2009-01-19 18:49:48.000000000 +0100
@@ -3,17 +3,17 @@
 <!DOCTYPE overlay SYSTEM "chrome://infolister/locale/overlay.dtd">
 
 <overlay id="infolister-overlay"
           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
 
   <script src="common.js"/>
   <script src="overlay.js"/>
 
-  <menupopup id="toolsPopup">
+  <menupopup id="menu_ToolsPopup">
     <menuitem id="infolister-menuitem" oncommand="InfoListerOverlay.openInfoLister(event);" 
               label="&brandname.label;" accesskey="&brandname.accesskey;"/>
   </menupopup>
 
   <toolbarpalette id="calendarToolbarPalette">
     <toolbarbutton id="infolister-button" class="toolbarbutton-1"
                    tooltiptext="&toolbarbutton.tooltip;"
                    label="&brandname.label;"
diff -u8pdNr orig/install.rdf forsb/install.rdf
--- orig/install.rdf	2008-05-17 02:46:54.000000000 +0200
+++ forsb/install.rdf	2009-01-19 19:05:44.000000000 +0100
@@ -1,33 +1,23 @@
 <?xml version="1.0"?>
 <RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
          xmlns:NC="http://home.netscape.com/NC-rdf#"
          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="rdf:#$nh0Dn"
-                   em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-                   em:minVersion="2.0"
-                   em:maxVersion="3.0.*" />
-  <RDF:Description RDF:about="rdf:#$sh0Dn"
-                   em:id="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-                   em:minVersion="1.5"
-                   em:maxVersion="2.0.0.*" />
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="{3f0da09b-c1ab-40c5-8d7f-53f475ac3fe8}"
-                   em:name="InfoLister"
-                   em:version="0.10"
+                   em:name="InfoLister for Sunbird"
+                   em:version="0.10.b"
                    em:description="Lists installed extensions and themes"
                    em:creator="Nickolay Ponomarev"
                    em:optionsURL="chrome://infolister/content/prefs/prefs.xul"
                    em:iconURL="chrome://infolister/skin/icon32x32.png"
                    em:homepageURL="http://mozilla.doslash.org/infolister"
                    em:type="2">
 <!--                   em:updateURL="http://mozilla.doslash.org/infolister/update.rdf"-->
-    <em:targetApplication RDF:resource="rdf:#$nh0Dn"/>
-    <em:targetApplication RDF:resource="rdf:#$sh0Dn"/>
     <!-- chronological order -->
     <em:contributor>Torisugari</em:contributor>
     <em:contributor>Ralf Hasse (icons)</em:contributor>
     <em:contributor>Rowne Mastaile</em:contributor>
     <em:contributor>Robert Strong</em:contributor>
     <em:contributor>zeniko</em:contributor>
     <em:contributor>Dr. Evil</em:contributor>
     <em:contributor>Robert Brand (Sunbird support)</em:contributor>
@@ -37,24 +27,15 @@
     <em:translator>Wronschien (French)</em:translator>
     <em:translator>Unghost (Russian)</em:translator>
     <em:translator>Leszek(teo)Życzkowski (Polish)</em:translator>
 
     <!-- Sunbird -->
     <em:targetApplication>
       <Description>
         <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
-        <em:minVersion>0.5</em:minVersion>
-        <em:maxVersion>0.8</em:maxVersion>
+        <em:minVersion>0.9</em:minVersion>
+        <em:maxVersion>1.0pre</em:maxVersion>
       </Description>
     </em:targetApplication>
 
-
-	<!-- SeaMonkey -->
-	<em:targetApplication>
-	<Description>
-		<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-		<em:minVersion>1.5a</em:minVersion>
-		<em:maxVersion>2.0a1</em:maxVersion>
-	</Description>
-	</em:targetApplication>
   </RDF:Description>
 </RDF:RDF>