Fix for bug #95122. sr=sspitzer

Cleaning up the contents.rdf and fixing the js error

mailnews/mapi/resources/content/contents.rdf

@@ -33,8 +33,6 @@
     <RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
     <RDF:li resource="chrome://editor/content/editor.xul"/>
     <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
-    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
-    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
   </RDF:Seq>
 
 
@@ -112,14 +110,4 @@
     <RDF:li>chrome://messenger/content/pref-mailnewsOverlay.xul</RDF:li>
   </RDF:Seq>
 
-  <!-- mail Integration dialog -->
-  <RDF:Seq about="chrome://messenger/content/messenger.xul">
-    <RDF:li>chrome://messenger/content/mailIntegrationOverlay.xul</RDF:li>
-  </RDF:Seq>
- 
-  <!-- mail Integration dialog --> 
-  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
-    <RDF:li>chrome://messenger/content/mailIntegrationOverlay.xul</RDF:li>
-  </RDF:Seq>
-
 </RDF:RDF>

mailnews/mapi/resources/content/pref-mailnewsOverlay.js

@@ -21,6 +21,8 @@
  */
 
 parent.hPrefWindow.registerOKCallbackFunc( onOK );
+
+function mailnewsOverlayInit() {
     try {
         var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
                    getService( Components.interfaces.nsIMapiRegistry );
@@ -29,7 +31,6 @@ catch(ex){
         mapiRegistry = null;
     }
 
-function mailnewsOverlayInit() {
     const prefbase = "system.windows.lock_ui.";
     var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
     if (mapiRegistry) {
@@ -61,6 +62,13 @@ function mailnewsOverlayInit() {
 
 function onOK()
 {
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    } 
     if (mapiRegistry) { 
         if (document.getElementById("mailnewsEnableMapi").checked)
             mapiRegistry.setDefaultMailClient();

modules/libpref/src/win/winpref.js

@@ -156,6 +156,8 @@ pref("font.size.fixed.zh-TW", 16);
 
 pref("font.size.nav4rounding", false);
 
+pref("system.windows.lock_ui.default_mail_client", false);
+
 pref("netinst.profile.show_profile_wizard", true); 
 
 //The following pref is internal to Communicator. Please