diff --git configure.ac configure.ac
index 84c916f..9125838 100644
--- configure.ac
+++ configure.ac
@@ -1546,22 +1546,60 @@ EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnomeui-2.0 libglade-2.0 libedataserver-$EDS
 AC_SUBST(LIBFILTER_CFLAGS)
 AC_SUBST(LIBFILTER_LIBS)
 
-dnl --- evolution (shell) flags
-
-NM_SUPPORT_PACKAGES=""
-
-PKG_CHECK_MODULES([NM], [dbus-glib-1], [NM_SUPPORT="yes"], [NM_SUPPORT="no"])
-AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [ nm_header="yes" ] )
-if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then
-	AC_DEFINE(NM_SUPPORT, 1, [network manager available])
-	NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1"
+dnl Check for dbus - if dbus doesn't exist, dbus-glib won't exist!
+dnl If dbus is found, then append DBUS flags
+dnl Fixme : Left the version*100 hack - don't know how it affects the evo build
+PKG_CHECK_MODULES([DBUS], [dbus-1], [DBUS_SUPPORT="yes"], [DBUS_SUPPORT="no"])
+if test "x$DBUS_SUPPORT" = "xyes"; then
+	FOUND_DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
+	AC_SUBST(FOUND_DBUS_VERSION)
+	AC_DEFINE(DBUS_SUPPORT, 1, [dbus available])
+	AC_SUBST(DBUS_CFLAGS)
+	AC_SUBST(DBUS_LIBS)
+	AM_CONDITIONAL(ENABLE_DBUS, true)
 else
-        NM_SUPPORT=no
+	echo "DBUS wasn't found - won't check for dbus-glib/NetworkManager!"
+	echo "Plugins depending on dbus / dbus-glib-1 / NetworkManager will be disabled!"
+	DBUS_SUPPORT="no"
+	AM_CONDITIONAL(ENABLE_DBUS, false)
 fi
 
-AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes)
+dnl If dbus was found, check for dbus-glib-1
+if test "x$DBUS_SUPPORT" = "xyes"; then
+	PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1], [DBUS_GLIB="yes"], [DBUS_GLIB="no"])
+	if test "x$DBUS_GLIB" = "xyes"; then
+		AC_DEFINE(DBUS_GLIB, 1, [dbus-glib available])
+		AC_SUBST(DBUS_GLIB_CFLAGS)
+		AC_SUBST(DBUS_GLIB_LIBS)
+	fi
+else
+	echo "dbus-glib wasn't found - won't check for NetworkManager!"
+	echo "Plugins depending on dbus-glib-1 / NetworkManager will be disabled!"
+	DBUS_GLIB="no"
+fi
 
+dnl Now check for NetworkManager after the dependencies were found ( or not )
+dnl Only CFLAGS are necessary, so we can include NetworkManager.h
+dnl Fixme : NM_SUPPORT_PACKAGES is used for EVO_SET_COMPILE_FLAGS below -
+dnl 		changing this requires AutoMake File changes or iffing
+
+if test "x$DBUS_GLIB" = "xyes"; then
+	PKG_CHECK_MODULES([NM], [NetworkManager], [NM_SUPPORT="yes"], [NM_SUPPORT="no"])
+	if test "x$NM_SUPPORT" = "xyes"; then
+		AC_DEFINE(NM_SUPPORT, 1, [network manager available])
+		AC_SUBST(NM_CFLAGS)
+		AM_CONDITIONAL(NM_SUPPORT, true)
+		NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1"
+	fi
+else
+	echo "NetworkManager wasn't found!"
+	echo "Plugins depending on NetworkManager will be disabled!"
+	NM_SUPPORT="no"
+	AM_CONDITIONAL(NM_SUPPORT, false)
+	NM_SUPPORT_PACKAGES=""
+fi
 
+dnl --- evolution (shell) flags
 EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE $NM_SUPPORT_PACKAGES)
 
 AC_SUBST(SHELL_CFLAGS)
@@ -1842,29 +1880,6 @@ then
 	fi
 fi
 
-if ${PKG_CONFIG} --exists dbus-glib-1 ; then
-	dnl **************************************************
-	dnl * Mail Notification plugin's DBus messages
-	dnl **************************************************
-	PKG_CHECK_MODULES([NMN], [dbus-glib-1])
-	AC_SUBST(NMN_CFLAGS)
-	AC_SUBST(NMN_LIBS)
-
-	# Get the version of the DBus API, so we can hack around API changes until the API stabilises:
-	# multiply by 1000 to convert decimal to integer; so e.g. 0.31 become 310
-	# since preprocessor values must be integral
-	FOUND_DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
-	AC_SUBST(FOUND_DBUS_VERSION)
-	AC_DEFINE(HAVE_DBUS,1,[Define if you have DBUS support])
-	AC_SUBST(HAVE_DBUS)
-	AM_CONDITIONAL(ENABLE_DBUS, true)
-
-else
-	echo "warning: dbus-glib-1 was not found, Mail notification plugins's dbus message support not built"
-	AM_CONDITIONAL(ENABLE_DBUS, false)
-
-fi
-
 if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
 	PKG_CHECK_MODULES([LIBEXCHANGESTORAGE], [libexchange-storage-$EDS_PACKAGE >= eds_minimum_version], [have_libexchange="yes"], [have_libexchange="no"])
 	if test "x$have_libexchange" = "xyes"; then
@@ -2112,21 +2127,20 @@ echo "
 fi
 
 echo "
-	LDAP support:        $msg_ldap
-	HAL:		     $HAVE_HAL"
-if test "$msg_nntp" = "yes"; then
-echo "\
-	NNTP support:        $msg_nntp"
-fi
-echo "\
-	Pilot conduits:      $msg_pilot
-	Libnotify:	     $HAVE_LIBNOTIFY
-	Kerberos 4/5:        $msg_krb4/$msg_krb5
-	SSL support:         $msg_ssl
-	SMIME support:       $msg_smime
-	Plugins:	     $msg_plugins
-	DBus API version:    $FOUND_DBUS_VERSION
-	User documentation:  $with_help
-	Mono bindings:       $enable_mono
-	Python bindings:     $enable_python
+	LDAP support:       $msg_ldap
+	HAL:                $HAVE_HAL
+	DBUS:               $DBUS_SUPPORT
+	DBUS-glib:          $DBUS_GLIB
+	NetworkManager:     $NM_SUPPORT
+	NNTP support:       $msg_nntp
+	Pilot conduits:     $msg_pilot
+	Libnotify:          $HAVE_LIBNOTIFY
+	Kerberos 4/5:       $msg_krb4/$msg_krb5
+	SSL support:        $msg_ssl
+	SMIME support:      $msg_smime
+	Plugins:            $msg_plugins
+	DBus API version:   $FOUND_DBUS_VERSION
+	User documentation: $with_help
+	Mono bindings:      $enable_mono
+	Python bindings:    $enable_python
 "