diff --git a/configure.in b/configure.in
index 3793b08..18b0188 100644
--- a/configure.in
+++ b/configure.in
@@ -1631,7 +1631,7 @@ fi
 
 dnl --- evolution-mail flags
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libcanberra-gtk)
 AC_SUBST(EVOLUTION_MAIL_CFLAGS)
 AC_SUBST(EVOLUTION_MAIL_LIBS)
 
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 5bb65ce..de1ca92 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -29,7 +29,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
-#include <libgnome/gnome-sound.h>
+#include <canberra-gtk.h>
 
 #ifdef HAVE_DBUS
 #include <dbus/dbus-glib.h>
@@ -54,6 +54,7 @@
 #define GCONF_KEY_ENABLED_STATUS 	GCONF_KEY_ROOT "status-enabled"
 #define GCONF_KEY_ENABLED_SOUND	 	GCONF_KEY_ROOT "sound-enabled"
 
+static ca_context *mailnotification = NULL;
 static gboolean enabled = FALSE;
 static GtkWidget *get_cfg_widget (void);
 static GStaticMutex mlock = G_STATIC_MUTEX_INIT;
@@ -605,7 +606,9 @@ do_play_sound (gboolean beep, const gchar *file)
 	else if (!file || !*file)
 		g_warning ("No file to play!");
 	else
-		gnome_sound_play (file);
+		ca_context_play(mailnotification, 0,
+				CA_PROP_MEDIA_FILENAME, file,
+				NULL);
 }
 
 struct _SoundConfigureWidgets
@@ -733,9 +736,14 @@ static void
 enable_sound (int enable)
 {
 	if (enable)
-		gnome_sound_init ("localhost");
+	{
+		ca_context_create(&mailnotification);
+		ca_context_change_props(mailnotification,
+	                        CA_PROP_APPLICATION_NAME, "mailnotification Plugin",
+			        NULL);
+	}
 	else
-		gnome_sound_shutdown ();
+		ca_context_destroy(&mailnotification); 
 }
 
 static GtkWidget *
