Index: mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp

===================================================================

RCS file: /cvsroot/mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp,v

retrieving revision 1.8.2.1

diff -d -u -p -r1.8.2.1 nsMailGNOMEIntegration.cpp

--- mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp	23 Oct 2006 03:32:47 -0000	1.8.2.1

+++ mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp	11 Apr 2007 18:50:02 -0000

@@ -69,7 +69,7 @@ static const char* const sFeedProtocols[

   "feed"

 };

-nsMailGNOMEIntegration::nsMailGNOMEIntegration(): mCheckedThisSession(PR_FALSE)

+nsMailGNOMEIntegration::nsMailGNOMEIntegration(): mCheckedThisSession(PR_TRUE)

 {}

 nsresult

Index: mozilla/mail/components/preferences/general.xul

===================================================================

RCS file: /cvsroot/mozilla/mail/components/preferences/general.xul,v

retrieving revision 1.4.2.9

diff -d -u -p -r1.4.2.9 general.xul

--- mozilla/mail/components/preferences/general.xul	18 Feb 2007 20:26:46 -0000	1.4.2.9

+++ mozilla/mail/components/preferences/general.xul	13 Apr 2007 19:34:19 -0000

@@ -70,7 +70,7 @@

     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>

-#ifdef HAVE_SHELL_SERVICE

+#ifdef 0

     <stringbundle id="bundleShell" src="chrome://messenger/locale/shellservice.properties"/>

     <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>