Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(revision 34714)
+++ po/POTFILES.in	(working copy)
@@ -373,8 +373,6 @@
 plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
 plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
 plugins/mono/org-gnome-evolution-mono.eplug.xml
-plugins/new-mail-notify/new-mail-notify.c
-plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
 plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
 plugins/plugin-manager/org-gnome-plugin-manager.xml
 plugins/plugin-manager/plugin-manager.c
Index: plugins/mail-notification/mail-notification.c
===================================================================
--- plugins/mail-notification/mail-notification.c	(revision 34714)
+++ plugins/mail-notification/mail-notification.c	(working copy)
@@ -29,8 +29,12 @@
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <libgnome/libgnome.h>
+
+#ifdef HAVE_DBUS
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
+#endif
+
 #include <time.h>
 
 #include "e-util/e-config.h"
@@ -111,6 +115,8 @@
 /*                           DBUS part                                  */
 /* -------------------------------------------------------------------  */
 
+#ifdef HAVE_DBUS
+
 #define DBUS_PATH		"/org/gnome/evolution/mail/newmail"
 #define DBUS_INTERFACE		"org.gnome.evolution.mail.dbus.Signal"
 
@@ -254,6 +260,8 @@
 	return w;
 }
 
+#endif
+
 /* -------------------------------------------------------------------  */
 /*                     Notification area part                           */
 /* -------------------------------------------------------------------  */
@@ -705,9 +713,10 @@
 
 	g_static_mutex_lock (&mlock);
 
+#ifdef HAVE_DBUS	
 	if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
 		new_notify_dbus (t);
-
+#endif
 	if (is_part_enabled (GCONF_KEY_ENABLED_STATUS))
 		new_notify_status (t);
 
@@ -727,9 +736,10 @@
 
 	g_static_mutex_lock (&mlock);
 
+#ifdef HAVE_DBUS
 	if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
 		read_notify_dbus (t);
-
+#endif
 	if (is_part_enabled (GCONF_KEY_ENABLED_STATUS))
 		read_notify_status (t);
 
@@ -743,9 +753,10 @@
 e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
 	if (enable) {
+#ifdef HAVE_DBUS		
 		if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
 			enable_dbus (enable);
-
+#endif
 		if (is_part_enabled (GCONF_KEY_ENABLED_STATUS))
 			enable_status (enable);
 
@@ -754,7 +765,9 @@
 
 		enabled = TRUE;
 	} else {
+#ifdef HAVE_DBUS
 		enable_dbus (enable);
+#endif 
 		enable_status (enable);
 		enable_sound (enable);
 
@@ -777,10 +790,11 @@
 	gtk_widget_show (check);
 	gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
 
+#ifdef HAVE_DBUS	
 	cfg = get_config_widget_dbus ();
 	if (cfg)
 		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
-
+#endif 
 	cfg = get_config_widget_status ();
 	if (cfg)
 		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
Index: plugins/mail-notification/Makefile.am
===================================================================
--- plugins/mail-notification/Makefile.am	(revision 34714)
+++ plugins/mail-notification/Makefile.am	(working copy)
@@ -1,11 +1,14 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
-	-DDBUS_API_SUBJECT_TO_CHANGE=1		\
-	-DDBUS_VERSION=$(DBUS_VERSION)          \
 	$(EVOLUTION_MAIL_CFLAGS)		\
-	$(LIBNOTIFY_CFLAGS)			\
-	$(NMN_CFLAGS)
+	$(LIBNOTIFY_CFLAGS)			
 
+if ENABLE_DBUS
+INCLUDES += 	-DDBUS_API_SUBJECT_TO_CHANGE=1		\
+		-DDBUS_VERSION=$(DBUS_VERSION)          \
+		$(NMN_CFLAGS)
+endif
+
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-mail-notification.eplug
@@ -14,9 +17,12 @@
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 liborg_gnome_mail_notification_la_LDFLAGS = 	\
 	-module -avoid-version			\
-	$(LIBNOTIFY_LIBS)			\
-	$(NMN_LIBS)
+	$(LIBNOTIFY_LIBS)			
 
+if ENABLE_DBUS
+liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS)
+endif 
+
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-mail-notification.schemas.in
 schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
Index: configure.in
===================================================================
--- configure.in	(revision 34727)
+++ configure.in	(working copy)
@@ -1686,11 +1686,11 @@
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
 all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
 
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face" 
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore" 
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
-plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting save-attachments external-editor"
+plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor"
 plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
 all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
 
@@ -1756,24 +1756,27 @@
 	fi
 fi
 
-if echo ${plugins_enabled} | grep "new-mail-notify" > /dev/null ; then
-	if ${PKG_CONFIG} --exists dbus-glib-1 ; then
-		dnl **************************************************
-		dnl * New Mail Notify plugin
-		dnl **************************************************
-		PKG_CHECK_MODULES(NMN, dbus-glib-1)
-		AC_SUBST(NMN_CFLAGS)
-		AC_SUBST(NMN_LIBS)
+if ${PKG_CONFIG} --exists dbus-glib-1 ; then
+	dnl **************************************************
+	dnl * New Mail Notify plugin
+	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
-		DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
-		AC_SUBST(DBUS_VERSION)
-	else
-		plugins_enabled=`echo $plugins_enabled | sed -e "s/new-mail-notify//g"`
-		echo "warning: dbus-glib-1 was not found, new-mail-notify plugin will not be built."
-	fi
+	# 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
+	DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
+	AC_SUBST(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, new-mail-notify plugin will not be built."
+	AM_CONDITIONAL(ENABLE_DBUS, false)
+
 fi
 
 if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
