--- evolution-2.8.0/mail/mail-config.c.orig	2006-06-01 07:29:48 +0400
+++ evolution-2.8.0/mail/mail-config.c	2006-09-05 09:52:45 +0400
@@ -255,7 +255,7 @@
 }
 
 #define CONFIG_GET_SPELL_VALUE(t,x,prop,f,c) G_STMT_START { \
-        val = gconf_client_get_without_default (config->gconf, "/GNOME/Spell" x, NULL); \
+        val = gconf_client_get_without_default (config->gconf, "/desktop/gnome/spell" x, NULL); \
         if (val) { f; prop = c (gconf_value_get_ ## t (val)); \
         gconf_value_free (val); } } G_STMT_END
 
@@ -385,7 +385,7 @@
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	gconf_client_add_dir (config->gconf, "/apps/evolution/mail/display/fonts",
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	gconf_client_add_dir (config->gconf, "/GNOME/Spell",
+	gconf_client_add_dir (config->gconf, "/desktop/gnome/spell",
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	config->font_notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/fonts",
 							  gconf_style_changed, NULL, NULL, NULL);
@@ -397,7 +397,7 @@
 							  gconf_mlimit_changed, NULL, NULL, NULL);		
 	config->mlimit_size_notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/message_text_part_limit",
 							  gconf_mlimit_size_changed, NULL, NULL, NULL);	
-	config->spell_notify_id = gconf_client_notify_add (config->gconf, "/GNOME/Spell",
+	config->spell_notify_id = gconf_client_notify_add (config->gconf, "/desktop/gnome/spell",
 							   gconf_style_changed, NULL, NULL, NULL);
 	config->mark_citations__notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/mark_citations",
 								     gconf_style_changed, NULL, NULL, NULL);
--- evolution-2.8.0/mail/em-composer-prefs.c.orig	2006-07-22 15:14:53 +0400
+++ evolution-2.8.0/mail/em-composer-prefs.c	2006-09-05 09:49:55 +0400
@@ -534,7 +534,7 @@
 
 #include "Spell.h"
 
-#define GNOME_SPELL_GCONF_DIR "/GNOME/Spell"
+#define GNOME_SPELL_GCONF_DIR "/desktop/gnome/spell"
 #define SPELL_API_VERSION "0.3"
 
 static void