Remove the last remaining usage of GConf

9 files changed, 21 insertions, 2163 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index 7fa3dbab9c..cd02ad6fdf 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -274,7 +274,6 @@ EXTRA_DIST = 				\
 	README.async			\
 	mail.error.xml			\
 	$(ui_DATA)			\
-	$(schema_in_files)		\
 	$(server_in_files)		\
 	$(etspec_DATA)			\
 	filtertypes.xml			\
@@ -295,38 +294,6 @@ evolution-mail.pure: evolution-mail
 
 endif
 
-
-# GConf
-
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = evolution-mail.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-
-endif
-
 # Prologue
 
 dist-hook:
@@ -336,6 +303,4 @@ BUILT_SOURCES = $(error_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
-DISTCLEANFILES = $(schema_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index eda9d6cbc3..5b89154885 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -45,8 +45,6 @@
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_BROWSER, EMailBrowserPrivate))
 
-#define MAIL_BROWSER_GCONF_PREFIX "/apps/evolution/mail/mail_browser"
-
 #define ACTION_GROUP_STANDARD		"action-group-standard"
 #define ACTION_GROUP_SEARCH_FOLDERS	"action-group-search-folders"
 
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 8f913bb7c8..857523f146 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -42,8 +42,6 @@
 
 #include <gtk/gtk.h>
 
-#include <gconf/gconf-client.h>
-
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
@@ -271,152 +269,6 @@ emm_setup_initial (const gchar *data_dir)
 }
 
 static gboolean
