--- chrome.orig/content/local_install/local_install.js	2005-10-19 23:14:24.000000000 +0200
+++ chrome/content/local_install/local_install.js	2006-01-24 23:24:12.000000000 +0100
@@ -292,7 +292,7 @@
       }
     }
 
-    if (bThemesPref || myBrandShortName == "Thunderbird") {
+    if (bThemesPref || myBrandShortName.indexOf("Thunderbird") > -1) {
       try {
         document.getElementById("key_installToolsThemes").setAttribute("command", "");
       } catch(ex) {
@@ -320,7 +320,7 @@
       // Thunderbird has ctrl-shift-t as Get All
       if (allMenuItems[i].getAttribute("command") == "Tools:Themes" || allMenuItems[i].getAttribute("id") == "themesManager") {
         if (!bThemesPref) { 
-          if (myBrandShortName != "Thunderbird") {
+          if (myBrandShortName.indexOf("Thunderbird")< 0 ) {
             allMenuItems[i].setAttribute("key","key_installToolsThemes");
           }
         }
@@ -407,6 +407,9 @@
 
     Local_Install.hideRestartMenu();
 
+    if(myBrandShortName.indexOf("Thunderbird">-1))
+    	return;
+
     switch (myBrandShortName) {
       case "Mozilla":
         if (document.getElementById("new-exportConfig-menu")) {
@@ -415,9 +418,6 @@
         }
         break;
 
-      case "Thunderbird":
-        break;
-
       case "Nvu":
         var myEditorBundle = nsPreferences.copyUnicharPref("editor.throbber.url");
         var myLocalStrings = myLocalBundleService
@@ -694,6 +694,19 @@
   
   openPreferences: function() {
 
+    if(myBrandShortName.indexOf("Thunderbird")>-1)
+    {
+     if (local_common.IsOldBrowser()) {
+       openDialog("chrome://communicator/content/pref/pref.xul", "PrefWindow", 
+       "chrome,titlebar,centerscreen,resizable,dialog=no");
+     } else {
+       openDialog("chrome://messenger/content/preferences/preferences.xul", "Preferences", 
+       "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no");
+     }
+
+     return;
+    }
+    
     switch (myBrandShortName) {
       case "Mozilla":
         goPreferences('navigator', 'chrome://communicator/content/pref/pref-navigator.xul', 'navigator')
@@ -701,16 +714,6 @@
       case "Nvu":
         goDoCommand('cmd_preferences')
         break;
-      case "Thunderbird":
-        if (local_common.IsOldBrowser()) {
-          openDialog("chrome://communicator/content/pref/pref.xul", "PrefWindow", 
-            "chrome,titlebar,centerscreen,resizable,dialog=no");
-        } else {
-          openDialog("chrome://messenger/content/preferences/preferences.xul", "Preferences", 
-            "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no");
-        }
-        break; 
-
       default:
         if (local_common.IsOldBrowser()) {
           openDialog("chrome://browser/content/pref/pref.xul", "PrefWindow", 
@@ -1504,7 +1507,7 @@
 
     //local_common.debug("'" + document.title + "'");
 
-    if (myBrandShortName == "Thunderbird" && !local_common.IsOldBrowser()) {
+    if (myBrandShortName.indexOf("Thunderbird") > -1 && !local_common.IsOldBrowser()) {
       if (document.title.indexOf(local_common.buildID) == -1) {
         //myModifier = "titledefault";
   
@@ -2224,7 +2227,7 @@
 
 Local_Install.register();
 
-if (myBrandShortName != "Thunderbird") {
+if (myBrandShortName.indexOf("Thunderbird") > -1) {
   Local_Install.setTitleMode();
 }