--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -67,19 +67,17 @@ fi
 if [ "$MOZ_MORK" ]; then
   . "${srcdir}/db/makefiles.sh"
 fi
 
 if [ "$MOZ_COMPOSER" ]; then
   . "${srcdir}/editor/ui/makefiles.sh"
 fi
 
-if [ "$MOZ_MAIL_NEWS" ]; then
-  . "${srcdir}/mailnews/makefiles.sh"
-fi
+. "${srcdir}/mailnews/makefiles.sh"
 
 if [ "$MOZ_CALENDAR" ]; then
   . "${srcdir}/calendar/shared_makefiles.sh"
   . "${srcdir}/calendar/lightning/makefiles.sh"
 fi
 
 #
 # Application-specific makefiles

--- a/bridge/bridge.mk
+++ b/bridge/bridge.mk
@@ -42,15 +42,13 @@ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/moz
 APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
 APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
 #endif
 
 #ifdef MOZ_MORK
 APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
 #endif
 
-ifdef MOZ_MAIL_NEWS
 APP_LIBXUL_DIRS += \
   $(DEPTH)$(SUBDIR)/mailnews/base \
   $(DEPTH)$(SUBDIR)/mailnews/mime/public \
   $(DEPTH)$(SUBDIR)/mailnews \
   $(NULL)
-endif

--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -103,17 +103,16 @@ MOZ_PROFILING   = @MOZ_PROFILING@
 MOZ_JPROF       = @MOZ_JPROF@
 MOZ_SHARK       = @MOZ_SHARK@
 DEHYDRA_PATH    = @DEHYDRA_PATH@
 
 NS_TRACE_MALLOC = @NS_TRACE_MALLOC@
 USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@
 INCREMENTAL_LINKER = @INCREMENTAL_LINKER@
 MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
-MOZ_MAIL_NEWS	= @MOZ_MAIL_NEWS@
 MOZ_CALENDAR	= @MOZ_CALENDAR@
 MOZ_PLAINTEXT_EDITOR_ONLY = @MOZ_PLAINTEXT_EDITOR_ONLY@
 MOZ_COMPOSER = @MOZ_COMPOSER@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
 MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@
 ACCESSIBILITY = @ACCESSIBILITY@
 MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@

--- a/configure.in
+++ b/configure.in
@@ -4493,17 +4493,16 @@ ENABLE_TESTS=1
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_CALENDAR=
 MOZ_FEEDS=1
 MOZ_INSTALLER=1
 MOZ_IPC=1
 MOZ_JSDEBUGGER=1
 MOZ_LDAP_XPCOM=
-MOZ_MAIL_NEWS=
 MOZ_MORK=
 MOZ_MORKREADER=1
 MOZ_AUTH_EXTENSION=1
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_NO_FAST_LOAD=
 MOZ_OGG=1
 MOZ_SYDNEYAUDIO=
 MOZ_WAVE=1
@@ -4840,25 +4839,16 @@ dnl = Calendar client
 dnl =========================================================
 MOZ_ARG_ENABLE_BOOL(calendar,
 [  --enable-calendar      Enable building of the Lightning calendar extension],
     MOZ_CALENDAR=1,
     MOZ_CALENDAR= )
 AC_SUBST(MOZ_CALENDAR)
 
 dnl =========================================================
-dnl = Mail & News
-dnl =========================================================
-MOZ_ARG_DISABLE_BOOL(mailnews,
-[  --disable-mailnews      Disable building of mail & news components],
-    MOZ_MAIL_NEWS=,
-    MOZ_MAIL_NEWS=1 )
-AC_SUBST(MOZ_MAIL_NEWS)
-
-dnl =========================================================
 dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
 dnl ========================================================
@@ -6749,23 +6739,16 @@ if test -n "$MOZ_SERVICES_SYNC"; then
   AC_DEFINE(MOZ_SERVICES_SYNC)
 fi
 
 dnl ========================================================
 if test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
     MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
 fi
 
-if test -z "$MOZ_MAIL_NEWS"; then
-    MAIL_COMPONENT=
-    export MAIL_COMPONENT
-    MAIL_MODULE=
-    export MAIL_MODULE
-fi
-
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
     if test "$OS_ARCH" = "WINNT"; then
         if test -n "$GNU_CC"; then
             LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
         else
             LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
         fi