-is_in_plugs_list (GSList *list,
-                  const gchar *value)
-{
-	GSList *l;
-
-	for (l = list; l; l = l->next) {
-		if (l->data && !strcmp (l->data, value))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-/*
- * em_update_message_notify_settings_2_21
- * DBus plugin and sound email notification was merged to
- * mail-notification plugin, so move the options to new locations.
- */
-static void
-em_update_message_notify_settings_2_21 (void)
-{
-	GConfClient *client;
-	GConfValue  *is_key;
-	gboolean dbus, status;
-	GSList *list;
-	gchar *str;
-	gint val;
-
-	client = gconf_client_get_default ();
-
-	is_key = gconf_client_get (
-		client,
-		"/apps/evolution/eplugin/mail-notification/dbus-enabled", NULL);
-	if (is_key) {
-		/* already migrated, so do not migrate again */
-		gconf_value_free (is_key);
-		g_object_unref (client);
-
-		return;
-	}
-
-	gconf_client_set_bool (
-		client,
-		"/apps/evolution/eplugin/mail-notification/status-blink-icon",
-		gconf_client_get_bool (
-			client,
-			"/apps/evolution/mail/notification/blink-status-icon",
-			NULL), NULL);
-	gconf_client_set_bool (
-		client,
-		"/apps/evolution/eplugin/mail-notification/status-notification",
-		gconf_client_get_bool (
-			client,
-			"/apps/evolution/mail/notification/notification",
-			NULL), NULL);
-
-	list = gconf_client_get_list (
-		client, "/apps/evolution/eplugin/disabled",
-		GCONF_VALUE_STRING, NULL);
-	dbus = !is_in_plugs_list (list, "org.gnome.evolution.new_mail_notify");
-	status = !is_in_plugs_list (
-		list, "org.gnome.evolution.mail_notification");
-
-	gconf_client_set_bool (
-		client,
-		"/apps/evolution/eplugin/mail-notification/dbus-enabled",
-		dbus, NULL);
-	gconf_client_set_bool (
-		client,
-		"/apps/evolution/eplugin/mail-notification/status-enabled",
-		status, NULL);
-
-	if (!status) {
-		GSList *plugins, *l;
-
-		plugins = e_plugin_list_plugins ();
-
-		for (l = plugins; l; l = l->next) {
-			EPlugin *p = l->data;
-
-			if (p && p->id && !strcmp (p->id,
-				"org.gnome.evolution.mail_notification")) {
-				e_plugin_enable (p, 1);
-				break;
-			}
-		}
-
-		g_slist_foreach (plugins, (GFunc) g_object_unref, NULL);
-		g_slist_free (plugins);
-	}
-
-	g_slist_foreach (list, (GFunc) g_free, NULL);
-	g_slist_free (list);
-
-	val = gconf_client_get_int (
-		client, "/apps/evolution/mail/notify/type", NULL);
-	gconf_client_set_bool (
-		client,
-		"/apps/evolution/eplugin/mail-notification/sound-enabled",
-		val == 1 || val == 2, NULL);
-	gconf_client_set_bool (
-		client,
-		"/apps/evolution/eplugin/mail-notification/sound-beep",
-		val == 0 || val == 1, NULL);
-
-	str = gconf_client_get_string (
-		client, "/apps/evolution/mail/notify/sound", NULL);
-	gconf_client_set_string (
-		client,
-		"/apps/evolution/eplugin/mail-notification/sound-file",
-		str ? str : "", NULL);
-	g_free (str);
-
-	g_object_unref (client);
-}
-
-/* fixing typo in SpamAssassin name */
-static void
-em_update_sa_junk_setting_2_23 (void)
-{
-	GConfClient *client;
-	GConfValue  *key;
-
-	client = gconf_client_get_default ();
-
-	key = gconf_client_get (
-		client, "/apps/evolution/mail/junk/default_plugin", NULL);
-	if (key) {
-		const gchar *str = gconf_value_get_string (key);
-
-		if (str && strcmp (str, "Spamassasin") == 0)
-			gconf_client_set_string (
-				client,
-				"/apps/evolution/mail/junk/default_plugin",
-				"SpamAssassin", NULL);
-
-		gconf_value_free (key);
-		g_object_unref (client);
-
-		return;
-	}
-
-	g_object_unref (client);
-}
-
-static gboolean
 mbox_to_maildir_migration_needed (EShellBackend *shell_backend)
 {
 	gchar *local_store;
@@ -694,66 +546,6 @@ migrate_local_store (EShellBackend *shell_backend)
 }
 
 static void
-em_ensure_proxy_ignore_hosts_being_list (void)
-{
-	const gchar *key = "/apps/evolution/shell/network_config/ignore_hosts";
-	GConfClient *client;
-	GConfValue  *key_value;
-
-	/* Makes sure the 'key' is a list of strings, not a string,
-	 * as set by previous versions. */
-
-	client = gconf_client_get_default ();
-	key_value = gconf_client_get (client, key, NULL);
-	if (key_value && key_value->type == GCONF_VALUE_STRING) {
-		gchar *value = gconf_client_get_string (client, key, NULL);
-		GSList *lst = NULL;
-		GError *error = NULL;
-
-		if (value && *value) {
-			gchar **split = g_strsplit (value, ",", -1);
-
-			if (split) {
-				gint ii;
-
-				for (ii = 0; split[ii]; ii++) {
-					const gchar *tmp = split[ii];
-
-					if (tmp && *tmp) {
-						gchar *val = g_strstrip (g_strdup (tmp));
-
-						if (val && *val)
-							lst = g_slist_append (lst, val);
-						else
-							g_free (val);
-					}
-				}
-			}
-
-			g_strfreev (split);
-		}
-
-		gconf_client_unset (client, key, NULL);
-		gconf_client_set_list (client, key, GCONF_VALUE_STRING, lst, &error);
-
-		g_slist_foreach (lst, (GFunc) g_free, NULL);
-		g_slist_free (lst);
-		g_free (value);
-
-		if (error) {
-			fprintf (
-				stderr, "%s: Failed to set a list values "
-				"with error: %s\n", G_STRFUNC, error->message);
-			g_error_free (error);
-		}
-	}
-
-	if (key_value)
-		gconf_value_free (key_value);
-	g_object_unref (client);
-}
-
-static void
 em_rename_view_in_folder (gpointer data,
                           gpointer user_data)
 {
@@ -860,23 +652,6 @@ e_mail_migrate (EShellBackend *shell_backend,
 	if (major == 0)
 		return emm_setup_initial (data_dir);
 
-#ifndef G_OS_WIN32
-	if (major < 2 || (major == 2 && minor < 22))
-		em_update_message_notify_settings_2_21 ();
-
-	if (major < 2 || (major == 2 && minor < 24))
-		em_update_sa_junk_setting_2_23 ();
-#else
-	if (major < 2 || (major == 2 && minor < 24))
-		g_warning (
-			"Upgrading from ancient versions %d.%d "
-			"not supported on Windows", major, minor);
-#endif
-
-	if (major < 2 || (major == 2 && minor < 32)) {
-		em_ensure_proxy_ignore_hosts_being_list ();
-	}
-
 	if (!migrate_local_store (shell_backend))
 		return FALSE;
 
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index d1c3d3d7e5..2030350d1b 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -30,7 +30,6 @@
 #include <glib/gi18n.h>
 #include <libxml/tree.h>
 #include <gtkhtml/gtkhtml.h>
-#include <gconf/gconf-client.h>
 #include <camel/camel.h>
 
 #include "libevolution-utils/e-alert-dialog.h"
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 9be80fbf79..f4b9891f4f 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -975,7 +975,7 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
 	gchar *tmpdir;
 	gchar *uri;
 	gint fd;
-	GConfClient *client;
+	GSettings *settings;
 	gchar *exporttype;
 	gint exportname;
 
@@ -983,20 +983,21 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
 	if (tmpdir == NULL)
 		return;
 
-	client = gconf_client_get_default ();
-	exporttype = gconf_client_get_string (
-		client, "/apps/evolution/mail/save_file_format", NULL);
-	if (exporttype == NULL)
+	settings = g_settings_new ("org.gnome.evolution.mail");
+	exporttype = g_settings_get_string (settings, "drag-and-drop-save-file-format");
+	if (g_strcmp0 (exporttype, "mbox") != 0 && g_strcmp0 (exporttype, "pdf") != 0) {
+		g_free (exporttype);
 		exporttype = g_strdup ("mbox");
-	exportname = gconf_client_get_int (
-		client, "/apps/evolution/mail/save_name_format", NULL);
+	}
+	exportname = g_settings_get_int (settings, "drag-and-drop-save-name-format");
+	g_object_unref (settings);
 
-	if (g_ascii_strcasecmp (exporttype, "mbox")==0) {
+	if (g_ascii_strcasecmp (exporttype, "mbox") == 0) {
 		gchar * file = NULL;
 		CamelStream *fstream;
 
 		if (uids->len > 1) {
-			gchar * tmp = g_strdup_printf(_("Messages from %s"), camel_folder_get_display_name (folder));
+			gchar * tmp = g_strdup_printf (_("Messages from %s"), camel_folder_get_display_name (folder));
 			e_filename_make_safe (tmp);
 			file = g_build_filename (tmpdir, tmp, NULL);
 			g_free (tmp);
@@ -1004,11 +1005,11 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
 			file = em_utils_build_export_filename (folder, uids->pdata[0], exporttype, exportname, tmpdir);
 		}
 
-		g_free (tmpdir);
 		fd = g_open (file, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0666);
 		if (fd == -1) {
 			g_free (file);
 			g_free (exporttype);
+			g_free (tmpdir);
 			return;
 		}
 
@@ -1029,9 +1030,10 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
 			close (fd);
 
 		g_free (exporttype);
+		g_free (tmpdir);
 		g_free (file);
 		g_free (uri);
-	} else if(g_ascii_strcasecmp (exporttype, "pdf")==0) {
+	} else if (g_ascii_strcasecmp (exporttype, "pdf") == 0) {
 		gchar ** filenames, **uris;
 		gint i, uris_count = 0;
 
@@ -1066,7 +1068,6 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
 		uris[uris_count] = NULL;
 		gtk_selection_data_set_uris (data, uris);
 
-		g_free (tmpdir);
 		for (i = 0; i < uids->len; i++) {
 			g_free (filenames[i]);
 		}
@@ -1076,10 +1077,10 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
 		}
 		g_free (uris);
 		g_free (exporttype);
-
-	} else {
 		g_free (tmpdir);
+	} else {
 		g_free (exporttype);
+		g_free (tmpdir);
 	}
 }
 
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
deleted file mode 100644
index 0e3eef3061..0000000000
--- a/mail/evolution-mail.schemas.in
+++ /dev/null
@@ -1,1828 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <!-- Composer settings -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/charset</key>
-      <applyto>/apps/evolution/mail/composer/charset</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Default charset in which to compose messages</short>
-         <long>
-          Default charset in which to compose messages.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/inline_spelling</key>
-      <applyto>/apps/evolution/mail/composer/inline_spelling</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Spell check inline</short>
-         <long>
-         Draw spelling error indicators on words as you type.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/magic_links</key>
-      <applyto>/apps/evolution/mail/composer/magic_links</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Automatic link recognition</short>
-         <long>
-         Recognize links in text and replace them.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/magic_smileys</key>
-      <applyto>/apps/evolution/mail/composer/magic_smileys</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Automatic emoticon recognition</short>
-         <long>
-         Recognize emoticons in text and replace them with images.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/group_reply_to_list</key>
-      <applyto>/apps/evolution/mail/composer/group_reply_to_list</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Group Reply replies to list</short>
-         <long>
-           Instead of the normal "Reply to All" behaviour, this option will
-	   make the 'Group Reply' toolbar button try to reply only to the
-	   mailing list through which you happened to receive the copy of
-	   the message to which you're replying.
-	 </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/sign_reply_if_signed</key>
-      <applyto>/apps/evolution/mail/composer/sign_reply_if_signed</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Digitally sign messages when original message signed (PGP or S/MIME)</short>
-         <long>
-           Automatically enable PGP or S/MIME signatures when replying
-	   to a message which is also PGP or S/MIME signed.
-	 </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/reply_start_bottom</key>
-      <applyto>/apps/evolution/mail/composer/reply_start_bottom</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Put the cursor at the bottom of replies</short>
-        <long>Users get all up in arms over where the cursor should go when
-        replying to a message. This determines whether the cursor is placed
-        at the top of the message or the bottom.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/request_receipt</key>
-      <applyto>/apps/evolution/mail/composer/request_receipt</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Always request read receipt</short>
-         <long>
-         Whether a read receipt request gets added to every message by default.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/send_html</key>
-      <applyto>/apps/evolution/mail/composer/send_html</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Send HTML mail by default</short>
-         <long>
-          Send HTML mail by default.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/spell_color</key>
-      <applyto>/apps/evolution/mail/composer/spell_color</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default>#FFFF00000000</default>
-      <locale name="C">
-        <short>Spell checking color</short>
-        <long>
-          Underline color for misspelled words when using inline spelling.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/spell_languages</key>
-      <applyto>/apps/evolution/mail/composer/spell_languages</applyto>
-      <owner>evolution-mail</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Spell checking languages</short>
-        <long>
-          List of dictionary language codes used for spell checking.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/show_mail_bcc</key>
-      <applyto>/apps/evolution/mail/composer/show_mail_bcc</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Show "Bcc" field when sending a mail message</short>
-         <long>
-           Show the "Bcc" field when sending a mail message.  This is
-           controlled from the View menu when a mail account is chosen.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/show_mail_cc</key>
-      <applyto>/apps/evolution/mail/composer/show_mail_cc</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show "Cc" field when sending a mail message</short>
-         <long>
-           Show the "Cc" field when sending a mail message.  This is
-           controlled from the View menu when a mail account is chosen.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/show_mail_reply_to</key>
-      <applyto>/apps/evolution/mail/composer/show_mail_reply_to</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Show "Reply To" field when sending a mail message</short>
-         <long>
-           Show the "Reply To" field when sending a mail message.  This
-           is controlled from the View menu when a mail account is chosen.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/show_post_from</key>
-      <applyto>/apps/evolution/mail/composer/show_post_from</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show "From" field when posting to a newsgroup</short>
-         <long>
-           Show the "From" field when posting to a newsgroup.  This is
-           controlled from the View menu when a news account is chosen.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/show_post_reply_to</key>
-      <applyto>/apps/evolution/mail/composer/show_post_reply_to</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Show "Reply To" field when posting to a newsgroup</short>
-         <long>
-           Show the "Reply To" field when posting to a newsgroup.  This
-           is controlled from the View menu when a news account is chosen.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/outlook_filenames</key>
-      <applyto>/apps/evolution/mail/composer/outlook_filenames</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Encode filenames in an Outlook/GMail way</short>
-         <long>
-          Encode filenames in the mail headers same as Outlook or GMail do, to let them display correctly filenames with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/top_signature</key>
-      <applyto>/apps/evolution/mail/composer/top_signature</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Put personalized signatures at the top of replies</short>
-        <long>Users get all up in arms over where their signature should go
-        when replying to a message. This determines whether the signature is
-        placed at the top of the message or the bottom.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/no_signature_delim</key>
-      <applyto>/apps/evolution/mail/composer/no_signature_delim</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Do not add signature delimiter</short>
-        <long>Set to TRUE in case you do not want to add signature delimiter
-	before your signature when composing a mail.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/width</key>
-      <applyto>/apps/evolution/mail/composer/width</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>600</default>
-      <locale name="C">
-         <short>Composer Window default width</short>
-         <long>Default width of the Composer Window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/height</key>
-      <applyto>/apps/evolution/mail/composer/height</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>500</default>
-      <locale name="C">
-         <short>Composer Window default height</short>
-         <long>Default height of the Composer Window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/ignore_list_reply_to</key>
-      <applyto>/apps/evolution/mail/composer/ignore_list_reply_to</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Ignore list Reply-To:</short>
-         <long>
-	   Some mailing lists set a Reply-To: header to trick users into
-	   sending replies to the list, even when they ask Evolution to
-	   make a private reply. Setting this option to TRUE will attempt
-	   to ignore such Reply-To: headers, so that Evolution will do
-	   as you ask it. If you use the private reply action, it will
-	   reply privately, while if you use the 'Reply to List' action
-	   it will do that. It works by comparing the Reply-To: header
-	   with a List-Post: header, if there is one.
-	 </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/message_attribution</key>
-      <applyto>/apps/evolution/mail/composer/message_attribution</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Attribute message.</short>
-         <long>The text that is inserted when replying to a message,
-	 attributing the message to the original author.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/message_forward</key>
-      <applyto>/apps/evolution/mail/composer/message_forward</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Forward message.</short>
-         <long>The text that is inserted when forwarding a message,
-	 saying that the forwarded message follows.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/message_original</key>
-      <applyto>/apps/evolution/mail/composer/message_original</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Original message.</short>
-         <long>The text that is inserted when replying to a message (top
-	 posting), saying that the original message follows.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/gallery_path</key>
-      <applyto>/apps/evolution/mail/composer/gallery_path</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Path where picture gallery should search for its content</short>
-         <long>This value can be an empty string, which means it'll use
-	 the system Picture folder, usually set to ~/Pictures. This folder will
-	 be also used when the set path is not pointing to the existent folder.</long>
-      </locale>
-    </schema>
-
-    <!-- Display Settings -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/animated_images</key>
-      <applyto>/apps/evolution/mail/display/animated_images</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show image animations</short>
-        <long>Enable animated images in HTML mail. Many users find animated
-        images annoying and prefer to see a static image instead.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/side_bar_search</key>
-      <applyto>/apps/evolution/mail/display/side_bar_search</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Enable or disable type ahead search feature</short>
-         <long>
-          Enable the side bar search feature to allow interactive searching of folder names.
-       </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/no_folder_dots</key>
-      <applyto>/apps/evolution/mail/display/no_folder_dots</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Disable or enable ellipsizing of folder names in side bar</short>
-         <long>
-           Whether disable ellipsizing feature of folder names in side bar.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/magic_spacebar</key>
-      <applyto>/apps/evolution/mail/display/magic_spacebar</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Enable or disable magic space bar</short>
-         <long> Enable this to use Space bar key to scroll in message preview, message list and folders.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/global_view_setting</key>
-      <applyto>/apps/evolution/mail/display/global_view_setting</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Enable to use a similar message list view settings for all folders</short>
-         <long> Enable to use a similar message list view settings for all folders.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/mark_citations</key>
-      <applyto>/apps/evolution/mail/display/mark_citations</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Mark citations in the message "Preview"</short>
-         <long>
-          Mark citations in the message "Preview".
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/citation_colour</key>
-      <applyto>/apps/evolution/mail/display/citation_colour</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default>#737373</default>
-      <locale name="C">
-         <short>Citation highlight color</short>
-         <long>
-          Citation highlight color.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/caret_mode</key>
-      <applyto>/apps/evolution/mail/display/caret_mode</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Enable/disable caret mode</short>
-         <long>
-          Enable caret mode, so that you can see a cursor when reading mail.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/charset</key>
-      <applyto>/apps/evolution/mail/display/charset</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Default charset in which to display messages</short>
-         <long>
-          Default charset in which to display messages.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/load_http_images</key>
-      <applyto>/apps/evolution/mail/display/load_http_images</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Load images for HTML messages over HTTP</short>
-         <long>
-          Load images for HTML messages over HTTP(S). Possible values are:
-          "0" - Never load images off the net.
-          "1" - Load images in messages from contacts.
-          "2" - Always load images off the net.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/animate_images</key>
-      <applyto>/apps/evolution/mail/display/animate_images</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show Animations</short>
-         <long>
-          Show animated images as animations.
-         </long>
-      </locale>
-    </schema>   
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/show_all_headers</key>
-      <applyto>/apps/evolution/mail/display/show_all_headers</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show all message headers</short>
-        <long>
-          Show all the headers when viewing a messages.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/headers</key>
-      <applyto>/apps/evolution/mail/display/headers</applyto>
-      <owner>evolution-mail</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-         <short>List of custom headers and whether they are enabled.</short>
-         <long>
-           This key should contain a list of XML structures specifying custom headers, 
-           and whether they are to be displayed. The format of the XML structure is 
-           &lt;header enabled&gt; - set enabled if the header is to be displayed 
-           in the mail view.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/sender_photo</key>
-      <applyto>/apps/evolution/mail/display/sender_photo</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Show photo of the sender</short>
-         <long>
-          Show the photo of the sender in the message reading pane.
-         </long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/photo_local</key>
-      <applyto>/apps/evolution/mail/display/photo_local</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Search for the sender photo in local address books </short>
-         <long>
-          This option would help in improving the speed of fetching.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/mime_types</key>
-      <applyto>/apps/evolution/mail/display/mime_types</applyto>
-      <owner>evolution-mail</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-         <short>List of MIME types to check for Bonobo component viewers</short>
-         <long>
-           If there isn't a builtin viewer for a particular MIME type inside Evolution,
-           any MIME types appearing in this list which map to a Bonobo component viewer
-           in GNOME's MIME type database may be used for displaying content.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/mark_seen</key>
-      <applyto>/apps/evolution/mail/display/mark_seen</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Mark as Seen after specified timeout</short>
-         <long>
-          Mark as Seen after specified timeout.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/show_email</key>
-      <applyto>/apps/evolution/mail/display/show_email</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Sender email-address column in the message list</short>
-         <long>
-          Show the email-address of the sender in a separate column in the message list.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/vertical_view_fonts</key>
-      <applyto>/apps/evolution/mail/display/vertical_view_fonts</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view.</short>
-         <long> 
-         Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/mark_seen_timeout</key>
-      <applyto>/apps/evolution/mail/display/mark_seen_timeout</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>1500</default>
-      <locale name="C">
-         <short>Timeout for marking messages as seen</short>
-         <long>
-          Timeout in milliseconds for marking messages as seen.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/show_deleted</key>
-      <applyto>/apps/evolution/mail/display/show_deleted</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Show deleted messages in the message-list</short>
-         <long>
-          Show deleted messages (with a strike-through) in the message-list.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/enable_vfolders</key>
-      <applyto>/apps/evolution/mail/display/enable_vfolders</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Enable search folders</short>
-         <long>
-          Enable search folders on startup.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/enable_local</key>
-      <applyto>/apps/evolution/mail/display/enable_local</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Enable local folders</short>
-         <long>
-          Whether to show local folders (On This Computer) in a folder tree.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/safe_list</key>
-      <applyto>/apps/evolution/mail/display/safe_list</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Hides the per-folder preview and removes the selection</short>
-         <long>
-          This key is read only once and reset to "false" after read. This
-          unselects the mail in the list and removes the preview for that
-          folder.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/paned_size</key>
-      <applyto>/apps/evolution/mail/display/paned_size</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>144</default>
-      <locale name="C">
-         <short>Height of the message-list pane</short>
-         <long>
-          Height of the message-list pane.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/hpaned_size</key>
-      <applyto>/apps/evolution/mail/display/hpaned_size</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>450</default>
-      <locale name="C">
-         <short>Width of the message-list pane</short>
-         <long>
-          Width of the message-list pane.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/layout</key>
-      <applyto>/apps/evolution/mail/display/layout</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Layout style</short>
-        <long>
-          The layout style determines where to place the preview pane
-          in relation to the message list.  "0" (Classic View) places
-          the preview pane below the message list.  "1" (Vertical View)
-          places the preview pane next to the message list.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/fonts/variable</key>
-      <applyto>/apps/evolution/mail/display/fonts/variable</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default>Sans 12</default>
-      <locale name="C">
-         <short>Variable width font</short>
-         <long>
-         The variable width font for mail display.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/fonts/monospace</key>
-      <applyto>/apps/evolution/mail/display/fonts/monospace</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default>Monospace 12</default>
-      <locale name="C">
-         <short>Terminal font</short>
-         <long>
-         The terminal font for mail display.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/fonts/use_custom</key>
-      <applyto>/apps/evolution/mail/display/fonts/use_custom</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Use custom fonts</short>
-         <long>
-         Use custom fonts for displaying mail.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/address_compress</key>
-      <applyto>/apps/evolution/mail/display/address_compress</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Compress display of addresses in TO/CC/BCC</short>
-         <long>
-         Compress display of addresses in TO/CC/BCC to the number 
-         specified in address_count.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/force_message_limit</key>
-      <applyto>/apps/evolution/mail/display/force_message_limit</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Display only message texts not exceeding certain size</short>
-         <long>
-         Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/message_text_part_limit</key>
-      <applyto>/apps/evolution/mail/display/message_text_part_limit</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>4096</default>
-      <locale name="C">
-         <short>Message text limit for display</short>
-         <long>
-         This decides the max size of the message text that will be displayed under
-         Evolution, specified in terms of KB. The default is 4096 (4MB). This value
-         is used only when 'force_message_limit' key is activated.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/address_count</key>
-      <applyto>/apps/evolution/mail/display/address_count</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>5</default>
-      <locale name="C">
-         <short>Number of addresses to display in TO/CC/BCC</short>
-         <long>
-         This sets the number of addresses to show in default message list
-         view, beyond which a '...' is shown.
-         </long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/thread_subject</key>
-      <applyto>/apps/evolution/mail/display/thread_subject</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Thread the message-list based on Subject</short>
-         <long>
-          Whether or not to fall back on threading by subjects when the
-          messages do not contain In-Reply-To or References headers.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/thread_expand</key>
-      <applyto>/apps/evolution/mail/display/thread_expand</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Default value for thread expand state</short>
-         <long>
-          This setting specifies whether the threads should be in expanded
-          or collapsed state by default. Requires a restart to apply.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/thread_latest</key>
-      <applyto>/apps/evolution/mail/display/thread_latest</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Whether sort threads based on latest message in that thread</short>
-         <long>
-          This setting specifies whether the threads should be sorted based
-          on latest message in each thread, rather than by message's date.
-          Evolution requires a restart.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/paned_view_headers_state</key>
-      <applyto>/apps/evolution/mail/display/paned_view_headers_state</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-      	<short>State of message headers in paned view</short>
-      	<long>
-      	   Describes whether message headers in paned view should be collapsed or expanded by default.
-      	   "0" = expanded
-      	   "1" = collapsed
-      	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/sort_accounts_alpha</key>
-      <applyto>/apps/evolution/mail/display/sort_accounts_alpha</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-      	<short>Sort accounts alphabetically in a folder tree</short>
-      	<long>
-      	   Tells how to sort accounts in a folder tree used in a Mail view.
-	   When set to true accounts are sorted alphabetically, with an exception
-	   of On This Computer and Search folders, otherwise accounts are
-	   sorted based on an order given by a user.
-      	</long>
-      </locale>
-    </schema>
-
-    <!-- Mail Browser -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/mail_browser_width</key>
-      <applyto>/apps/evolution/mail/mail_browser_width</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>600</default>
-      <locale name="C">
-         <short>Mail browser width</short>
-         <long>Default width of the mail browser window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/mail_browser_height</key>
-      <applyto>/apps/evolution/mail/mail_browser_height</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-         <short>Mail browser height</short>
-         <long>Default height of the mail browser window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/mail_browser_maximized</key>
-      <applyto>/apps/evolution/mail/mail_browser_maximized</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Mail browser maximized</short>
-        <long>Default maximized state of the mail browser window.</long>
-      </locale>
-    </schema>
-
-    <!-- Subscribe dialog -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/subscription_editor_height</key>
-      <applyto>/apps/evolution/mail/subscription_editor_height</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>"Folder Subscriptions" window height</short>
-        <long>
-          Initial height of the "Folder Subscriptions" window.
-          The value updates as the user resizes the window vertically.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/subscription_editor_maximized</key>
-      <applyto>/apps/evolution/mail/subscription_editor_maximized</applyto>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>"Folder Subscriptions" window maximize state</short>
-        <long>
-          Initial maximize state of the "Folder Subscriptions" window.
-          The value updates when the user maximizes or unmaximizes the
-          window.  Note, this particular value is not used by Evolution
-          since the "Folder Subscriptions" window cannot be maximized.
-          This key exists only as an implementation detail.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/subscription_editor_width</key>
-      <applyto>/apps/evolution/mail/subscription_editor_width</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>600</default>
-      <locale name="C">
-        <short>"Folder Subscriptions" window width</short>
-        <long>
-          Initial width of the "Folder Subscriptions" window.
-          The value updates as the user resizes the window horizontally.
-        </long>
-      </locale>
-    </schema>
-
-    <!-- Filter logging -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/filters/log</key>
-      <applyto>/apps/evolution/mail/filters/log</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Log filter actions</short>
-         <long>
-          Log filter actions to the specified log file.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/filters/logfile</key>
-      <applyto>/apps/evolution/mail/filters/logfile</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Logfile to log filter actions</short>
-         <long>
-          Logfile to log filter actions.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/filters/flush-outbox</key>
-      <applyto>/apps/evolution/mail/filters/flush-outbox</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Flush Outbox after filtering</short>
-         <long>
-          Whether to flush Outbox after filtering is done. Outbox flush will happen
-	  only when there was used any 'Forward to' filter action and approximately
-	  one minute after the last action invocation.
-         </long>
-      </locale>
-    </schema>
-
-    <!-- Format settings -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/format/forward_style</key>
-      <applyto>/apps/evolution/mail/format/forward_style</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Default forward style</short>
-         <long>
-          
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/format/reply_style</key>
-      <applyto>/apps/evolution/mail/format/reply_style</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Default reply style</short>
-         <long>
-          
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/format/message_display_style</key>
-      <applyto>/apps/evolution/mail/format/message_display_style</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Message-display style ("normal", "full headers", "source")</short>
-         <long>
-          
-         </long>
-      </locale>
-    </schema>
-
-    <!-- Prompt settings -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/empty_subject</key>
-      <applyto>/apps/evolution/mail/prompts/empty_subject</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt on empty subject</short>
-         <long>
-          Prompt the user when he or she tries to send a message
-          without a Subject.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/expunge</key>
-      <applyto>/apps/evolution/mail/prompts/expunge</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt when user expunges</short>
-         <long>
-          Prompt the user when he or she tries to expunge a folder.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/only_bcc</key>
-      <applyto>/apps/evolution/mail/prompts/only_bcc</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt when user only fills Bcc</short>
-         <long>
-          Prompt when user tries to send a message with no To or Cc recipients.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/unwanted_html</key>
-      <applyto>/apps/evolution/mail/prompts/unwanted_html</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt when user tries to send unwanted HTML</short>
-         <long>
-          Prompt when user tries to send HTML mail to recipients that
-          may not want to receive HTML mail.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/open_many</key>
-      <applyto>/apps/evolution/mail/prompts/open_many</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt when user tries to open 10 or more messages at once</short>
-         <long>
-          If a user tries to open 10 or more messages at one time, ask the user
-          if they really want to do it.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/mark_all_read</key>
-      <applyto>/apps/evolution/mail/prompts/mark_all_read</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt while marking multiple messages</short>
-         <long>
-        Enable or disable the prompt whilst marking multiple messages.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/delete_in_vfolder</key>
-      <applyto>/apps/evolution/mail/prompts/delete_in_vfolder</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Prompt when deleting messages in search folder</short>
-         <long>
-         It disables/enables the repeated prompts to warn that deleting
-         messages from a search folder permanently deletes the message, not
-         simply removing it from the search results.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/private_list_reply</key>
-      <applyto>/apps/evolution/mail/prompts/private_list_reply</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt when replying privately to list messages</short>
-         <long>
-         It disables/enables the repeated prompts to warn that you are
-	 sending a private reply to a message which arrived via a
-	 mailing list.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/list_reply_to</key>
-      <applyto>/apps/evolution/mail/prompts/list_reply_to</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt when mailing list hijacks private replies</short>
-         <long>It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/reply_many_recips</key>
-      <applyto>/apps/evolution/mail/prompts/reply_many_recips</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt when replying to many recipients</short>
-         <long>
-         It disables/enables the repeated prompts to warn that you are
-	 sending a reply to many people.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/reply_close_browser</key>
-      <applyto>/apps/evolution/mail/prompts/reply_close_browser</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default>ask</default>
-      <locale name="C">
-         <short>Asks whether to close the message window when the user forwards or replies to the message shown in the window</short>
-         <long>
-	 Possible values are:
-	 never - to never close browser window
-	 always - to always close browser window
-	 ask - (or any other value) will ask user
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/send_invalid_recip</key>
-      <applyto>/apps/evolution/mail/prompts/send_invalid_recip</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt before sending to recipients not entered as mail addresses</short>
-         <long>It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses</long>
-      </locale>
-    </schema>
-
-       <!-- Trash settings -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/trash/empty_on_exit</key>
-      <applyto>/apps/evolution/mail/trash/empty_on_exit</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Empty Trash folders on exit</short>
-         <long>
-          Empty all Trash folders when exiting Evolution.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/trash/empty_on_exit_days</key>
-      <applyto>/apps/evolution/mail/trash/empty_on_exit_days</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Minimum days between emptying the trash on exit</short>
-         <long>
-        Minimum time between emptying the trash on exit, in days.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/trash/empty_date</key>
-      <applyto>/apps/evolution/mail/trash/empty_date</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Last time Empty Trash was run</short>
-         <long>
-        The last time Empty Trash was run, in days since January 1st, 1970 (Epoch).
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/error_timeout</key>
-      <applyto>/apps/evolution/mail/display/error_timeout</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>60</default>
-      <locale name="C">
-         <short>Amount of time in seconds the error should be shown on the status bar.</short>
-         <long>
-        Amount of time in seconds the error should be shown on the status bar.
-         </long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/error_level</key>
-      <applyto>/apps/evolution/mail/display/error_level</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Level beyond which the message should be logged.</short>
-         <long>
-           This can have three possible values. "0" for errors.
-           "1" for warnings. "2" for debug messages.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/show_real_date</key>
-      <applyto>/apps/evolution/mail/display/show_real_date</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show original "Date" header value.</short>
-         <long>
-           Show the original "Date" header (with a local time only if the time zone differs).
-	    Otherwise always show "Date" header value in a user preferred format and local time zone.
-         </long>
-      </locale>
-    </schema>
-
-
-    <!-- Labels and Colours -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/labels</key>
-      <applyto>/apps/evolution/mail/labels</applyto>
-      <owner>evolution-mail</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[I_mportant:#EF2929,_Work:#F57900,_Personal:#4E9A06,_To Do:#3465A4,_Later:#75507B]</default>
-      <locale name="C">
-         <short>List of Labels and their associated colors</short>
-         <long>
-           List of labels known to the mail component of
-           Evolution. The list contains strings containing name:color
-           where color uses the HTML hex encoding.
-         </long>
-      </locale>
-    </schema>
-
-    <!-- Junk -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/check_incoming</key>
-      <applyto>/apps/evolution/mail/junk/check_incoming</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Check incoming mail being junk</short>
-         <long>
-          Run junk test on incoming mail.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/empty_on_exit</key>
-      <applyto>/apps/evolution/mail/junk/empty_on_exit</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Empty Junk folders on exit</short>
-         <long>
-          Empty all Junk folders when exiting Evolution.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/empty_on_exit_days</key>
-      <applyto>/apps/evolution/mail/junk/empty_on_exit_days</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Minimum days between emptying the junk on exit</short>
-         <long>
-        Minimum time between emptying the junk on exit, in days.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/empty_date</key>
-      <applyto>/apps/evolution/mail/junk/empty_date</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Last time Empty Junk was run</short>
-         <long>
-        The last time Empty Junk was run, in days since January 1st, 1970 (Epoch).
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/default_plugin</key>
-      <applyto>/apps/evolution/mail/junk/default_plugin</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default>Bogofilter</default>
-      <locale name="C">
-         <short>The default plugin for Junk hook</short>
-         <long>
-          This is the default junk plugin, even though there are multiple plugins
-          enabled. If the default listed plugin is disabled, then it won't fall back
-          to the other available plugins.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/lookup_addressbook</key>
-      <applyto>/apps/evolution/mail/junk/lookup_addressbook</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Determines whether to lookup in address book for sender email</short>
-         <long>
-         Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/lookup_addressbook_local_only</key>
-      <applyto>/apps/evolution/mail/junk/lookup_addressbook_local_only</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Determines whether to look up addresses for junk filtering in local address book only</short>
-         <long>
-         This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/check_custom_header</key>
-      <applyto>/apps/evolution/mail/junk/check_custom_header</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Determines whether to use custom headers to check for junk</short>
-         <long>
-          Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed.
-         </long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/custom_header</key>
-      <applyto>/apps/evolution/mail/junk/custom_header</applyto>
-      <owner>evolution-mail</owner>
-       <type>list</type>
-      <list_type>string</list_type>
-      <default>[X-Spam-Flag=YES,X-Spam-Level=*****]</default>
-      <locale name="C">
-         <short>Custom headers to use while checking for junk.</short>
-         <long>
-         Custom headers to use while checking for junk. The list elements
-         are string in the format "headername=value".
-         </long>
-      </locale>
-    </schema>
-    <!-- Account settings -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/default_account</key>
-      <applyto>/apps/evolution/mail/default_account</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>UID string of the default account.</short>
-         <long>
-           UID string of the default account.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/accounts</key>
-      <applyto>/apps/evolution/mail/accounts</applyto>
-      <owner>evolution-mail</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-         <short>List of accounts</short>
-         <long>
-           List of accounts known to the mail component of
-           Evolution. The list contains strings naming 
-           subdirectories relative to /apps/evolution/mail/accounts.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/licenses</key>
-      <applyto>/apps/evolution/mail/licenses</applyto>
-      <owner>evolution-mail</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-         <short>List of accepted licenses</short>
-         <long>
-           List of protocol names whose license has been accepted.
-         </long>
-      </locale>
-    </schema>
-
-    <!-- save directory settings -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/save_dir</key>
-      <applyto>/apps/evolution/mail/save_dir</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Save directory</short>
-         <long>
-           Directory for saving mail component files.
-         </long>
-      </locale>
-    </schema>
-
-    <!-- Widget States -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/filter_editor_height</key>
-      <applyto>/apps/evolution/mail/filter_editor_height</applyto>
-      <type>int</type>
-      <default>650</default>
-      <locale name="C">
-        <short>"Filter Editor" window height</short>
-        <long>
-          Initial height of the "Filter Editor" window.
-          The value updates as the user resizes the window vertically.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/filter_editor_maximized</key>
-      <applyto>/apps/evolution/mail/filter_editor_maximized</applyto>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>"Filter Editor" window maximize state</short>
-        <long>
-          Initial maximize state of the "Filter Editor" window.
-          The value updates when the user maximizes or unmaximizes the
-          window.  Note, this particular value is not used by Evolution
-          since the "Filter Editor" window cannot be maximized.  This
-          key exists only as an implementation detail.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/filter_editor_width</key>
-      <applyto>/apps/evolution/mail/filter_editor_width</applyto>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>"Filter Editor" window width</short>
-        <long>
-          Initial width of the "Filter Editor" window.
-          The value updates as the user resizes the window horizontally.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/send_recv_on_start</key>
-      <applyto>/apps/evolution/mail/send_recv_on_start</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Check for new messages on start</short>
-        <long>
-          Whether check for new messages when Evolution is started.
-          This includes also sending messages from Outbox.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/send_recv_all_on_start</key>
-      <applyto>/apps/evolution/mail/send_recv_all_on_start</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Check for new messages in all active accounts</short>
-        <long>
-          Whether check for new messages in all active accounts regardless
-	  of the account "Check for new messages every X minutes" option
-	  when Evolution is started. This option is used only together
-	  with 'send_recv_on_start' option.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/send_recv_height</key>
-      <applyto>/apps/evolution/mail/send_recv_height</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>200</default>
-      <locale name="C">
-        <short>"Send and Receive Mail" window height</short>
-        <long>
-          Initial height of the "Send and Receive Mail" window.
-          The value updates as the user resizes the window vertically.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/send_recv_maximized</key>
-      <applyto>/apps/evolution/mail/send_recv_maximized</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>"Send and Receive Mail" window maximize state</short>
-        <long>
-          Initial maximize state of the "Send and Receive Mail" window.
-          The value updates when the user maximizes or unmaximizes the
-          window.  Note, this particular value is not used by Evolution
-          since the "Send and Receive Mail" window cannot be maximized.
-          This key exists only as an implementation detail.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/send_recv_width</key>
-      <applyto>/apps/evolution/mail/send_recv_width</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>600</default>
-      <locale name="C">
-        <short>"Send and Receive Mail" window width</short>
-        <long>
-          Initial width of the "Send and Receive Mail" window.
-          The value updates as the user resizes the window horizontally.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/vfolder_editor_height</key>
-      <applyto>/apps/evolution/mail/vfolder_editor_height</applyto>
-      <type>int</type>
-      <default>650</default>
-      <locale name="C">
-        <short>"Search Folder Editor" window height</short>
-        <long>
-          Initial height of the "Search Folder Editor" window.
-          The value updates as the user resizes the window vertically.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/vfolder_editor_maximized</key>
-      <applyto>/apps/evolution/mail/vfolder_editor_maximized</applyto>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>"Search Folder Editor" window maximize state</short>
-        <long>
-          Initial maximize state of the "Search Folder Editor" window.
-          The value updates when the user maximizes or unmaximizes the
-          window.  Note, this particular value is not used by Evolution
-          since the "Search Folder Editor" window cannot be maximized.
-          This key exists only as an implementation detail.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/vfolder_editor_width</key>
-      <applyto>/apps/evolution/mail/vfolder_editor_width</applyto>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>"Search Folder Editor" window width</short>
-        <long>
-          Initial width of the "Search Folder Editor" window.
-          The value updates as the user resizes the window horizontally.
-        </long>
-      </locale>
-    </schema>
-
-    <!-- email drag'n'drop settings -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/save_file_format</key>
-      <applyto>/apps/evolution/mail/save_file_format</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default>mbox</default>
-      <locale name="C">
-         <short>Drag'n'drop export format</short>
-         <long>
-           Define the email export format when doing drag'n'drop.
-           Possible values are mbox or pdf
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/save_name_format</key>
-      <applyto>/apps/evolution/mail/save_name_format</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-     <default>1</default>
-      <locale name="C">
-         <short>Format of the drag'n'drop export filename</short>
-         <long>
-           Exported filename will be YYYYmmDDHHMMSS_email_title
-           Possible values: 1 (: email sent date), 2 (: drag'n'drop date)
-         </long>
-      </locale>
-    </schema>
-
-    <!-- Others -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/sync_interval</key>
-      <applyto>/apps/evolution/mail/sync_interval</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>60</default>
-      <locale name="C">
-        <short>Server synchronization interval</short>
-        <long>
-          Controls how frequently local changes are synchronized with the
-          remote mail server.  The interval must be at least 30 seconds.
-        </long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index bebcf97dd9..24db1041e3 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -36,8 +36,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <gconf/gconf-client.h>
-
 #include "mail-importer.h"
 
 #include "libemail-utils/mail-mt.h"
@@ -221,18 +219,6 @@ elm_import_exec (struct _elm_import_msg *m,
 static void
 elm_import_done (struct _elm_import_msg *m)
 {
-	printf("importing complete\n");
-
-	if (m->base.error == NULL) {
-		GConfClient *gconf;
-		const gchar *key;
-
-		gconf = gconf_client_get_default ();
-		key = "/apps/evolution/importer/elm/mail";
-		gconf_client_set_bool (gconf, key, TRUE, NULL);
-		g_object_unref (gconf);
-	}
-
 	e_import_complete (m->import, (EImportTarget *) m->target);
 }
 
@@ -337,21 +323,14 @@ elm_getwidget (EImport *ei,
                EImportImporter *im)
 {
 	GtkWidget *box, *w;
-	GConfClient *gconf;
-	gboolean done_mail;
-
-	gconf = gconf_client_get_default ();
-	done_mail = gconf_client_get_bool (
-		gconf, "/apps/evolution/importer/elm/mail", NULL);
-	g_object_unref (gconf);
 
 	g_datalist_set_data (
-		&target->data, "elm-do-mail", GINT_TO_POINTER(!done_mail));
+		&target->data, "elm-do-mail", GINT_TO_POINTER(TRUE));
 
 	box = gtk_vbox_new (FALSE, 2);
 
 	w = gtk_check_button_new_with_label(_("Mail"));
-	gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_mail);
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
 	g_signal_connect (
 		w, "toggled",
 		G_CALLBACK (checkbox_toggle_cb), target);
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index b5dcd38cd7..dbcc488f03 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -36,8 +36,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <gconf/gconf-client.h>
-
 #include <libebook/libebook.h>
 
 #include "mail-importer.h"
@@ -291,23 +289,6 @@ pine_import_exec (struct _pine_import_msg *m,
 static void
 pine_import_done (struct _pine_import_msg *m)
 {
-	printf("importing complete\n");
-
-	if (m->base.error == NULL) {
-		GConfClient *gconf;
-
-		gconf = gconf_client_get_default ();
-		if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr")))
-			gconf_client_set_bool (
-				gconf, "/apps/evolution/importer/pine/addr",
-				TRUE, NULL);
-		if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-mail")))
-			gconf_client_set_bool (
-				gconf, "/apps/evolution/importer/pine/mail",
-				TRUE, NULL);
-		g_object_unref (gconf);
-	}
-
 	e_import_complete (m->import, (EImportTarget *) m->target);
 }
 
@@ -429,34 +410,25 @@ pine_getwidget (EImport *ei,
                 EImportImporter *im)
 {
 	GtkWidget *box, *w;
-	GConfClient *gconf;
-	gboolean done_mail, done_addr;
-
-	gconf = gconf_client_get_default ();
-	done_mail = gconf_client_get_bool (
-		gconf, "/apps/evolution/importer/pine/mail", NULL);
-	done_addr = gconf_client_get_bool (
-		gconf, "/apps/evolution/importer/pine/address", NULL);
-	g_object_unref (gconf);
 
 	g_datalist_set_data (
 		&target->data, "pine-do-mail",
-		GINT_TO_POINTER (!done_mail));
+		GINT_TO_POINTER (TRUE));
 	g_datalist_set_data (
 		&target->data, "pine-do-addr",
-		GINT_TO_POINTER (!done_addr));
+		GINT_TO_POINTER (TRUE));
 
 	box = gtk_vbox_new (FALSE, 2);
 
 	w = gtk_check_button_new_with_label(_("Mail"));
-	gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_mail);
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
 	g_signal_connect (
 		w, "toggled",
 		G_CALLBACK (checkbox_mail_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 0);
 
 	w = gtk_check_button_new_with_label(_("Address Book"));
-	gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_addr);
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
 	g_signal_connect (
 		w, "toggled",
 		G_CALLBACK (checkbox_addr_toggle_cb), target);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index a132327585..1670cf04c2 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -58,9 +58,6 @@
 /* pseudo-uri to key the send task on */
 #define SEND_URI_KEY "send-task:"
 
-/* Prefix for window size GConf keys */
-#define GCONF_KEY_PREFIX "/apps/evolution/mail/send_recv"
-
 /* send/receive email */
 
 /* ********************************************************************** */