--- a/mail/configure.in
+++ b/mail/configure.in
@@ -80,16 +80,34 @@ if test "$MOZ_LDAP_XPCOM"; then
     LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
 fi
 AC_SUBST(MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE)
 
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 
+dnl =========================================================
+dnl = MAPI support (Windows only)
+dnl =========================================================
+
+if test "$_WIN32_MSVC"; then
+    MOZ_MAPI_SUPPORT=1
+fi
+
+MOZ_ARG_DISABLE_BOOL(mapi,
+[  --disable-mapi          Disable MAPI support],
+    MOZ_MAPI_SUPPORT= )
+
+AC_SUBST(MOZ_MAPI_SUPPORT)
+
+if test -n "$MOZ_MAPI_SUPPORT"; then
+    AC_DEFINE(MOZ_MAPI_SUPPORT)
+fi
+
 if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
   MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
   MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
   MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi
 
 # Check for PBBUILD on OS X.
 case "$target_os" in

--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -24,17 +24,17 @@ if test "$OS_ARCH" = "Darwin"; then
   ACCESSIBILITY=
 fi
 
 MOZ_SAFE_BROWSING=1
 MOZ_MEDIA_NAVIGATOR=1
 MOZ_MORK=1
 MAIL_COMPONENT="mail msgsmime import"
 MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)"
-if test -n "$_WIN32_MSVC"; then
+if test -n "$MOZ_MAPI_SUPPORT"; then
   MAIL_COMPONENT="$MAIL_COMPONENT msgMapi"
   MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
 fi
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 

--- a/suite/configure.in
+++ b/suite/configure.in
@@ -80,16 +80,40 @@ if test "$MOZ_LDAP_XPCOM"; then
     LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
 fi
 AC_SUBST(MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE)
 
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 
+dnl =========================================================
+dnl = MAPI support (Windows only)
+dnl =========================================================
+
+if test "$_WIN32_MSVC"; then
+    MOZ_MAPI_SUPPORT=1
+fi
+
+MOZ_ARG_DISABLE_BOOL(mapi,
+[  --disable-mapi          Disable MAPI support],
+    MOZ_MAPI_SUPPORT= )
+
+AC_SUBST(MOZ_MAPI_SUPPORT)
+
+if test -n "$MOZ_MAPI_SUPPORT"; then
+    AC_DEFINE(MOZ_MAPI_SUPPORT)
+fi
+
+if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
+  MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
+  MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
+  MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
+fi
+
 if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
   MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
   MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
   MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi
 
 # if we're building the LDAP XPCOM component, we need to build
 # the c-sdk first.

--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -22,17 +22,17 @@ ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_HELP_VIEWER=1
 MOZ_MEDIA_NAVIGATOR=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MAIL_COMPONENT="mail msgsmime import"
 MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)"
-if test -n "$_WIN32_MSVC"; then
+if test -n "$MOZ_MAPI_SUPPORT"; then
   MAIL_COMPONENT="$MAIL_COMPONENT msgMapi"
   MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
 fi
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_SYNC=1
 MOZ_URL_CLASSIFIER=1