--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -37,17 +37,16 @@
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=thunderbird
 MOZ_UPDATER=1
 MOZ_THUNDERBIRD=1
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
-MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_COMPOSER=1
 MOZ_SAFE_BROWSING=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"

--- a/suite/Makefile.in
+++ b/suite/Makefile.in
@@ -50,36 +50,33 @@ PARALLEL_DIRS = debugQA
 endif
 
 PARALLEL_DIRS	+= \
 		browser \
 		common \
 		feeds/public \
 		feeds/src \
 		locales \
+		mailnews \
 		modules \
 		themes/classic \
 		themes/modern \
 		profile \
 		security \
 		shell/public \
 		shell/src \
 		smile \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_INSTALLER
 PARALLEL_DIRS += installer/windows
 endif
 endif
 
-ifdef MOZ_MAIL_NEWS
-PARALLEL_DIRS += mailnews
-endif
-
 # app is always last as it packages up the built files on mac
 DIRS = build app
 
 include $(topsrcdir)/config/rules.mk
 
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::

--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -33,17 +33,16 @@
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
-MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_COMPOSER=1
 MOZ_SUITE=1
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly

--- a/suite/shell/src/Makefile.in
+++ b/suite/shell/src/Makefile.in
@@ -30,15 +30,14 @@ LIBRARY_NAME = shellservice_s
 ifdef BUILD_STATIC_SHELL
 MOZILLA_INTERNAL_API = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsSuiteShellModule
 endif
 endif
 
-ifdef MOZ_MAIL_NEWS
-DEFINES += -DMOZ_MAIL_NEWS
-endif
-
-DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\"
+DEFINES += \
+	-DMOZ_MAIL_NEWS \
+	-DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/suite/shell/src/nsWindowsShellService.cpp
+++ b/suite/shell/src/nsWindowsShellService.cpp
@@ -529,22 +529,20 @@ nsWindowsShellService::IsDefaultClientVi
                                 (void**)&pAAR);
   
   if (SUCCEEDED(hr)) {
     BOOL isDefaultBrowser = PR_TRUE;
     BOOL isDefaultMail    = PR_TRUE;
     BOOL isDefaultNews    = PR_TRUE;
     if (aApps & nsIShellService::BROWSER)
       pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME, &isDefaultBrowser);
-#ifdef MOZ_MAIL_NEWS
     if (aApps & nsIShellService::MAIL)
       pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME_MAIL, &isDefaultMail);
     if (aApps & nsIShellService::NEWS)
       pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME_NEWS, &isDefaultNews);
-#endif
 
     *aIsDefaultClient = isDefaultBrowser && isDefaultNews && isDefaultMail;
 
     pAAR->Release();
     return PR_TRUE;
   }
 #endif  
   return PR_FALSE;
@@ -565,32 +563,30 @@ nsWindowsShellService::IsDefaultClient(b
   // browser check needs to be at the top
   if (aApps & nsIShellService::BROWSER) {
     *aIsDefaultClient &= TestForDefault(gBrowserSettings, sizeof(gBrowserSettings)/sizeof(SETTING));
     // Only check if this app is default on Vista if the previous checks
     // indicate that this app is the default.
     if (*aIsDefaultClient)
       IsDefaultClientVista(nsIShellService::BROWSER, aIsDefaultClient);
   }
-#ifdef MOZ_MAIL_NEWS
   if (aApps & nsIShellService::MAIL) {
     *aIsDefaultClient &= TestForDefault(gMailSettings, sizeof(gMailSettings)/sizeof(SETTING));
     // Only check if this app is default on Vista if the previous checks
     // indicate that this app is the default.
     if (*aIsDefaultClient)
       IsDefaultClientVista(nsIShellService::MAIL, aIsDefaultClient);
   }
   if (aApps & nsIShellService::NEWS) {
     *aIsDefaultClient &= TestForDefault(gNewsSettings, sizeof(gNewsSettings)/sizeof(SETTING));
     // Only check if this app is default on Vista if the previous checks
     // indicate that this app is the default.
     if (*aIsDefaultClient)
       IsDefaultClientVista(nsIShellService::NEWS, aIsDefaultClient);
   }
-#endif
 
   return NS_OK;
 }
 
 
 NS_IMETHODIMP
 nsWindowsShellService::SetDefaultClient(bool aForAllUsers,
                                         bool aClaimAllTypes, PRUint16 aApps)