[evolution/account-mgmt: 21/50] Adapt mail to the new ESource API.



commit 7f471803440f6e023bc926374905eefd826b8824
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Apr 13 10:30:40 2011 -0400

    Adapt mail to the new ESource API.

 mail/Makefile.am                |    2 +-
 mail/e-mail-backend.c           |  202 +++++++-----
 mail/e-mail-folder-pane.c       |   17 +-
 mail/e-mail-migrate.c           |   12 +-
 mail/e-mail-paned-view.c        |    8 +-
 mail/e-mail-reader-utils.c      |   26 +-
 mail/e-mail-reader.c            |   56 +++-
 mail/e-mail-session-utils.c     |   37 +-
 mail/e-mail-session-utils.h     |    2 +
 mail/e-mail-session.c           |  339 ++++++++++++-------
 mail/e-mail-store.c             |  240 ++++++++------
 mail/e-mail-store.h             |   10 +-
 mail/em-account-editor.c        |  129 +++++++-
 mail/em-account-editor.h        |    4 +
 mail/em-composer-utils.c        |  368 +++++++++++++--------
 mail/em-composer-utils.h        |    6 +-
 mail/em-config.c                |   49 ++--
 mail/em-config.h                |   10 +-
 mail/em-filter-source-element.c |  112 ++-----
 mail/em-folder-tree-model.c     |  190 +++++++----
 mail/em-subscription-editor.c   |   19 +-
 mail/em-utils.c                 |  708 +++++++++++++++++++++++++--------------
 mail/em-utils.h                 |   39 ++-
 mail/mail-config.c              |   27 +--
 mail/mail-config.h              |    1 -
 mail/mail-folder-cache.c        |   14 +-
 mail/mail-ops.c                 |  227 ++++++++-----
 mail/mail-send-recv.c           |   27 ++-
 mail/mail-send-recv.h           |    3 +-
 mail/mail-vfolder.c             |   50 ++--
 mail/mail.error.xml             |   28 --
 31 files changed, 1853 insertions(+), 1109 deletions(-)
---
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 97a2fe3..5371a9f 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -34,7 +34,7 @@ libevolution_mail_la_CPPFLAGS =				\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	-DEVOLUTION_ICONDIR=\""$(icondir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
 	-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\"	\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 5768934..3f888b3 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -31,13 +31,12 @@
 #include <string.h>
 #include <glib/gstdio.h>
 #include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-source-mail-composition.h>
+#include <libedataserver/e-source-mail-submission.h>
 
-#include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-alert-sink.h"
 
-#include "misc/e-account-combo-box.h"
-
 #include "shell/e-shell.h"
 
 #include "mail/e-mail-folder-utils.h"
@@ -271,7 +270,6 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
                                   EActivity *activity,
                                   EMailBackend *backend)
 {
-	EAccountList *account_list;
 	gboolean delete_junk;
 	gboolean empty_trash;
 
@@ -285,9 +283,6 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
 
 	camel_application_is_exiting = TRUE;
 
-	account_list = e_get_account_list ();
-	e_account_list_prune_proxies (account_list);
-
 	mail_vfolder_shutdown ();
 
 	/* Cancel all pending activities. */
@@ -367,18 +362,24 @@ mail_backend_folder_deleted_cb (MailFolderCache *folder_cache,
                                 const gchar *folder_name,
                                 EMailBackend *backend)
 {
+	EShell *shell;
 	CamelStoreClass *class;
-	EAccountList *account_list;
-	EIterator *iterator;
+	ESourceRegistry *registry;
+	EShellBackend *shell_backend;
+	GList *list, *link;
+	const gchar *extension_name;
 	const gchar *local_drafts_folder_uri;
 	const gchar *local_sent_folder_uri;
-	gboolean write_config = FALSE;
 	gchar *uri;
 
 	/* Check whether the deleted folder was a designated Drafts or
 	 * Sent folder for any mail account, and if so revert the setting
 	 * to the equivalent local folder, which is always present. */
 
+	shell_backend = E_SHELL_BACKEND (backend);
+	shell = e_shell_backend_get_shell (shell_backend);
+	registry = e_shell_get_registry (shell);
+
 	class = CAMEL_STORE_GET_CLASS (store);
 	g_return_if_fail (class->compare_folder_name != NULL);
 
@@ -389,51 +390,69 @@ mail_backend_folder_deleted_cb (MailFolderCache *folder_cache,
 
 	uri = e_mail_folder_uri_build (store, folder_name);
 
-	account_list = e_get_account_list ();
-	iterator = e_list_get_iterator (E_LIST (account_list));
+	extension_name = E_SOURCE_EXTENSION_MAIL_COMPOSITION;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceExtension *extension;
+		const gchar *drafts_folder_uri;
 
-	while (e_iterator_is_valid (iterator)) {
-		EAccount *account;
+		extension = e_source_get_extension (source, extension_name);
 
-		/* XXX EIterator misuses const. */
-		account = (EAccount *) e_iterator_get (iterator);
+		drafts_folder_uri =
+			e_source_mail_composition_get_drafts_folder (
+			E_SOURCE_MAIL_COMPOSITION (extension));
 
-		if (account->sent_folder_uri != NULL) {
-			gboolean match;
+		if (class->compare_folder_name (drafts_folder_uri, uri)) {
+			GError *error = NULL;
 
-			match = class->compare_folder_name (
-				account->sent_folder_uri, uri);
+			e_source_mail_composition_set_drafts_folder (
+				E_SOURCE_MAIL_COMPOSITION (extension),
+				local_drafts_folder_uri);
 
-			if (match) {
-				g_free (account->sent_folder_uri);
-				account->sent_folder_uri =
-					g_strdup (local_sent_folder_uri);
-				write_config = TRUE;
+			/* FIXME This is a blocking D-Bus method call. */
+			if (!e_source_submit_sync (source, NULL, &error)) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
 			}
 		}
+	}
+
+	g_list_free (list);
 
-		if (account->drafts_folder_uri != NULL) {
-			gboolean match;
+	extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+	list = e_source_registry_list_sources (registry, extension_name);
 
-			match = class->compare_folder_name (
-				account->drafts_folder_uri, uri);
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceExtension *extension;
+		const gchar *sent_folder_uri;
 
-			if (match) {
-				g_free (account->drafts_folder_uri);
-				account->drafts_folder_uri =
-					g_strdup (local_drafts_folder_uri);
-				write_config = TRUE;
+		extension = e_source_get_extension (source, extension_name);
+
+		sent_folder_uri =
+			e_source_mail_submission_get_sent_folder (
+			E_SOURCE_MAIL_SUBMISSION (extension));
+
+		if (class->compare_folder_name (sent_folder_uri, uri)) {
+			GError *error = NULL;
+
+			e_source_mail_submission_set_sent_folder (
+				E_SOURCE_MAIL_SUBMISSION (extension),
+				local_sent_folder_uri);
+
+			/* FIXME This is a blocking D-Bus method call. */
+			if (!e_source_submit_sync (source, NULL, &error)) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
 			}
 		}
-
-		e_iterator_next (iterator);
 	}
 
-	g_object_unref (iterator);
-	g_free (uri);
+	g_list_free (list);
 
-	if (write_config)
-		mail_config_write ();
+	g_free (uri);
 
 	/* This does something completely different.
 	 * XXX Make it a separate signal handler? */
@@ -447,10 +466,12 @@ mail_backend_folder_renamed_cb (MailFolderCache *folder_cache,
                                 const gchar *new_folder_name,
                                 EMailBackend *backend)
 {
+	EShell *shell;
 	CamelStoreClass *class;
-	EAccountList *account_list;
-	EIterator *iterator;
-	gboolean write_config = FALSE;
+	ESourceRegistry *registry;
+	EShellBackend *shell_backend;
+	GList *list, *link;
+	const gchar *extension_name;
 	gchar *old_uri;
 	gchar *new_uri;
 	gint ii;
@@ -460,54 +481,84 @@ mail_backend_folder_renamed_cb (MailFolderCache *folder_cache,
 		"views/custom_view-"
 	};
 
+	/* Check whether the renamed folder was a designated Drafts or
+	 * Sent folder for any mail account, and if so update the setting
+	 * to the new folder name. */
+
+	shell_backend = E_SHELL_BACKEND (backend);
+	shell = e_shell_backend_get_shell (shell_backend);
+	registry = e_shell_get_registry (shell);
+
 	class = CAMEL_STORE_GET_CLASS (store);
 	g_return_if_fail (class->compare_folder_name != NULL);
 
 	old_uri = e_mail_folder_uri_build (store, old_folder_name);
 	new_uri = e_mail_folder_uri_build (store, new_folder_name);
 
-	account_list = e_get_account_list ();
-	iterator = e_list_get_iterator (E_LIST (account_list));
+	extension_name = E_SOURCE_EXTENSION_MAIL_COMPOSITION;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceExtension *extension;
+		const gchar *drafts_folder_uri;
 
-	while (e_iterator_is_valid (iterator)) {
-		EAccount *account;
+		extension = e_source_get_extension (source, extension_name);
 
-		/* XXX EIterator misuses const. */
-		account = (EAccount *) e_iterator_get (iterator);
+		drafts_folder_uri =
+			e_source_mail_composition_get_drafts_folder (
+			E_SOURCE_MAIL_COMPOSITION (extension));
 
-		if (account->sent_folder_uri != NULL) {
-			gboolean match;
+		if (class->compare_folder_name (drafts_folder_uri, old_uri)) {
+			GError *error = NULL;
 
-			match = class->compare_folder_name (
-				account->sent_folder_uri, old_uri);
+			e_source_mail_composition_set_drafts_folder (
+				E_SOURCE_MAIL_COMPOSITION (extension),
+				new_uri);
 
-			if (match) {
-				g_free (account->sent_folder_uri);
-				account->sent_folder_uri = g_strdup (new_uri);
-				write_config = TRUE;
+			/* FIXME This is a blocking D-Bus method call. */
+			if (!e_source_submit_sync (source, NULL, &error)) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
 			}
 		}
+	}
+
+	g_list_free (list);
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceExtension *extension;
+		const gchar *sent_folder_uri;
+
+		extension = e_source_get_extension (source, extension_name);
 
-		if (account->drafts_folder_uri != NULL) {
-			gboolean match;
+		sent_folder_uri =
+			e_source_mail_submission_get_sent_folder (
+			E_SOURCE_MAIL_SUBMISSION (extension));
 
-			match = class->compare_folder_name (
-				account->drafts_folder_uri, old_uri);
+		if (class->compare_folder_name (sent_folder_uri, old_uri)) {
+			GError *error = NULL;
 
-			if (match) {
-				g_free (account->drafts_folder_uri);
-				account->drafts_folder_uri = g_strdup (new_uri);
-				write_config = TRUE;
+			e_source_mail_submission_set_sent_folder (
+				E_SOURCE_MAIL_SUBMISSION (extension),
+				new_uri);
+
+			/* FIXME This is a blocking D-Bus method call. */
+			if (!e_source_submit_sync (source, NULL, &error)) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
 			}
 		}
-
-		e_iterator_next (iterator);
 	}
 
-	g_object_unref (iterator);
+	g_list_free (list);
 
-	if (write_config)
-		mail_config_write ();
+	g_free (old_uri);
+	g_free (new_uri);
 
 	/* Rename GalView files. */
 
@@ -525,9 +576,6 @@ mail_backend_folder_renamed_cb (MailFolderCache *folder_cache,
 		g_free (newname);
 	}
 
-	g_free (old_uri);
-	g_free (new_uri);
-
 	/* This does something completely different.
 	 * XXX Make it a separate signal handler? */
 	mail_filter_rename_folder (
@@ -560,10 +608,8 @@ mail_backend_folder_changed_cb (MailFolderCache *folder_cache,
 				folder_cache, folder, &flags))
 			g_return_if_reached ();
 
-	g_free (folder_uri);
-
 	target = em_event_target_new_folder (
-		event, store, folder_name, new_messages,
+		event, store, folder_uri, new_messages,
 		msg_uid, msg_sender, msg_subject);
 
 	folder_type = (flags & CAMEL_FOLDER_TYPE_MASK);
@@ -766,10 +812,6 @@ mail_backend_constructed (GObject *object)
 		G_CALLBACK (mail_backend_job_finished_cb),
 		shell_backend);
 
-	/* FIXME This is an evil hack that needs to die.
-	 *       Give EAccountComboBox a CamelSession property. */
-	e_account_combo_box_set_session (CAMEL_SESSION (priv->session));
-
 	/* FIXME EMailBackend should own the default EMFolderTreeModel. */
 	folder_tree_model = em_folder_tree_model_get_default ();
 
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index e9aa029..a8b164f 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -67,7 +67,10 @@ folder_pane_set_preview_visible (EMailView *view,
 static guint
 mail_paned_view_open_selected_mail (EMailPanedView *view)
 {
+	EShell *shell;
 	EMailReader *reader;
+	EMailBackend *backend;
+	ESourceRegistry *registry;
 	GPtrArray *uids;
 	gint i;
 	GtkWindow *window;
@@ -81,6 +84,10 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
 	uids = e_mail_reader_get_selected_uids (reader);
 	g_return_val_if_fail (uids != NULL, 0);
 
+	backend = e_mail_reader_get_backend (reader);
+	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
+	registry = e_shell_get_registry (shell);
+
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
 	g_ptr_array_set_free_func (uids, (GDestroyNotify) g_free);
@@ -90,9 +97,9 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
 		return 0;
 	}
 
-	if (em_utils_folder_is_drafts (folder) ||
-		em_utils_folder_is_outbox (folder) ||
-		em_utils_folder_is_templates (folder)) {
+	if (em_utils_folder_is_drafts (registry, folder) ||
+		em_utils_folder_is_outbox (registry, folder) ||
+		em_utils_folder_is_templates (registry, folder)) {
 		em_utils_edit_messages (reader, folder, uids, TRUE);
 		g_ptr_array_unref (uids);
 		return 0;
@@ -120,8 +127,8 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
 			CAMEL_VEE_FOLDER (folder),
 			(CamelVeeMessageInfo *) info, &real_uid);
 
-		if (em_utils_folder_is_drafts (real_folder) ||
-			em_utils_folder_is_outbox (real_folder)) {
+		if (em_utils_folder_is_drafts (registry, real_folder) ||
+			em_utils_folder_is_outbox (registry, real_folder)) {
 			GPtrArray *edits;
 
 			edits = g_ptr_array_new_with_free_func (
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 10afa58..168f3a9 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -53,11 +53,9 @@
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-xml-utils.h>
 
-#include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-plugin.h"
-#include "e-util/e-signature-utils.h"
 
 #include "shell/e-shell.h"
 #include "shell/e-shell-migrate.h"
@@ -329,6 +327,7 @@ cp (const gchar *src,
 static void
 em_update_accounts_2_11 (void)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccountList *accounts;
 	EIterator *iter;
 	gboolean changed = FALSE;
@@ -361,6 +360,7 @@ em_update_accounts_2_11 (void)
 
 	if (changed)
 		e_account_list_save (accounts);
+#endif /* ACCOUNT_MGMT */
 }
 
 #endif	/* !G_OS_WIN32 */
@@ -698,6 +698,7 @@ migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_db
 static void
 migrate_to_db (EShellBackend *shell_backend)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EMMigrateSession *session;
 	EAccountList *accounts;
 	EMailBackend *mail_backend;
@@ -804,6 +805,7 @@ migrate_to_db (EShellBackend *shell_backend)
 	em_migrate_close_progress_dialog ();
 
 	g_object_unref (session);
+#endif /* ACCOUNT_MGMT */
 }
 
 #endif
@@ -1017,6 +1019,7 @@ static gboolean
 create_mbox_account (EShellBackend *shell_backend,
                      EMMigrateSession *session)
 {
+#if 0 /* ACCOUNT_MGMT */
 	EMailBackend *mail_backend;
 	CamelStore *store;
 	CamelURL *url;
@@ -1082,6 +1085,7 @@ exit:
 	g_free (uri);
 	g_free (name);
 	g_free (id);
+#endif /* ACCOUNT_MGMT */
 
 	return TRUE;
 }
@@ -1089,6 +1093,7 @@ exit:
 static void
 change_sent_and_drafts_local_folders (EShellBackend *shell_backend)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccountList *accounts;
 	EIterator *iter;
 	const gchar *data_dir;
@@ -1165,6 +1170,7 @@ change_sent_and_drafts_local_folders (EShellBackend *shell_backend)
 
 	if (changed)
 		e_account_list_save (accounts);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -1353,6 +1359,7 @@ em_rename_camel_url_params (CamelURL *url)
 static void
 em_rename_account_params (void)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccountList *account_list;
 	EIterator *iterator;
 
@@ -1402,6 +1409,7 @@ em_rename_account_params (void)
 
 	g_object_unref (iterator);
 	e_account_list_save (account_list);
+#endif /* ACCOUNT_MGMT */
 }
 
 static gboolean
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index c9ebb8a..25e4276 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -767,6 +767,7 @@ mail_paned_view_update_view_instance (EMailView *view)
 	EShellWindow *shell_window;
 	EShellViewClass *shell_view_class;
 	EShellSettings *shell_settings;
+	ESourceRegistry *registry;
 	GalViewCollection *view_collection;
 	GalViewInstance *view_instance;
 	CamelFolder *folder;
@@ -784,6 +785,7 @@ mail_paned_view_update_view_instance (EMailView *view)
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
 	shell = e_shell_window_get_shell (shell_window);
+	registry = e_shell_get_registry (shell);
 	shell_settings = e_shell_get_shell_settings (shell);
 
 	reader = E_MAIL_READER (view);
@@ -802,9 +804,9 @@ mail_paned_view_update_view_instance (EMailView *view)
 	e_filename_make_safe (view_id);
 
 	outgoing_folder =
-		em_utils_folder_is_drafts (folder) ||
-		em_utils_folder_is_outbox (folder) ||
-		em_utils_folder_is_sent (folder);
+		em_utils_folder_is_drafts (registry, folder) ||
+		em_utils_folder_is_outbox (registry, folder) ||
+		em_utils_folder_is_sent (registry, folder);
 
 	if (e_shell_settings_get_boolean (shell_settings, "mail-global-view-setting"))
 		view_instance = e_shell_view_new_view_instance (
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 725a0c6..9c18baf 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -370,7 +370,9 @@ copy_tree_state (EMailReader *src_reader,
 guint
 e_mail_reader_open_selected (EMailReader *reader)
 {
+	EShell *shell;
 	EMailBackend *backend;
+	ESourceRegistry *registry;
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *views;
@@ -380,6 +382,9 @@ e_mail_reader_open_selected (EMailReader *reader)
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), 0);
 
 	backend = e_mail_reader_get_backend (reader);
+	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
+	registry = e_shell_get_registry (shell);
+
 	folder = e_mail_reader_get_folder (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 	window = e_mail_reader_get_window (reader);
@@ -389,9 +394,9 @@ e_mail_reader_open_selected (EMailReader *reader)
 		return 0;
 	}
 
-	if (em_utils_folder_is_drafts (folder) ||
-		em_utils_folder_is_outbox (folder) ||
-		em_utils_folder_is_templates (folder)) {
+	if (em_utils_folder_is_drafts (registry, folder) ||
+		em_utils_folder_is_outbox (registry, folder) ||
+		em_utils_folder_is_templates (registry, folder)) {
 		em_utils_edit_messages (reader, folder, uids, TRUE);
 		return uids->len;
 	}
@@ -418,8 +423,8 @@ e_mail_reader_open_selected (EMailReader *reader)
 			CAMEL_VEE_FOLDER (folder),
 			(CamelVeeMessageInfo *) info, &real_uid);
 
-		if (em_utils_folder_is_drafts (real_folder) ||
-			em_utils_folder_is_outbox (real_folder)) {
+		if (em_utils_folder_is_drafts (registry, real_folder) ||
+			em_utils_folder_is_outbox (registry, real_folder)) {
 			GPtrArray *edits;
 
 			edits = g_ptr_array_new ();
@@ -1175,9 +1180,12 @@ void
 e_mail_reader_create_filter_from_selected (EMailReader *reader,
                                            gint filter_type)
 {
+	EShell *shell;
 	EActivity *activity;
+	EMailBackend *backend;
 	AsyncContext *context;
 	GCancellable *cancellable;
+	ESourceRegistry *registry;
 	CamelFolder *folder;
 	GPtrArray *uids;
 	const gchar *filter_source;
@@ -1185,12 +1193,16 @@ e_mail_reader_create_filter_from_selected (EMailReader *reader,
 
 	g_return_if_fail (E_IS_MAIL_READER (reader));
 
+	backend = e_mail_reader_get_backend (reader);
+	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
+	registry = e_shell_get_registry (shell);
+
 	folder = e_mail_reader_get_folder (reader);
 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
 
-	if (em_utils_folder_is_sent (folder))
+	if (em_utils_folder_is_sent (registry, folder))
 		filter_source = E_FILTER_SOURCE_OUTGOING;
-	else if (em_utils_folder_is_outbox (folder))
+	else if (em_utils_folder_is_outbox (registry, folder))
 		filter_source = E_FILTER_SOURCE_OUTGOING;
 	else
 		filter_source = E_FILTER_SOURCE_INCOMING;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 9209942..94b7edf 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -28,11 +28,12 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
+#include <libedataserver/e-source-mail-account.h>
+
 #ifdef HAVE_XFREE
 #include <X11/XF86keysym.h>
 #endif
 
-#include "e-util/e-account-utils.h"
 #include "e-util/e-charset.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
@@ -750,6 +751,9 @@ static void
 action_mail_message_edit_cb (GtkAction *action,
                              EMailReader *reader)
 {
+	EShell *shell;
+	EMailBackend *backend;
+	ESourceRegistry *registry;
 	CamelFolder *folder;
 	GPtrArray *uids;
 	gboolean replace;
@@ -758,11 +762,15 @@ action_mail_message_edit_cb (GtkAction *action,
 	uids = e_mail_reader_get_selected_uids (reader);
 	g_return_if_fail (uids != NULL);
 
+	backend = e_mail_reader_get_backend (reader);
+	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
+	registry = e_shell_get_registry (shell);
+
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
 	g_ptr_array_set_free_func (uids, (GDestroyNotify) g_free);
 
-	replace = em_utils_folder_is_drafts (folder);
+	replace = em_utils_folder_is_drafts (registry, folder);
 	em_utils_edit_messages (reader, folder, uids, replace);
 
 	g_ptr_array_unref (uids);
@@ -2786,6 +2794,7 @@ mail_reader_set_folder (EMailReader *reader,
 	EMailReaderPrivate *priv;
 	EMFormatHTML *formatter;
 	CamelFolder *previous_folder;
+	ESourceRegistry *registry;
 	GtkWidget *message_list;
 	EMailBackend *backend;
 	EShell *shell;
@@ -2793,13 +2802,14 @@ mail_reader_set_folder (EMailReader *reader,
 
 	priv = E_MAIL_READER_GET_PRIVATE (reader);
 
-	backend = e_mail_reader_get_backend (reader);
 	formatter = e_mail_reader_get_formatter (reader);
 	message_list = e_mail_reader_get_message_list (reader);
 
 	previous_folder = e_mail_reader_get_folder (reader);
 
+	backend = e_mail_reader_get_backend (reader);
 	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
+	registry = e_shell_get_registry (shell);
 
 	/* Only synchronize the folder if we're online. */
 	if (previous_folder != NULL && e_shell_get_online (shell))
@@ -2810,9 +2820,9 @@ mail_reader_set_folder (EMailReader *reader,
 		return;
 
 	outgoing = folder != NULL && (
-		em_utils_folder_is_drafts (folder) ||
-		em_utils_folder_is_outbox (folder) ||
-		em_utils_folder_is_sent (folder));
+		em_utils_folder_is_drafts (registry, folder) ||
+		em_utils_folder_is_outbox (registry, folder) ||
+		em_utils_folder_is_sent (registry, folder));
 
 	/* FIXME Need to pass a GCancellable. */
 	em_format_format (EM_FORMAT (formatter), NULL, NULL, NULL, NULL);
@@ -3664,9 +3674,14 @@ e_mail_reader_changed (EMailReader *reader)
 guint32
 e_mail_reader_check_state (EMailReader *reader)
 {
+	EShell *shell;
 	GPtrArray *uids;
 	CamelFolder *folder;
 	CamelStore *store = NULL;
+	EMailBackend *backend;
+	ESourceRegistry *registry;
+	GList *list, *iter;
+	const gchar *extension_name;
 	const gchar *tag;
 	gboolean can_clear_flags = FALSE;
 	gboolean can_flag_completed = FALSE;
@@ -3680,6 +3695,7 @@ e_mail_reader_check_state (EMailReader *reader)
 	gboolean has_undeleted = FALSE;
 	gboolean has_unimportant = FALSE;
 	gboolean has_unread = FALSE;
+	gboolean have_enabled_account = FALSE;
 	gboolean drafts_or_outbox = FALSE;
 	gboolean store_supports_vjunk = FALSE;
 	gboolean is_mailing_list;
@@ -3689,6 +3705,10 @@ e_mail_reader_check_state (EMailReader *reader)
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), 0);
 
+	backend = e_mail_reader_get_backend (reader);
+	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
+	registry = e_shell_get_registry (shell);
+
 	folder = e_mail_reader_get_folder (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 
@@ -3698,8 +3718,8 @@ e_mail_reader_check_state (EMailReader *reader)
 		is_junk_folder =
 			(folder->folder_flags & CAMEL_FOLDER_IS_JUNK) != 0;
 		drafts_or_outbox =
-			em_utils_folder_is_drafts (folder) ||
-			em_utils_folder_is_outbox (folder);
+			em_utils_folder_is_drafts (registry, folder) ||
+			em_utils_folder_is_outbox (registry, folder);
 	}
 
 	/* Initialize this flag based on whether there are any
@@ -3784,7 +3804,25 @@ e_mail_reader_check_state (EMailReader *reader)
 		camel_folder_free_message_info (folder, info);
 	}
 
-	if (e_get_any_enabled_account () != NULL)
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (iter = list; iter != NULL; iter = g_list_next (iter)) {
+		ESourceMailAccount *extension;
+		ESource *source;
+
+		source = E_SOURCE (iter->data);
+		extension = e_source_get_extension (source, extension_name);
+
+		if (e_source_mail_account_get_enabled (extension)) {
+			have_enabled_account = TRUE;
+			break;
+		}
+	}
+
+	g_list_free (list);
+
+	if (have_enabled_account)
 		state |= E_MAIL_READER_HAVE_ENABLED_ACCOUNT;
 	if (uids->len == 1)
 		state |= E_MAIL_READER_SELECTION_SINGLE;
diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c
index 217e7e2..e16f1cc 100644
--- a/mail/e-mail-session-utils.c
+++ b/mail/e-mail-session-utils.c
@@ -25,11 +25,11 @@
 #include "em-utils.h"
 
 #include <glib/gi18n-lib.h>
+#include <libedataserver/e-source-mail-submission.h>
 
 #include <mail/mail-tools.h>
 #include <mail/e-mail-local.h>
 #include <mail/e-mail-folder-utils.h>
-#include <e-util/e-account-utils.h>
 #include <filter/e-filter-rule.h>
 
 /* X-Mailer header value */
@@ -636,6 +636,7 @@ exit:
 
 void
 e_mail_session_send_to (EMailSession *session,
+                        ESourceRegistry *registry,
                         CamelMimeMessage *message,
                         gint io_priority,
                         GCancellable *cancellable,
@@ -650,7 +651,7 @@ e_mail_session_send_to (EMailSession *session,
 	CamelAddress *recipients;
 	CamelMedium *medium;
 	CamelMessageInfo *info;
-	EAccount *account = NULL;
+	ESource *source;
 	GPtrArray *post_to_uris;
 	struct _camel_header_raw *xev;
 	struct _camel_header_raw *header;
@@ -661,6 +662,7 @@ e_mail_session_send_to (EMailSession *session,
 	GError *error = NULL;
 
 	g_return_if_fail (E_IS_MAIL_SESSION (session));
+	g_return_if_fail (E_IS_SOURCE_REGISTRY (registry));
 	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
 
 	medium = CAMEL_MEDIUM (message);
@@ -671,28 +673,25 @@ e_mail_session_send_to (EMailSession *session,
 
 	/* Extract directives from X-Evolution headers. */
 
-	string = camel_header_raw_find (&xev, "X-Evolution-Account", NULL);
+	string = camel_header_raw_find (&xev, "X-Evolution-Identity", NULL);
 	if (string != NULL) {
-		gchar *account_uid;
-
-		account_uid = g_strstrip (g_strdup (string));
-		account = e_get_account_by_uid (account_uid);
-		g_free (account_uid);
+		gchar *uid = g_strstrip (g_strdup (string));
+		source = e_source_registry_lookup_by_uid (registry, uid);
+		g_free (uid);
 	}
 
-	if (account != NULL) {
-		if (account->transport != NULL) {
+	if (E_IS_SOURCE (source)) {
+		ESourceMailSubmission *extension;
+		const gchar *extension_name;
 
-			/* XXX Transport UIDs are kludgy right now.  We
-			 *     use the EAccount's regular UID and tack on
-			 *     "-transport".  Will be better soon. */
-			transport_uid = g_strconcat (
-				account->uid, "-transport", NULL);
+		extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+		extension = e_source_get_extension (source, extension_name);
 
-			/* to reprompt password on sending if needed */
-			account->transport->get_password_canceled = FALSE;
-		}
-		sent_folder_uri = g_strdup (account->sent_folder_uri);
+		string = e_source_mail_submission_get_sent_folder (extension);
+		sent_folder_uri = g_strdup (string);
+
+		string = e_source_mail_submission_get_transport_uid (extension);
+		transport_uid = g_strdup (string);
 	}
 
 	string = camel_header_raw_find (&xev, "X-Evolution-Fcc", NULL);
diff --git a/mail/e-mail-session-utils.h b/mail/e-mail-session-utils.h
index b398be5..2d0c15f 100644
--- a/mail/e-mail-session-utils.h
+++ b/mail/e-mail-session-utils.h
@@ -22,6 +22,7 @@
 /* High-level operations with Evolution-specific policies. */
 
 #include <mail/e-mail-session.h>
+#include <libedataserver/e-source-registry.h>
 
 #define E_MAIL_ERROR (e_mail_error_quark ())
 
@@ -65,6 +66,7 @@ gboolean	e_mail_session_handle_source_headers_finish
 						 GAsyncResult *result,
 						 GError **error);
 void		e_mail_session_send_to		(EMailSession *session,
+						 ESourceRegistry *registry,
 						 CamelMimeMessage *message,
 						 gint io_priority,
 						 GCancellable *cancellable,
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index d716357..944b893 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -46,10 +46,14 @@
 
 #include <libedataserver/e-flag.h>
 #include <libebackend/e-extensible.h>
+#include <libedataserver/e-source-authentication.h>
+#include <libedataserver/e-source-mail-account.h>
+#include <libedataserver/e-source-mail-identity.h>
+#include <libedataserver/e-source-mail-submission.h>
+#include <libedataserver/e-source-password.h>
 #include <libedataserverui/e-passwords.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 #include "e-util/gconf-bridge.h"
@@ -520,19 +524,64 @@ async_context_free (AsyncContext *context)
 }
 
 static gchar *
-mail_session_make_key (CamelService *service,
-                       const gchar *item)
+mail_session_resolve_popb4smtp (ESourceRegistry *registry,
+                                CamelService *smtp_service)
 {
-	gchar *key;
+	GList *list, *link;
+	const gchar *extension_name;
+	const gchar *smtp_uid;
+	gchar *pop_uid = NULL;
 
-	if (service != NULL)
-		key = camel_url_to_string (
-			camel_service_get_camel_url (service),
-			CAMEL_URL_HIDE_PARAMS);
-	else
-		key = g_strdup (item);
+	/* Find a POP account that uses the given smtp_service as its
+	 * transport.  XXX This isn't foolproof though, since we don't
+	 * check that the POP server is at the same domain as the SMTP
+	 * server, which is kind of the point of POPB4SMTP. */
+
+	smtp_uid = camel_service_get_uid (smtp_service);
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceExtension *extension;
+		const gchar *backend_name;
+		const gchar *uid;
+
+		/* We're only interested in POP accounts. */
+		backend_name = e_source_get_backend_name (source);
+		if (g_strcmp0 (backend_name, "pop") != 0)
+			continue;
 
-	return key;
+		/* Get the mail account's default mail identity. */
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+		extension = e_source_get_extension (source, extension_name);
+
+		source = e_source_mail_account_get_identity (
+			E_SOURCE_MAIL_ACCOUNT (extension));
+		if (source == NULL)
+			continue;
+
+		/* Get the mail identity's default mail transport. */
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+		extension = e_source_get_extension (source, extension_name);
+
+		uid = e_source_mail_submission_get_transport_uid (
+			E_SOURCE_MAIL_SUBMISSION (extension));
+		if (uid == NULL)
+			continue;
+
+		if (g_strcmp0 (uid, smtp_uid) == 0) {
+			pop_uid = g_strdup (uid);
+			break;
+		}
+	}
+
+	g_list_free (list);
+
+	return pop_uid;
 }
 
 static void
@@ -833,114 +882,127 @@ mail_session_get_password (CamelSession *session,
                            guint32 flags,
                            GError **error)
 {
-	EAccount *account = NULL;
-	const gchar *display_name = NULL;
-	const gchar *uid = NULL;
-	gchar *ret = NULL;
-
-	if (CAMEL_IS_SERVICE (service)) {
-		display_name = camel_service_get_display_name (service);
-		uid = camel_service_get_uid (service);
-		account = e_get_account_by_uid (uid);
+	EShell *shell;
+	ESource *source;
+	ESourceRegistry *registry;
+	ESourceExtension *extension = NULL;
+	EPasswordsRememberType eflags;
+	const gchar *extension_name;
+	const gchar *uid;
+	gboolean remember_password;
+	gchar *password = NULL;
+
+	/* XXX Maybe give EMailSession a weak pointer to its EMailBackend
+	 *     so we can access the ESourceRegistry properly? */
+	shell = e_shell_get_default ();
+	registry = e_shell_get_registry (shell);
+
+	if (g_strcmp0 (item, "popb4smtp_uid") == 0)
+		return mail_session_resolve_popb4smtp (registry, service);
+
+	if (!CAMEL_IS_SERVICE (service))
+		goto no_service;
+
+	uid = camel_service_get_uid (service);
+	source = e_source_registry_lookup_by_uid (registry, uid);
+	g_return_val_if_fail (source != NULL, NULL);
+
+	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
+	if (e_source_has_extension (source, extension_name)) {
+		extension = e_source_get_extension (source, extension_name);
+		remember_password =
+			e_source_authentication_get_remember_password (
+			E_SOURCE_AUTHENTICATION (extension));
+	} else
+		remember_password = FALSE;
+
+	/* Don't look up a stored password if we've explicitly
+	 * been asked to reprompt the user for a new password. */
+	if ((flags & CAMEL_SESSION_PASSWORD_REPROMPT) == 0) {
+		gboolean success;
+
+		/* Success means we successfully asked GNOME Keyring if
+		 * a password exists for the ESource.  Success does not
+		 * imply that we found a password for the ESource. */
+		success = e_source_password_lookup_sync (
+			source, NULL, &password, error);
+
+		if (!success)
+			return NULL;
+
+		if (password != NULL) {
+			gchar *unsecure_memory;
+
+			/* XXX This secure memory business might be more
+			 *     trouble than it's worth since we constantly
+			 *     have to work around it. */
+			unsecure_memory = g_strdup (password);
+			e_source_password_free (password);
+
+			return unsecure_memory;
+		}
 	}
 
-	if (!strcmp(item, "popb4smtp_uid")) {
-		/* not 100% mt safe, but should be ok */
-		ret = g_strdup ((account != NULL) ? account->uid : uid);
-	} else {
-		gchar *key = mail_session_make_key (service, item);
-		EAccountService *config_service = NULL;
+	if ((flags & CAMEL_SESSION_PASSWORD_STATIC) != 0)
+		eflags = E_PASSWORDS_REMEMBER_NEVER;
+	else
+		eflags = E_PASSWORDS_REMEMBER_FOREVER;
 
-		ret = e_passwords_get_password (NULL, key);
-		if (ret == NULL || (flags & CAMEL_SESSION_PASSWORD_REPROMPT)) {
-			gboolean remember;
+	if (flags & CAMEL_SESSION_PASSWORD_REPROMPT)
+		eflags |= E_PASSWORDS_REPROMPT;
 
-			g_free (ret);
-			ret = NULL;
+	if (flags & CAMEL_SESSION_PASSWORD_SECRET)
+		eflags |= E_PASSWORDS_SECRET;
 
-			if (account != NULL) {
-				if (CAMEL_IS_STORE (service))
-					config_service = account->source;
-				if (CAMEL_IS_TRANSPORT (service))
-					config_service = account->transport;
-			}
+	if (flags & CAMEL_SESSION_PASSPHRASE)
+		eflags |= E_PASSWORDS_PASSPHRASE;
 
-			remember = config_service ? config_service->save_passwd : FALSE;
-
-			if (!config_service || (config_service &&
-				!config_service->get_password_canceled)) {
-				guint32 eflags;
-				gchar *title;
-
-				if (flags & CAMEL_SESSION_PASSPHRASE) {
-					if (display_name != NULL)
-						title = g_strdup_printf (
-							_("Enter Passphrase for %s"),
-							display_name);
-					else
-						title = g_strdup (
-							_("Enter Passphrase"));
-				} else {
-					if (display_name != NULL)
-						title = g_strdup_printf (
-							_("Enter Password for %s"),
-							display_name);
-					else
-						title = g_strdup (
-							_("Enter Password"));
-				}
-				if ((flags & CAMEL_SESSION_PASSWORD_STATIC) != 0)
-					eflags = E_PASSWORDS_REMEMBER_NEVER;
-				else if (config_service == NULL)
-					eflags = E_PASSWORDS_REMEMBER_SESSION;
-				else
-					eflags = E_PASSWORDS_REMEMBER_FOREVER;
-
-				if (flags & CAMEL_SESSION_PASSWORD_REPROMPT)
-					eflags |= E_PASSWORDS_REPROMPT;
-
-				if (flags & CAMEL_SESSION_PASSWORD_SECRET)
-					eflags |= E_PASSWORDS_SECRET;
-
-				if (flags & CAMEL_SESSION_PASSPHRASE)
-					eflags |= E_PASSWORDS_PASSPHRASE;
-
-				/* HACK: breaks abstraction ...
-				 * e_account_writable() doesn't use the
-				 * EAccount, it also uses the same writable
-				 * key for source and transport. */
-				if (!e_account_writable (NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD))
-					eflags |= E_PASSWORDS_DISABLE_REMEMBER;
-
-				ret = e_passwords_ask_password (
-					title, NULL, key, prompt,
-					eflags, &remember, NULL);
-
-				if (!ret)
-					e_passwords_forget_password (NULL, key);
-
-				g_free (title);
-
-				if (ret && config_service) {
-					config_service->save_passwd = remember;
-					e_account_list_save (e_get_account_list ());
-				}
-
-				if (config_service)
-					config_service->get_password_canceled = ret == NULL;
-			}
-		}
+	password = e_passwords_ask_password (
+		source, "", prompt,
+		eflags, &remember_password, NULL);
 
-		g_free (key);
-	}
+	if (password == NULL) {
+		GError *local_error = NULL;
+
+		/* Failure here is not fatal, so don't
+		 * use the GError that was passed in. */
+		e_source_password_delete_sync (source, NULL, &local_error);
+		if (local_error != NULL) {
+			g_warning ("%s", local_error->message);
+			g_error_free (local_error);
+		}
 
-	if (ret == NULL)
 		g_set_error (
 			error, G_IO_ERROR,
 			G_IO_ERROR_CANCELLED,
-			_("User canceled operation."));
+			_("User declined password request"));
 
-	return ret;
+	} else if (extension != NULL) {
+		GError *local_error = NULL;
+
+		e_source_authentication_set_remember_password (
+			E_SOURCE_AUTHENTICATION (extension),
+			remember_password);
+
+		/* Failure here is not fatal, so don't use the GError
+		 * that was passed in.  Also, FIXME this is a blocking
+		 * D-Bus method call. */
+		if (!e_source_submit_sync (source, NULL, &local_error)) {
+			g_warning ("%s", local_error->message);
+			g_error_free (local_error);
+		}
+	}
+
+	return password;
+
+no_service:
+
+	/* FIXME: ACCOUNT_MGMT
+	 *
+	 * How to deal with this?
+	 * GPG password requests don't pass up a CamelService. */
+
+	return NULL;
 }
 
 static gboolean
@@ -949,15 +1011,33 @@ mail_session_forget_password (CamelSession *session,
                               const gchar *item,
                               GError **error)
 {
-	gchar *key;
+	EShell *shell;
+	ESource *source;
+	ESourceRegistry *registry;
+	const gchar *uid;
 
-	key = mail_session_make_key (service, item);
+	/* XXX Maybe give EMailSession a weak pointer to its EMailBackend
+	 *     so we can access the ESourceRegistry properly. */
+	shell = e_shell_get_default ();
+	registry = e_shell_get_registry (shell);
 
-	e_passwords_forget_password (NULL, key);
+	if (!CAMEL_IS_SERVICE (service))
+		goto no_service;
 
-	g_free (key);
+	uid = camel_service_get_uid (service);
+	source = e_source_registry_lookup_by_uid (registry, uid);
+	g_return_val_if_fail (source != NULL, FALSE);
 
-	return TRUE;
+	return e_source_password_delete_sync (source, NULL, error);
+
+no_service:
+
+	/* FIXME: ACCOUNT_MGMT
+	 *
+	 * How to deal with this?
+	 * GPG password requests don't pass up a CamelService. */
+
+	return FALSE;
 }
 
 static gboolean
@@ -1033,13 +1113,19 @@ mail_session_forward_to (CamelSession *session,
                          const gchar *address,
                          GError **error)
 {
-	EAccount *account;
+	EShell *shell;
+	ESource *source;
+	ESourceRegistry *registry;
+	ESourceMailIdentity *extension;
 	CamelMimeMessage *forward;
 	CamelStream *mem;
 	CamelInternetAddress *addr;
 	CamelFolder *out_folder;
 	CamelMessageInfo *info;
 	CamelMedium *medium;
+	const gchar *extension_name;
+	const gchar *from_address;
+	const gchar *from_name;
 	const gchar *header_name;
 	struct _camel_header_raw *xev;
 	gchar *subject;
@@ -1051,20 +1137,31 @@ mail_session_forward_to (CamelSession *session,
 	if (!*address) {
 		g_set_error (
 			error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-			_("No destination address provided, forward "
+			_("No destination address provided, forwarding "
 			  "of the message has been cancelled."));
 		return FALSE;
 	}
 
-	account = em_utils_guess_account_with_recipients (message, folder);
-	if (!account) {
+	/* XXX Maybe give EMailSession a weak pointer to its EMailBackend
+	 *     so we can access the ESourceRegistry properly? */
+	shell = e_shell_get_default ();
+	registry = e_shell_get_registry (shell);
+
+	source = em_utils_guess_mail_identity_with_recipients (
+		registry, message, folder);
+	if (source == NULL) {
 		g_set_error (
 			error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-			_("No account found to use, forward of the "
-			  "message has been cancelled."));
+			_("No identity found to use, forwarding "
+			  "of the message has been cancelled."));
 		return FALSE;
 	}
 
+	extension_name = E_SOURCE_EXTENSION_MAIL_IDENTITY;
+	extension = e_source_get_extension (source, extension_name);
+	from_address = e_source_mail_identity_get_address (extension);
+	from_name = e_source_mail_identity_get_name (extension);
+
 	forward = camel_mime_message_new ();
 
 	/* make copy of the message, because we are going to modify it */
@@ -1107,8 +1204,7 @@ mail_session_forward_to (CamelSession *session,
 
 	/* from */
 	addr = camel_internet_address_new ();
-	camel_internet_address_add (
-		addr, account->id->name, account->id->address);
+	camel_internet_address_add (addr, from_name, from_address);
 	camel_mime_message_set_from (forward, addr);
 	g_object_unref (addr);
 
@@ -1201,9 +1297,6 @@ e_mail_session_init (EMailSession *session)
 	session->priv->junk_filters = g_hash_table_new (
 		(GHashFunc) g_str_hash, (GEqualFunc) g_str_equal);
 
-	/* Initialize the EAccount setup. */
-	e_account_writable (NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD);
-
 	client = gconf_client_get_default ();
 
 	gconf_client_add_dir (
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 885e34b..4c3cd29 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -27,17 +27,17 @@
 
 #include <glib/gi18n.h>
 #include <camel/camel.h>
-#include <libedataserver/e-account.h>
-#include <libedataserver/e-account-list.h>
-
-#include "e-util/e-account-utils.h"
-
-#include "mail/e-mail-local.h"
-#include "mail/em-folder-tree-model.h"
-#include "mail/em-utils.h"
-#include "mail/mail-folder-cache.h"
-#include "mail/mail-mt.h"
-#include "mail/mail-ops.h"
+#include <libedataserver/e-source-authentication.h>
+#include <libedataserver/e-source-mail-account.h>
+#include <libedataserver/e-source-mail-transport.h>
+
+#include <shell/e-shell.h>
+#include <mail/e-mail-local.h>
+#include <mail/em-folder-tree-model.h>
+#include <mail/em-utils.h>
+#include <mail/mail-folder-cache.h>
+#include <mail/mail-mt.h>
+#include <mail/mail-ops.h>
 
 #include "shell/e-shell.h"
 #include "shell/e-shell-settings.h"
@@ -181,6 +181,91 @@ special_mail_store_is_enabled (CamelStore *store)
 	return e_shell_settings_get_boolean (shell_settings, prop);
 }
 
+static CamelService *
+mail_store_add_service_from_source (EMailSession *session,
+                                    CamelProviderType type,
+                                    ESource *source)
+{
+	CamelURL *url;
+	CamelService *service;
+	const gchar *uid;
+	const gchar *string;
+	const gchar *backend_name;
+	const gchar *extension_name;
+	gchar *url_string;
+	GError *error = NULL;
+
+	uid = e_source_get_uid (source);
+	backend_name = e_source_get_backend_name (source);
+
+	/* Make sure the source has a UID and backend name. */
+	if (uid == NULL || backend_name == NULL)
+		return NULL;
+
+	/* Construct a CamelURL from the [Authentication] extension. */
+
+	/* camel_url_new_with_base() allocates with g_new(), so we will
+	 * too so we can hand this thing to camel_url_free() when we're
+	 * done with it. */
+	url = g_new0 (CamelURL, 1);
+
+	camel_url_set_protocol (url, backend_name);
+
+	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
+	if (e_source_has_extension (source, extension_name)) {
+		ESourceAuthentication *extension;
+		guint16 port;
+
+		extension = e_source_get_extension (source, extension_name);
+
+		string = e_source_authentication_get_host (extension);
+		camel_url_set_host (url, string);
+
+		string = e_source_authentication_get_user (extension);
+		camel_url_set_user (url, string);
+
+		string = e_source_authentication_get_method (extension);
+		if (g_strcmp0 (string, "none") != 0)
+			camel_url_set_authmech (url, string);
+
+		port = e_source_authentication_get_port (extension);
+		if (port > 0)
+			camel_url_set_port (url, port);
+	}
+
+	url_string = camel_url_to_string (url, 0);
+
+	service = camel_session_add_service (
+		CAMEL_SESSION (session), uid, url_string, type, &error);
+
+	g_free (url_string);
+	camel_url_free (url);
+
+	if (error != NULL) {
+		g_warn_if_fail (service == NULL);
+		g_warning (
+			"Failed to add service '%s' (%s): %s",
+			e_source_get_display_name (source),
+			uid, error->message);
+		return NULL;
+	}
+
+	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
+
+	g_object_bind_property (
+		source, "display-name",
+		service, "display-name",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
+
+	g_debug ("Added %s '%s' (%s)",
+		G_OBJECT_TYPE_NAME (service),
+		camel_service_get_display_name (service),
+		camel_service_get_uid (service));
+
+	return service;
+}
+
 static void
 mail_store_add (EMailBackend *backend,
                 CamelStore *store,
@@ -233,11 +318,18 @@ static void
 mail_store_load_accounts (EMailBackend *backend,
                           const gchar *data_dir)
 {
+	EShell *shell;
+	EShellBackend *shell_backend;
+	ESourceRegistry *registry;
 	CamelStore *local_store;
 	EMailSession *session;
-	EAccountList *account_list;
-	EIterator *iter;
+	GList *list, *link;
+	const gchar *extension_name;
+
+	shell_backend = E_SHELL_BACKEND (backend);
+	shell = e_shell_backend_get_shell (shell_backend);
 
+	registry = e_shell_get_registry (shell);
 	session = e_mail_backend_get_session (backend);
 
 	/* Add the local store. */
@@ -249,23 +341,37 @@ mail_store_load_accounts (EMailBackend *backend,
 		backend, local_store, (AddStoreCallback)
 		mail_store_add_local_done_cb);
 
-	/* Add mail accounts.. */
+	/* Add mail accounts. */
 
-	account_list = e_get_account_list ();
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	list = e_source_registry_list_sources (registry, extension_name);
 
-	for (iter = e_list_get_iterator ((EList *) account_list);
-	     e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		EAccount *account;
-
-		account = (EAccount *) e_iterator_get (iter);
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceMailAccount *extension;
 
-		if (!account->enabled)
+		/* If the mail account is disabled, skip it. */
+		extension = e_source_get_extension (source, extension_name);
+		if (!e_source_mail_account_get_enabled (extension))
 			continue;
 
-		e_mail_store_add_by_account (backend, account);
+		e_mail_store_add_by_source (backend, source);
 	}
 
-	g_object_unref (iter);
+	g_list_free (list);
+
+	/* Add mail transports. */
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_TRANSPORT;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (link = list; link != NULL; link = g_list_next (link))
+		mail_store_add_service_from_source (
+			session, CAMEL_PROVIDER_TRANSPORT,
+			E_SOURCE (link->data));
+
+	g_list_free (list);
+
 }
 
 void
@@ -304,99 +410,41 @@ e_mail_store_add (EMailBackend *backend,
 }
 
 CamelStore *
-e_mail_store_add_by_account (EMailBackend *backend,
-                             EAccount *account)
+e_mail_store_add_by_source (EMailBackend *backend,
+                            ESource *source)
 {
 	EMailSession *session;
 	CamelService *service = NULL;
 	CamelProvider *provider;
 	CamelURL *url;
-	gboolean skip, transport_only;
-	GError *error = NULL;
+	gboolean skip;
 
 	g_return_val_if_fail (E_IS_MAIL_BACKEND (backend), NULL);
-	g_return_val_if_fail (E_IS_ACCOUNT (account), NULL);
+	g_return_val_if_fail (E_IS_SOURCE (source), NULL);
 
 	session = e_mail_backend_get_session (backend);
 
-	/* check whether it's transport-only accounts */
-	transport_only = !account->source || !account->source->url || !*account->source->url;
-	if (transport_only)
-		goto handle_transport;
-
 	/* Load the service, but don't connect.  Check its provider,
 	 * and if this belongs in the folder tree model, add it. */
 
-	provider = camel_provider_get (account->source->url, &error);
-	if (provider == NULL) {
-	/* In case we do not have a provider here, we handle
-	 * the special case of having multiple mail identities
-	 * eg. a dummy account having just SMTP server defined */
-		goto handle_transport;
-	}
-
-	service = camel_session_add_service (
-		CAMEL_SESSION (session),
-		account->uid, account->source->url,
-		CAMEL_PROVIDER_STORE, &error);
-
-	camel_service_set_display_name (service, account->name);
-
-handle_transport:
-
-	if (account->transport) {
-		/* While we're at it, add the account's transport to the
-		 * CamelSession.  The transport's UID is a kludge for now.
-		 * We take the EAccount's UID and tack on "-transport". */
-		gchar *transport_uid;
-		GError *transport_error = NULL;
-
-		transport_uid = g_strconcat (
-			account->uid, "-transport", NULL);
-
-		camel_session_add_service (
-			CAMEL_SESSION (session),
-			transport_uid, account->transport->url,
-			CAMEL_PROVIDER_TRANSPORT, &transport_error);
-
-		g_free (transport_uid);
+	service = mail_store_add_service_from_source (
+		session, CAMEL_PROVIDER_STORE, source);
 
-		if (transport_error) {
-			g_warning (
-				"%s: Failed to add transport service: %s",
-				G_STRFUNC, transport_error->message);
-			g_error_free (transport_error);
-		}
-	}
-
-	if (transport_only)
+	if (!CAMEL_IS_STORE (service))
 		return NULL;
 
-	if (!CAMEL_IS_STORE (service))
-		goto fail;
+	url = camel_service_get_camel_url (service);
+	provider = camel_service_get_provider (service);
+	g_warn_if_fail (url != NULL && provider != NULL);
 
 	/* Do not add local-delivery files,
 	 * but make them ready for later use. */
-	url = camel_url_new (account->source->url, NULL);
-	if (url != NULL) {
-		skip = em_utils_is_local_delivery_mbox_file (url);
-		camel_url_free (url);
-	}
+	skip = em_utils_is_local_delivery_mbox_file (url);
 
 	if (!skip && (provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		e_mail_store_add (backend, CAMEL_STORE (service));
 
 	return CAMEL_STORE (service);
-
-fail:
-	/* FIXME: Show an error dialog. */
-	g_warning (
-		"Couldn't get service: %s: %s", account->name,
-		error ? error->message : "Not a CamelStore");
-	if (error)
-		g_error_free (error);
-
-	return NULL;
 }
 
 void
@@ -437,8 +485,8 @@ e_mail_store_remove (EMailBackend *backend,
 }
 
 void
-e_mail_store_remove_by_account (EMailBackend *backend,
-                                EAccount *account)
+e_mail_store_remove_by_source (EMailBackend *backend,
+                               ESource *source)
 {
 	EMailSession *session;
 	CamelService *service;
@@ -446,9 +494,9 @@ e_mail_store_remove_by_account (EMailBackend *backend,
 	const gchar *uid;
 
 	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
-	g_return_if_fail (E_IS_ACCOUNT (account));
+	g_return_if_fail (E_IS_SOURCE (source));
 
-	uid = account->uid;
+	uid = e_source_get_uid (source);
 	session = e_mail_backend_get_session (backend);
 
 	service = camel_session_get_service (CAMEL_SESSION (session), uid);
diff --git a/mail/e-mail-store.h b/mail/e-mail-store.h
index 2c676d4..1e7bb2b 100644
--- a/mail/e-mail-store.h
+++ b/mail/e-mail-store.h
@@ -24,7 +24,7 @@
 
 #include <camel/camel.h>
 #include <mail/e-mail-backend.h>
-#include <libedataserver/e-account.h>
+#include <libedataserver/e-source.h>
 
 G_BEGIN_DECLS
 
@@ -32,12 +32,12 @@ void		e_mail_store_init		(EMailBackend *backend,
 						 const gchar *data_dir);
 void		e_mail_store_add		(EMailBackend *backend,
 						 CamelStore *store);
-CamelStore *	e_mail_store_add_by_account	(EMailBackend *backend,
-						 EAccount *account);
+CamelStore *	e_mail_store_add_by_source	(EMailBackend *backend,
+						 ESource *source);
 void		e_mail_store_remove		(EMailBackend *backend,
 						 CamelStore *store);
-void		e_mail_store_remove_by_account	(EMailBackend *backend,
-						 EAccount *account);
+void		e_mail_store_remove_by_source	(EMailBackend *backend,
+						 ESource *source);
 void		e_mail_store_foreach		(EMailBackend *backend,
 						 GFunc func,
 						 gpointer user_data);
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 8ec881b..23a5d36 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -49,12 +49,9 @@
 #include "shell/e-shell.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
-#include "e-util/e-account-utils.h"
 #include "e-util/e-dialog-utils.h"
-#include "e-util/e-signature-list.h"
-#include "e-util/e-signature-utils.h"
 #include "e-util/e-util-private.h"
-#include "widgets/misc/e-signature-editor.h"
+#include "widgets/misc/e-mail-signature-editor.h"
 #include "widgets/misc/e-port-entry.h"
 
 #include "e-mail-backend.h"
@@ -155,8 +152,10 @@ typedef struct _EMAccountEditorService {
 struct _EMAccountEditorPrivate {
 
 	EMailBackend *backend;
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *modified_account;
 	EAccount *original_account;
+#endif /* ACCOUNT_MGMT */
 	gboolean new_account;
 
 	struct _EMConfig *config;
@@ -237,6 +236,7 @@ static ServerData * emae_check_servers (const gchar *email);
 
 static gpointer parent_class;
 
+#if 0  /* ACCOUNT_MGMT */
 static void
 emae_set_original_account (EMAccountEditor *emae,
                            EAccount *original_account)
@@ -279,6 +279,7 @@ emae_set_original_account (EMAccountEditor *emae,
 	emae->priv->original_account = original_account;
 	emae->priv->modified_account = modified_account;
 }
+#endif /* ACCOUNT_MGMT */
 
 static void
 emae_set_backend (EMAccountEditor *emae,
@@ -303,11 +304,13 @@ emae_set_property (GObject *object,
 				g_value_get_object (value));
 			return;
 
+#if 0  /* ACCOUNT_MGMT */
 		case PROP_ORIGINAL_ACCOUNT:
 			emae_set_original_account (
 				EM_ACCOUNT_EDITOR (object),
 				g_value_get_object (value));
 			return;
+#endif /* ACCOUNT_MGMT */
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -327,6 +330,7 @@ emae_get_property (GObject *object,
 				EM_ACCOUNT_EDITOR (object)));
 			return;
 
+#if 0  /* ACCOUNT_MGMT */
 		case PROP_MODIFIED_ACCOUNT:
 			g_value_set_object (
 				value,
@@ -340,6 +344,7 @@ emae_get_property (GObject *object,
 				em_account_editor_get_original_account (
 				EM_ACCOUNT_EDITOR (object)));
 			return;
+#endif /* ACCOUNT_MGMT */
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -357,6 +362,7 @@ emae_dispose (GObject *object)
 		priv->backend = NULL;
 	}
 
+#if 0  /* ACCOUNT_MGMT */
 	if (priv->modified_account != NULL) {
 		g_object_unref (priv->modified_account);
 		priv->modified_account = NULL;
@@ -366,6 +372,7 @@ emae_dispose (GObject *object)
 		g_object_unref (priv->original_account);
 		priv->original_account = NULL;
 	}
+#endif /* ACCOUNT_MGMT */
 
 	if (priv->source.settings != NULL) {
 		g_object_unref (priv->source.settings);
@@ -387,6 +394,7 @@ emae_finalize (GObject *object)
 	EMAccountEditor *emae = EM_ACCOUNT_EDITOR (object);
 	EMAccountEditorPrivate *priv = emae->priv;
 
+#if 0 /* ACCOUNT_MGMT */
 	if (priv->sig_added_id) {
 		ESignatureList *signatures;
 
@@ -395,6 +403,7 @@ emae_finalize (GObject *object)
 		g_signal_handler_disconnect (signatures, priv->sig_removed_id);
 		g_signal_handler_disconnect (signatures, priv->sig_changed_id);
 	}
+#endif /* ACCOUNT_MGMT */
 
 	g_list_free (priv->source.auth_types);
 	g_list_free (priv->transport.auth_types);
@@ -430,6 +439,7 @@ emae_class_init (GObjectClass *class)
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
 
+#if 0  /* ACCOUNT_MGMT */
 	g_object_class_install_property (
 		object_class,
 		PROP_MODIFIED_ACCOUNT,
@@ -450,6 +460,7 @@ emae_class_init (GObjectClass *class)
 			E_TYPE_ACCOUNT,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -491,6 +502,7 @@ em_account_editor_get_type (void)
 	return type;
 }
 
+#if 0  /* ACCOUNT_MGMT */
 /**
  * em_account_editor_new:
  * @account:
@@ -554,6 +566,7 @@ em_account_editor_new_for_pages (EAccount *account,
 
 	return emae;
 }
+#endif /* ACCOUNT_MGMT */
 
 EMailBackend *
 em_account_editor_get_backend (EMAccountEditor *emae)
@@ -563,6 +576,7 @@ em_account_editor_get_backend (EMAccountEditor *emae)
 	return emae->priv->backend;
 }
 
+#if 0  /* ACCOUNT_MGMT */
 EAccount *
 em_account_editor_get_modified_account (EMAccountEditor *emae)
 {
@@ -578,6 +592,7 @@ em_account_editor_get_original_account (EMAccountEditor *emae)
 
 	return emae->priv->original_account;
 }
+#endif /* ACCOUNT_MGMT */
 
 /* ********************************************************************** */
 
@@ -600,6 +615,7 @@ static CamelURL *
 emae_account_url (EMAccountEditor *emae,
                   gint urlid)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	CamelURL *url = NULL;
 	const gchar *uri;
@@ -616,6 +632,9 @@ emae_account_url (EMAccountEditor *emae,
 	}
 
 	return url;
+#endif /* ACCOUNT_MGMT */
+
+	return NULL;
 }
 
 /* ********************************************************************** */
@@ -624,6 +643,7 @@ static void
 default_folders_clicked (GtkButton *button,
                          gpointer user_data)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EMAccountEditor *emae = user_data;
 	const gchar *uri;
 
@@ -637,6 +657,7 @@ default_folders_clicked (GtkButton *button,
 
 	gtk_toggle_button_set_active (emae->priv->trash_folder_check, FALSE);
 	gtk_toggle_button_set_active (emae->priv->junk_folder_check, FALSE);
+#endif /* ACCOUNT_MGMT */
 }
 
 /* The camel provider auto-detect interface should be deprecated.
@@ -654,6 +675,7 @@ emae_auto_detect_free (gpointer key,
 static void
 emae_auto_detect (EMAccountEditor *emae)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EMAccountEditorPrivate *priv = emae->priv;
 	EMAccountEditorService *service = &priv->source;
 	GHashTable *auto_detected;
@@ -700,6 +722,7 @@ emae_auto_detect (EMAccountEditor *emae)
 
 	g_hash_table_foreach (auto_detected, emae_auto_detect_free, NULL);
 	g_hash_table_destroy (auto_detected);
+#endif /* ACCOUNT_MGMT */
 }
 
 static gint
@@ -718,6 +741,7 @@ provider_compare (const CamelProvider *p1,
 	}
 }
 
+#if 0  /* ACCOUNT_MGMT */
 static void
 emae_signature_added (ESignatureList *signatures,
                       ESignature *sig,
@@ -906,11 +930,13 @@ emae_setup_signatures (EMAccountEditor *emae,
 
 	return (GtkWidget *) dropdown;
 }
+#endif /* ACCOUNT_MGMT */
 
 static void
 emae_receipt_policy_changed (GtkComboBox *dropdown,
                              EMAccountEditor *emae)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gint id = gtk_combo_box_get_active (dropdown);
 	GtkTreeModel *model;
@@ -926,12 +952,14 @@ emae_receipt_policy_changed (GtkComboBox *dropdown,
 			e_account_set_int (account, E_ACCOUNT_RECEIPT_POLICY, policy);
 		}
 	}
+#endif /* ACCOUNT_MGMT */
 }
 
 static GtkWidget *
 emae_setup_receipt_policy (EMAccountEditor *emae,
                            GtkBuilder *builder)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	GtkComboBox *dropdown = (GtkComboBox *)e_builder_get_widget (builder, "receipt_policy_dropdown");
 	GtkListStore *store;
@@ -977,12 +1005,16 @@ emae_setup_receipt_policy (EMAccountEditor *emae,
 	gtk_widget_set_sensitive ((GtkWidget *) dropdown, e_account_writable (account, E_ACCOUNT_RECEIPT_POLICY));
 
 	return (GtkWidget *) dropdown;
+#endif /* ACCOUNT_MGMT */
+
+	return NULL;
 }
 
 static void
 emae_account_entry_changed (GtkEntry *entry,
                             EMAccountEditor *emae)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gchar *text;
 	gpointer data;
@@ -996,6 +1028,7 @@ emae_account_entry_changed (GtkEntry *entry,
 	e_account_set_string (account, GPOINTER_TO_INT (data), text);
 
 	g_free (text);
+#endif /* ACCOUNT_MGMT */
 }
 
 static GtkEntry *
@@ -1004,6 +1037,7 @@ emae_account_entry (EMAccountEditor *emae,
                     gint item,
                     GtkBuilder *builder)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	GtkEntry *entry;
 	const gchar *text;
@@ -1018,12 +1052,16 @@ emae_account_entry (EMAccountEditor *emae,
 	gtk_widget_set_sensitive ((GtkWidget *) entry, e_account_writable (account, item));
 
 	return entry;
+#endif /* ACCOUNT_MGMT */
+
+	return NULL;
 }
 
 static void
 emae_account_toggle_changed (GtkToggleButton *toggle,
                              EMAccountEditor *emae)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gboolean active;
 	gpointer data;
@@ -1033,6 +1071,7 @@ emae_account_toggle_changed (GtkToggleButton *toggle,
 	active = gtk_toggle_button_get_active (toggle);
 
 	e_account_set_bool (account, GPOINTER_TO_INT (data), active);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -1040,6 +1079,7 @@ emae_account_toggle_widget (EMAccountEditor *emae,
                             GtkToggleButton *toggle,
                             gint item)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gboolean active;
 	gboolean writable;
@@ -1059,6 +1099,7 @@ emae_account_toggle_widget (EMAccountEditor *emae,
 	g_signal_connect (
 		toggle, "toggled",
 		G_CALLBACK (emae_account_toggle_changed), emae);
+#endif /* ACCOUNT_MGMT */
 }
 
 static GtkToggleButton *
@@ -1079,6 +1120,7 @@ static void
 emae_account_spinint_changed (GtkSpinButton *spin,
                               EMAccountEditor *emae)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gpointer data;
 	gint value;
@@ -1088,6 +1130,7 @@ emae_account_spinint_changed (GtkSpinButton *spin,
 	value = gtk_spin_button_get_value (spin);
 
 	e_account_set_int (account, GPOINTER_TO_INT (data), value);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -1095,6 +1138,7 @@ emae_account_spinint_widget (EMAccountEditor *emae,
                              GtkSpinButton *spin,
                              gint item)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gboolean writable;
 	gint v_int;
@@ -1114,8 +1158,10 @@ emae_account_spinint_widget (EMAccountEditor *emae,
 	g_signal_connect (
 		spin, "value-changed",
 		G_CALLBACK (emae_account_spinint_changed), emae);
+#endif /* ACCOUNT_MGMT */
 }
 
+#if 0
 static void
 emae_account_folder_changed (EMFolderSelectionButton *folder,
                              EMAccountEditor *emae)
@@ -1166,6 +1212,7 @@ emae_account_folder (EMAccountEditor *emae,
 
 	return folder;
 }
+#endif
 
 #if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 static void
@@ -1323,6 +1370,7 @@ static struct _provider_host_info emae_transport_host_info[] = {
  * the widgets that represent each service.  i.e. the receiving (source)
  * service, and the sending (transport) service.  It is used throughout
  * the following code to drive each page. */
+#if 0  /* ACCOUNT_MGMT */
 static struct _service_info {
 	gint account_uri_key;
 	gint save_passwd_key;
@@ -1426,11 +1474,13 @@ static struct _service_info {
 	  emae_transport_host_info,
 	},
 };
+#endif /* ACCOUNT_MGMT */
 
 static void
 emae_uri_changed (EMAccountEditorService *service,
                   CamelURL *url)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gchar *uri;
 
@@ -1446,6 +1496,7 @@ emae_uri_changed (EMAccountEditorService *service,
 		e_account_set_string (account, E_ACCOUNT_TRANSPORT_URL, uri);
 
 	g_free (uri);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -1453,6 +1504,7 @@ emae_service_url_changed (EMAccountEditorService *service,
                           void (*setval)(CamelURL *, const gchar *),
                           GtkWidget *entry)
 {
+#if 0  /* ACCOUNT_MGMT */
 	GtkComboBox *dropdown;
 	gint id;
 	GtkTreeModel *model;
@@ -1491,6 +1543,7 @@ emae_service_url_changed (EMAccountEditorService *service,
 	emae_uri_changed (service, url);
 	camel_url_free (url);
 	g_free (text);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -1498,6 +1551,7 @@ emae_service_url_path_changed (EMAccountEditorService *service,
                                void (*setval)(CamelURL *, const gchar *),
                                GtkWidget *widget)
 {
+#if 0  /* ACCOUNT_MGMT */
 	GtkComboBox *dropdown;
 	gint id;
 	GtkTreeModel *model;
@@ -1526,6 +1580,7 @@ emae_service_url_path_changed (EMAccountEditorService *service,
 
 	emae_uri_changed (service, url);
 	camel_url_free (url);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -1560,6 +1615,7 @@ static void
 emae_ssl_changed (GtkComboBox *dropdown,
                   EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	CamelURL *url;
 
 	url = emae_account_url (
@@ -1568,11 +1624,13 @@ emae_ssl_changed (GtkComboBox *dropdown,
 	camel_url_set_port (url, e_port_entry_get_port (service->port));
 	emae_uri_changed (service, url);
 	camel_url_free (url);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
 emae_setup_settings (EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EConfig *config;
 	EMConfigTargetAccount *target;
 	CamelServiceClass *class;
@@ -1633,11 +1691,13 @@ emae_setup_settings (EMAccountEditorService *service)
 
 	em_config_target_new_account_update_settings (
 		config, target, service->emae->priv->source.settings);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
 emae_service_provider_changed (EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gint i, j;
 	gint old_port;
@@ -1758,6 +1818,7 @@ emae_service_provider_changed (EMAccountEditorService *service)
 
 	emae_uri_changed (service, url);
 	camel_url_free (url);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -1789,6 +1850,7 @@ static void
 emae_refresh_providers (EMAccountEditor *emae,
                         EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	GtkListStore *store;
 	GtkTreeIter iter;
@@ -1885,12 +1947,14 @@ emae_refresh_providers (EMAccountEditor *emae,
 	}
 
 	camel_url_free (url);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
 emae_authtype_changed (GtkComboBox *dropdown,
                        EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gint id = gtk_combo_box_get_active (dropdown);
 	GtkTreeModel *model;
@@ -1924,12 +1988,14 @@ emae_authtype_changed (GtkComboBox *dropdown,
 	camel_url_free (url);
 
 	gtk_widget_set_sensitive ((GtkWidget *) service->remember, sensitive);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
 emae_needs_auth (GtkToggleButton *toggle,
                  EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	gint need = gtk_toggle_button_get_active (toggle);
 
 	gtk_widget_set_sensitive (service->auth_frame, need);
@@ -1943,6 +2009,7 @@ emae_needs_auth (GtkToggleButton *toggle,
 		emae_uri_changed (service, url);
 		camel_url_free (url);
 	}
+#endif /* ACCOUNT_MGMT */
 }
 
 static void emae_check_authtype (GtkWidget *w, EMAccountEditorService *service);
@@ -1951,6 +2018,7 @@ static void
 emae_refresh_authtype (EMAccountEditor *emae,
                        EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	GtkListStore *store;
 	GtkTreeIter iter;
@@ -2013,6 +2081,7 @@ emae_refresh_authtype (EMAccountEditor *emae,
 
 	if (url)
 		camel_url_free (url);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -2078,6 +2147,7 @@ static void
 emae_check_authtype (GtkWidget *w,
                      EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	CamelService *camel_service;
 	EMailBackend *backend;
 	EMailSession *session;
@@ -2153,6 +2223,7 @@ emae_check_authtype (GtkWidget *w,
 
 	if (editor != NULL)
 		gtk_widget_set_sensitive (editor, FALSE);
+#endif /* ACCOUNT_MGMT */
 }
 
 static void
@@ -2160,6 +2231,7 @@ emae_setup_service (EMAccountEditor *emae,
                     EMAccountEditorService *service,
                     GtkBuilder *builder)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	struct _service_info *info = &emae_service_info[service->type];
 	CamelURL *url = emae_account_url (emae, info->account_uri_key);
@@ -2265,6 +2337,7 @@ emae_setup_service (EMAccountEditor *emae,
 		gtk_widget_set_sensitive (service->container, TRUE);
 
 	camel_url_free (url);
+#endif /* ACCOUNT_MGMT */
 }
 
 static GtkWidget *
@@ -2327,6 +2400,7 @@ emae_create_basic_assistant_page (EMAccountEditor *emae,
 }
 
 /* do not re-order these, the order is used by various code to look up emae->priv->identity_entries[] */
+#if 0  /* ACCOUNT_MGMT */
 static struct {
 	const gchar *name;
 	gint item;
@@ -2337,6 +2411,7 @@ static struct {
 	{ "identity_reply_to", E_ACCOUNT_ID_REPLY_TO },
 	{ "identity_organization", E_ACCOUNT_ID_ORGANIZATION },
 };
+#endif /* ACCOUNT_MGMT */
 
 static void
 emae_queue_widgets (EMAccountEditor *emae,
@@ -2362,6 +2437,7 @@ emae_identity_page (EConfig *ec,
                     gint position,
                     gpointer data)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EMAccountEditor *emae = data;
 	EMAccountEditorPrivate *priv = emae->priv;
 	EAccount *account;
@@ -2441,6 +2517,9 @@ emae_identity_page (EConfig *ec,
 	g_object_unref (builder);
 
 	return w;
+#endif /* ACCOUNT_MGMT */
+
+	return NULL;
 }
 
 static GtkWidget *
@@ -2841,11 +2920,15 @@ emae_receive_options_item (EConfig *ec,
 
 	box = gtk_hbox_new (FALSE, 4);
 	w = gtk_check_button_new_with_mnemonic (_("Check for _new messages every"));
+#if 0  /* ACCOUNT_MGMT */
 	emae_account_toggle_widget (emae, (GtkToggleButton *) w, E_ACCOUNT_SOURCE_AUTO_CHECK);
+#endif /* ACCOUNT_MGMT */
 	gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 0);
 
 	spin = gtk_spin_button_new_with_range (1.0, 1440.0, 1.0);
+#if 0  /* ACCOUNT_MGMT */
 	emae_account_spinint_widget (emae, (GtkSpinButton *) spin, E_ACCOUNT_SOURCE_AUTO_CHECK_TIME);
+#endif /* ACCOUNT_MGMT */
 	gtk_box_pack_start ((GtkBox *) box, spin, FALSE, TRUE, 0);
 
 	w = gtk_label_new_with_mnemonic (_("minu_tes"));
@@ -2867,6 +2950,7 @@ emae_receive_options_extra_item (EConfig *ec,
                                  gint position,
                                  gpointer data)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EMAccountEditor *emae = data;
 	EMAccountEditorService *service;
 	struct _receive_options_item *item = (struct _receive_options_item *) eitem;
@@ -3034,6 +3118,9 @@ section:
 		gtk_widget_show (widget);
 
 	return widget;
+#endif /* ACCOUNT_MGMT */
+
+	return NULL;  /* ACCOUNT_MGMT */
 }
 
 static GtkWidget *
@@ -3106,6 +3193,7 @@ emae_real_url_toggled (GtkToggleButton *check,
 		em_folder_selection_button_set_folder_uri (button, "");
 }
 
+#if 0  /* ACCOUNT_MGMT */
 static void
 set_real_folder_path (GtkButton *folder_button,
                       CamelSettings *settings,
@@ -3187,6 +3275,7 @@ update_real_folder_cb (GtkButton *folder_button,
 	g_object_set (G_OBJECT (settings), prop_name, path, NULL);
 	g_free (path);
 }
+#endif /* ACCOUNT_MGMT */
 
 static GtkWidget *
 emae_defaults_page (EConfig *ec,
@@ -3196,6 +3285,7 @@ emae_defaults_page (EConfig *ec,
                     gint position,
                     gpointer data)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EMAccountEditor *emae = data;
 	EMAccountEditorPrivate *priv = emae->priv;
 	EMFolderSelectionButton *button;
@@ -3390,12 +3480,16 @@ emae_defaults_page (EConfig *ec,
 	g_object_unref (builder);
 
 	return widget;
+#endif /* ACCOUNT_MGMT */
+
+	return NULL;
 }
 
 static void
 emae_account_hash_algo_combo_changed_cb (GtkComboBox *combobox,
                                          EMAccountEditor *emae)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	gpointer data;
 	const gchar *text = NULL;
@@ -3417,6 +3511,7 @@ emae_account_hash_algo_combo_changed_cb (GtkComboBox *combobox,
 	}
 
 	e_account_set_string (account, GPOINTER_TO_INT (data), text);
+#endif /* ACCOUNT_MGMT */
 }
 
 static GtkComboBox *
@@ -3425,6 +3520,7 @@ emae_account_hash_algo_combo (EMAccountEditor *emae,
                               gint item,
                               GtkBuilder *builder)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	GtkComboBox *combobox;
 	const gchar *text;
@@ -3453,6 +3549,9 @@ emae_account_hash_algo_combo (EMAccountEditor *emae,
 	gtk_widget_set_sensitive (GTK_WIDGET (combobox), e_account_writable (account, item));
 
 	return combobox;
+#endif /* ACCOUNT_MGMT */
+
+	return NULL;
 }
 
 static GtkWidget *
@@ -3476,6 +3575,7 @@ emae_security_page (EConfig *ec,
 	builder = gtk_builder_new ();
 	e_load_ui_builder_definition (builder, "mail-config.ui");
 
+#if 0  /* ACCOUNT_MGMT */
 	/* Security */
 	emae_account_entry (emae, "pgp_key", E_ACCOUNT_PGP_KEY, builder);
 	emae_account_hash_algo_combo (emae, "pgp_hash_algo", E_ACCOUNT_PGP_HASH_ALGORITHM, builder);
@@ -3483,26 +3583,33 @@ emae_security_page (EConfig *ec,
 	emae_account_toggle (emae, "pgp_always_sign", E_ACCOUNT_PGP_ALWAYS_SIGN, builder);
 	emae_account_toggle (emae, "pgp_no_imip_sign", E_ACCOUNT_PGP_NO_IMIP_SIGN, builder);
 	emae_account_toggle (emae, "pgp_always_trust", E_ACCOUNT_PGP_ALWAYS_TRUST, builder);
+#endif /* ACCOUNT_MGMT */
 
 #if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 	/* TODO: this should handle its entry separately? */
+#if 0  /* ACCOUNT_MGMT */
 	priv->smime_sign_key = emae_account_entry (emae, "smime_sign_key", E_ACCOUNT_SMIME_SIGN_KEY, builder);
+#endif /* ACCOUNT_MGMT */
 	priv->smime_sign_key_select = (GtkButton *)e_builder_get_widget (builder, "smime_sign_key_select");
 	priv->smime_sign_key_clear = (GtkButton *)e_builder_get_widget (builder, "smime_sign_key_clear");
 	g_signal_connect (priv->smime_sign_key_select, "clicked", G_CALLBACK(smime_sign_key_select), emae);
 	g_signal_connect (priv->smime_sign_key_clear, "clicked", G_CALLBACK(smime_sign_key_clear), emae);
 
+#if 0  /* ACCOUNT_MGMT */
 	emae_account_hash_algo_combo (emae, "smime_hash_algo", E_ACCOUNT_SMIME_HASH_ALGORITHM, builder);
 	priv->smime_sign_default = emae_account_toggle (emae, "smime_sign_default", E_ACCOUNT_SMIME_SIGN_DEFAULT, builder);
 
 	priv->smime_encrypt_key = emae_account_entry (emae, "smime_encrypt_key", E_ACCOUNT_SMIME_ENCRYPT_KEY, builder);
+#endif /* ACCOUNT_MGMT */
 	priv->smime_encrypt_key_select = (GtkButton *)e_builder_get_widget (builder, "smime_encrypt_key_select");
 	priv->smime_encrypt_key_clear = (GtkButton *)e_builder_get_widget (builder, "smime_encrypt_key_clear");
 	g_signal_connect (priv->smime_encrypt_key_select, "clicked", G_CALLBACK(smime_encrypt_key_select), emae);
 	g_signal_connect (priv->smime_encrypt_key_clear, "clicked", G_CALLBACK(smime_encrypt_key_clear), emae);
 
+#if 0  /* ACCOUNT_MGMT */
 	priv->smime_encrypt_default = emae_account_toggle (emae, "smime_encrypt_default", E_ACCOUNT_SMIME_ENCRYPT_DEFAULT, builder);
 	priv->smime_encrypt_to_self = emae_account_toggle (emae, "smime_encrypt_to_self", E_ACCOUNT_SMIME_ENCRYPT_TO_SELF, builder);
+#endif /* ACCOUNT_MGMT */
 	smime_changed (emae);
 #else
 	{
@@ -3708,6 +3815,7 @@ static gboolean
 emae_service_complete (EMAccountEditor *emae,
                        EMAccountEditorService *service)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccount *account;
 	CamelURL *url;
 	gint ok = TRUE;
@@ -3743,6 +3851,9 @@ emae_service_complete (EMAccountEditor *emae,
 	camel_url_free (url);
 
 	return ok;
+#endif /* ACCOUNT_MGMT */
+
+	return FALSE;
 }
 
 static ServerData *
@@ -3790,6 +3901,7 @@ emae_check_complete (EConfig *ec,
                      const gchar *pageid,
                      gpointer data)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EMAccountEditor *emae = data;
 	EAccount *account;
 	EAccount *original_account;
@@ -4006,6 +4118,9 @@ emae_check_complete (EConfig *ec,
 	}
 
 	return ok;
+#endif /* ACCOUNT_MGMT */
+
+	return FALSE;
 }
 
 gboolean
@@ -4015,6 +4130,7 @@ em_account_editor_check (EMAccountEditor *emae,
 	return emae_check_complete ((EConfig *) emae->config, page, emae);
 }
 
+#if 0  /* ACCOUNT_MGMT */
 static void
 forget_password_if_needed (EAccount *original_account,
                            EAccount *modified_account,
@@ -4053,11 +4169,13 @@ forget_password_if_needed (EAccount *original_account,
 		camel_url_free (url);
 	}
 }
+#endif /* ACCOUNT_MGMT */
 
 static void
 emae_commit (EConfig *ec,
              EMAccountEditor *emae)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EAccountList *accounts = e_get_account_list ();
 	EAccount *account;
 	EAccount *modified_account;
@@ -4118,6 +4236,7 @@ emae_commit (EConfig *ec,
 		e_account_list_set_default (accounts, account);
 
 	e_account_list_save (accounts);
+#endif /* ACCOUNT_MGMT */
 }
 
 void
@@ -4131,6 +4250,7 @@ em_account_editor_construct (EMAccountEditor *emae,
                              EMAccountEditorType type,
                              const gchar *id)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EMAccountEditorPrivate *priv = emae->priv;
 	EAccount *original_account;
 	EAccount *modified_account;
@@ -4232,5 +4352,6 @@ em_account_editor_construct (EMAccountEditor *emae,
 		ec, original_account, modified_account,
 		emae->priv->source.settings);
 	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
+#endif /* ACCOUNT_MGMT */
 }
 
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index 3416b5d..d055ac5 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -96,6 +96,7 @@ struct _EMAccountEditorClass {
 };
 
 GType		em_account_editor_get_type	(void);
+#if 0  /* ACCOUNT_MGMT */
 EMAccountEditor *
 		em_account_editor_new		(EAccount *account,
 						 EMAccountEditorType type,
@@ -107,11 +108,14 @@ EMAccountEditor *
 						 EMailBackend *backend,
 						 const gchar *id,
 						 GtkWidget **pages);
+#endif /* ACCOUNT_MGMT */
 EMailBackend *	em_account_editor_get_backend	(EMAccountEditor *emae);
+#if 0  /* ACCOUNT_MGMT */
 EAccount *	em_account_editor_get_modified_account
 						(EMAccountEditor *emae);
 EAccount *	em_account_editor_get_original_account
 						(EMAccountEditor *emae);
+#endif /* ACCOUNT_MGMT */
 void		em_account_editor_commit	(EMAccountEditor *emae);
 gboolean	em_account_editor_check		(EMAccountEditor *emae,
 						 const gchar *page);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 837cc31..1879df1 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -28,16 +28,19 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include <libedataserver/e-data-server-util.h>
-#include <glib/gi18n.h>
+#include <libedataserver/e-source-mail-account.h>
+#include <libedataserver/e-source-mail-composition.h>
+#include <libedataserver/e-source-mail-identity.h>
+#include <libedataserver/e-source-mail-submission.h>
 
 #include "mail-mt.h"
 #include "mail-ops.h"
 #include "mail-tools.h"
 #include "mail-send-recv.h"
 
-#include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-alert-sink.h"
 #include "e-util/e-util.h"
@@ -361,22 +364,26 @@ finished:
 }
 
 static gboolean
-composer_presend_check_account (EMsgComposer *composer)
+composer_presend_check_identity (EMsgComposer *composer)
 {
 	EComposerHeaderTable *table;
-	EAccount *account;
-	gboolean check_passed;
+	ESourceRegistry *registry;
+	ESource *source;
+	const gchar *uid;
 
 	table = e_msg_composer_get_header_table (composer);
-	account = e_composer_header_table_get_account (table);
-	check_passed = (account != NULL && account->enabled);
+	registry = e_composer_header_table_get_registry (table);
+	uid = e_composer_header_table_get_identity_uid (table);
+	source = e_source_registry_lookup_by_uid (registry, uid);
 
-	if (!check_passed)
+	if (!em_utils_mail_identity_is_enabled (registry, source)) {
 		e_alert_submit (
 			E_ALERT_SINK (composer),
 			"mail:send-no-account-enabled", NULL);
+		return FALSE;
+	}
 
-	return check_passed;
+	return TRUE;
 }
 
 static gboolean
@@ -563,9 +570,11 @@ em_utils_composer_send_cb (EMsgComposer *composer,
                            CamelMimeMessage *message,
                            EActivity *activity)
 {
+	EShell *shell;
 	AsyncContext *context;
 	CamelSession *session;
 	GCancellable *cancellable;
+	ESourceRegistry *registry;
 
 	context = g_slice_new0 (AsyncContext);
 	context->message = g_object_ref (message);
@@ -575,8 +584,11 @@ em_utils_composer_send_cb (EMsgComposer *composer,
 	cancellable = e_activity_get_cancellable (activity);
 	session = e_msg_composer_get_session (context->composer);
 
+	shell = e_msg_composer_get_shell (context->composer);
+	registry = e_shell_get_registry (shell);
+
 	e_mail_session_send_to (
-		E_MAIL_SESSION (session), message,
+		E_MAIL_SESSION (session), registry, message,
 		G_PRIORITY_DEFAULT, cancellable, NULL, NULL,
 		(GAsyncReadyCallback) composer_send_completed,
 		context);
@@ -787,10 +799,12 @@ em_utils_composer_save_to_drafts_cb (EMsgComposer *composer,
 {
 	AsyncContext *context;
 	EComposerHeaderTable *table;
+	ESourceRegistry *registry;
+	ESource *source;
 	const gchar *drafts_folder_uri = NULL;
 	const gchar *local_drafts_folder_uri;
 	CamelSession *session;
-	EAccount *account;
+	const gchar *identity_uid;
 
 	context = g_slice_new0 (AsyncContext);
 	context->message = g_object_ref (message);
@@ -798,18 +812,28 @@ em_utils_composer_save_to_drafts_cb (EMsgComposer *composer,
 	context->activity = g_object_ref (activity);
 
 	session = e_msg_composer_get_session (composer);
+	table = e_msg_composer_get_header_table (composer);
 
-	local_drafts_folder_uri =
-		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS);
+	registry = e_composer_header_table_get_registry (table);
+	identity_uid = e_composer_header_table_get_identity_uid (table);
+	source = e_source_registry_lookup_by_uid (registry, identity_uid);
 
-	table = e_msg_composer_get_header_table (composer);
-	account = e_composer_header_table_get_account (table);
+	/* Get the selected identity's preferred Drafts folder. */
+	if (source != NULL) {
+		ESourceMailComposition *extension;
+		const gchar *extension_name;
+		const gchar *uri;
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_COMPOSITION;
+		extension = e_source_get_extension (source, extension_name);
+		uri = e_source_mail_composition_get_drafts_folder (extension);
 
-	if (account != NULL && account->enabled)
-		drafts_folder_uri = account->drafts_folder_uri;
+		if (uri != NULL && *uri != '\0')
+			drafts_folder_uri = uri;
+	}
 
-	if (g_strcmp0 (drafts_folder_uri, local_drafts_folder_uri) == 0)
-		drafts_folder_uri = NULL;
+	local_drafts_folder_uri =
+		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS);
 
 	if (drafts_folder_uri == NULL) {
 		composer_save_to_drafts_append_mail (context, NULL);
@@ -922,12 +946,15 @@ create_new_composer (EShell *shell,
                      CamelFolder *folder)
 {
 	EMsgComposer *composer;
+	ESourceRegistry *registry;
 	EComposerHeaderTable *table;
-	EAccount *account = NULL;
+	ESource *source = NULL;
+	const gchar *identity = NULL;
 
 	composer = e_msg_composer_new (shell);
 
 	table = e_msg_composer_get_header_table (composer);
+	registry = e_composer_header_table_get_registry (table);
 
 	if (folder != NULL) {
 		CamelStore *store;
@@ -937,7 +964,7 @@ create_new_composer (EShell *shell,
 
 		store = camel_folder_get_parent_store (folder);
 		uid = camel_service_get_uid (CAMEL_SERVICE (store));
-		account = e_get_account_by_uid (uid);
+		source = e_source_registry_lookup_by_uid (registry, uid);
 
 		folder_uri = e_mail_folder_uri_from_folder (folder);
 
@@ -948,8 +975,17 @@ create_new_composer (EShell *shell,
 		g_free (folder_uri);
 	}
 
-	e_composer_header_table_set_account (table, account);
+	if (source != NULL) {
+		ESourceMailAccount *extension;
+		const gchar *extension_name;
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+		extension = e_source_get_extension (source, extension_name);
+		identity = e_source_mail_account_get_identity_uid (extension);
+	}
+
 	e_composer_header_table_set_subject (table, subject);
+	e_composer_header_table_set_identity_uid (table, identity);
 
 	return composer;
 }
@@ -995,8 +1031,8 @@ em_utils_compose_new_message_with_mailto (EShell *shell,
                                           CamelFolder *folder)
 {
 	EMsgComposer *composer;
+	ESourceRegistry *registry;
 	EComposerHeaderTable *table;
-	CamelService *service = NULL;
 
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
@@ -1009,25 +1045,37 @@ em_utils_compose_new_message_with_mailto (EShell *shell,
 		composer = e_msg_composer_new (shell);
 
 	table = e_msg_composer_get_header_table (composer);
+	registry = e_composer_header_table_get_registry (table);
+
+	composer_set_no_change (composer);
+
+	gtk_window_present (GTK_WINDOW (composer));
+
+	/* If a CamelFolder was given, we need to backtrack and find
+	 * the corresponding ESource with a Mail Identity extension. */
 
 	if (folder != NULL) {
+		ESource *source;
 		CamelStore *store;
+		ESourceMailAccount *extension;
+		const gchar *extension_name;
+		const gchar *uid;
 
 		store = camel_folder_get_parent_store (folder);
-		service = CAMEL_SERVICE (store);
-	}
+		uid = camel_service_get_uid (CAMEL_SERVICE (store));
+		source = e_source_registry_lookup_by_uid (registry, uid);
+		g_return_val_if_fail (source != NULL, composer);
 
-	if (service != NULL) {
-		const gchar *display_name;
+		extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+		if (e_source_has_extension (source, extension_name))
+			goto exit;
 
-		display_name = camel_service_get_display_name (service);
-		e_composer_header_table_set_account_name (table, display_name);
+		extension = e_source_get_extension (source, extension_name);
+		uid = e_source_mail_account_get_identity_uid (extension);
+		e_composer_header_table_set_identity_uid (table, uid);
 	}
 
-	composer_set_no_change (composer);
-
-	gtk_window_present (GTK_WINDOW (composer));
-
+exit:
 	return composer;
 }
 
@@ -1248,6 +1296,7 @@ em_utils_edit_message (EShell *shell,
                        const gchar *message_uid)
 {
 	EMsgComposer *composer;
+	ESourceRegistry *registry;
 	gboolean folder_is_drafts;
 	gboolean folder_is_outbox;
 	gboolean folder_is_templates;
@@ -1256,9 +1305,10 @@ em_utils_edit_message (EShell *shell,
 	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
 	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
 
-	folder_is_drafts = em_utils_folder_is_drafts (folder);
-	folder_is_outbox = em_utils_folder_is_outbox (folder);
-	folder_is_templates = em_utils_folder_is_templates (folder);
+	registry = e_shell_get_registry (shell);
+	folder_is_drafts = em_utils_folder_is_drafts (registry, folder);
+	folder_is_outbox = em_utils_folder_is_outbox (registry, folder);
+	folder_is_templates = em_utils_folder_is_templates (registry, folder);
 
 	/* Template specific code follows. */
 	if (folder_is_templates) {
@@ -1797,8 +1847,10 @@ static EMsgComposer *
 redirect_get_composer (EShell *shell,
                        CamelMimeMessage *message)
 {
+	ESourceRegistry *registry;
 	CamelMedium *medium;
-	EAccount *account;
+	ESource *source;
+	const gchar *identity_uid = NULL;
 
 	medium = CAMEL_MEDIUM (message);
 
@@ -1814,10 +1866,15 @@ redirect_get_composer (EShell *shell,
 	while (camel_medium_get_header (medium, "Resent-Bcc"))
 		camel_medium_remove_header (medium, "Resent-Bcc");
 
-	account = em_utils_guess_account_with_recipients (message, NULL);
+	registry = e_shell_get_registry (shell);
+
+	source = em_utils_guess_mail_identity_with_recipients (
+		registry, message, NULL);
+	if (source != NULL)
+		identity_uid = e_source_get_uid (source);
 
 	return e_msg_composer_new_redirect (
-		shell, message, account ? account->name : NULL, NULL);
+		shell, message, identity_uid, NULL);
 }
 
 /**
@@ -1844,76 +1901,6 @@ em_utils_redirect_message (EShell *shell,
 	composer_set_no_change (composer);
 }
 
-/* Message disposition notifications, rfc 2298 */
-void
-em_utils_handle_receipt (EMailBackend *backend,
-                         CamelFolder *folder,
-                         const gchar *message_uid,
-                         CamelMimeMessage *message)
-{
-	EAccount *account;
-	const gchar *addr;
-	CamelMessageInfo *info;
-
-	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
-
-	info = camel_folder_get_message_info (folder, message_uid);
-	if (info == NULL)
-		return;
-
-	if (camel_message_info_user_flag (info, "receipt-handled")) {
-		camel_folder_free_message_info (folder, info);
-		return;
-	}
-
-	addr = camel_medium_get_header (
-		CAMEL_MEDIUM (message), "Disposition-Notification-To");
-	if (addr == NULL) {
-		camel_folder_free_message_info (folder, info);
-		return;
-	}
-
-	camel_message_info_set_user_flag (info, "receipt-handled", TRUE);
-	camel_folder_free_message_info (folder, info);
-
-	account = em_utils_guess_account_with_recipients (message, folder);
-
-	/* TODO Should probably decode/format the address,
-	 *      since it could be in rfc2047 format. */
-	if (addr == NULL) {
-		addr = "";
-	} else {
-		while (camel_mime_is_lwsp (*addr))
-			addr++;
-	}
-
-	if (account == NULL)
-		return;
-
-	if (account->receipt_policy == E_ACCOUNT_RECEIPT_NEVER)
-		return;
-
-	if (account->receipt_policy == E_ACCOUNT_RECEIPT_ASK) {
-		GtkWindow *window;
-		const gchar *subject;
-		gint response;
-
-		/* FIXME Parent window should be passed in. */
-		window = e_shell_get_active_window (NULL);
-		subject = camel_mime_message_get_subject (message);
-
-		response = e_alert_run_dialog_for_args (
-			window, "mail:ask-receipt", addr, subject, NULL);
-
-		if (response != GTK_RESPONSE_YES)
-			return;
-	}
-
-	em_utils_send_receipt (backend, folder, message);
-}
-
 static void
 em_utils_receipt_done (CamelFolder *folder,
                        GAsyncResult *result,
@@ -1926,13 +1913,13 @@ em_utils_receipt_done (CamelFolder *folder,
 	mail_send (backend);
 }
 
-void
-em_utils_send_receipt (EMailBackend *backend,
+static void
+em_utils_send_receipt (ESource *account_source,
+                       EMailBackend *backend,
                        CamelFolder *folder,
                        CamelMimeMessage *message)
 {
 	/* See RFC #3798 for a description of message receipts */
-	EAccount *account = em_utils_guess_account_with_recipients (message, folder);
 	CamelMimeMessage *receipt = camel_mime_message_new ();
 	CamelMultipart *body = camel_multipart_new ();
 	CamelMimePart *part;
@@ -1942,15 +1929,21 @@ em_utils_send_receipt (EMailBackend *backend,
 	CamelStream *stream;
 	CamelFolder *out_folder;
 	CamelMessageInfo *info;
+	ESource *identity_source;
+	ESourceExtension *extension;
 	const gchar *message_id;
 	const gchar *message_date;
 	const gchar *message_subject;
 	const gchar *receipt_address;
+	const gchar *extension_name;
+	const gchar *identity_uid;
+	const gchar *transport_uid;
+	const gchar *self_address;
+	const gchar *sent_folder_uri;
 	gchar *fake_msgid;
 	gchar *hostname;
-	gchar *self_address, *receipt_subject;
+	gchar *receipt_subject;
 	gchar *ua, *recipient;
-	gchar *transport_uid;
 	gchar *content;
 
 	message_id = camel_medium_get_header (
@@ -1964,9 +1957,6 @@ em_utils_send_receipt (EMailBackend *backend,
 	if (!receipt_address)
 		return;
 
-	/* the 'account' should be always set */
-	g_return_if_fail (account != NULL);
-
 	/* Collect information for the receipt */
 
 	/* We use camel_header_msgid_generate () to get a canonical
@@ -1974,7 +1964,29 @@ em_utils_send_receipt (EMailBackend *backend,
 	hostname = strchr ((fake_msgid = camel_header_msgid_generate ()), '@');
 	hostname++;
 
-	self_address = account->id->address;
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	extension = e_source_get_extension (account_source, extension_name);
+
+	identity_source = e_source_mail_account_get_identity (
+		E_SOURCE_MAIL_ACCOUNT (extension));
+	g_return_if_fail (identity_source != NULL);
+
+	identity_uid = e_source_get_uid (identity_source);
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_IDENTITY;
+	extension = e_source_get_extension (identity_source, extension_name);
+
+	self_address = e_source_mail_identity_get_address (
+		E_SOURCE_MAIL_IDENTITY (extension));
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+	extension = e_source_get_extension (identity_source, extension_name);
+
+	sent_folder_uri = e_source_mail_submission_get_sent_folder (
+		E_SOURCE_MAIL_SUBMISSION (extension));
+
+	transport_uid = e_source_mail_submission_get_transport_uid (
+		E_SOURCE_MAIL_SUBMISSION (extension));
 
 	if (!message_id)
 		message_id = "";
@@ -2073,15 +2085,13 @@ em_utils_send_receipt (EMailBackend *backend,
 		receipt, CAMEL_RECIPIENT_TYPE_TO, addr);
 	g_object_unref (addr);
 
-	transport_uid = g_strconcat (account->uid, "-transport", NULL);
-
 	camel_medium_set_header (
 		CAMEL_MEDIUM (receipt),
 		"Return-Path", "<>");
 	camel_medium_set_header (
 		CAMEL_MEDIUM (receipt),
-		"X-Evolution-Account",
-		account->uid);
+		"X-Evolution-Identity",
+		identity_uid);
 	camel_medium_set_header (
 		CAMEL_MEDIUM (receipt),
 		"X-Evolution-Transport",
@@ -2089,9 +2099,7 @@ em_utils_send_receipt (EMailBackend *backend,
 	camel_medium_set_header (
 		CAMEL_MEDIUM (receipt),
 		"X-Evolution-Fcc",
-		account->sent_folder_uri);
-
-	g_free (transport_uid);
+		sent_folder_uri);
 
 	/* Send the receipt */
 	info = camel_message_info_new (NULL);
@@ -2107,6 +2115,90 @@ em_utils_send_receipt (EMailBackend *backend,
 	camel_message_info_free (info);
 }
 
+/* Message disposition notifications, rfc 2298 */
+void
+em_utils_handle_receipt (EMailBackend *backend,
+                         CamelFolder *folder,
+                         const gchar *message_uid,
+                         CamelMimeMessage *message)
+{
+	EShell *shell;
+	EShellBackend *shell_backend;
+	ESource *source;
+	ESourceRegistry *registry;
+	ESourceExtension *extension;
+	EMdnRequestPolicy policy;
+	const gchar *extension_name;
+	const gchar *address;
+	CamelMessageInfo *info;
+
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
+	g_return_if_fail (CAMEL_IS_FOLDER (folder));
+	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+
+	shell_backend = E_SHELL_BACKEND (backend);
+	shell = e_shell_backend_get_shell (shell_backend);
+	registry = e_shell_get_registry (shell);
+
+	info = camel_folder_get_message_info (folder, message_uid);
+
+	if (info == NULL)
+		return;
+
+	if (camel_message_info_user_flag (info, "receipt-handled")) {
+		camel_folder_free_message_info (folder, info);
+		return;
+	}
+
+	address = camel_medium_get_header (
+		CAMEL_MEDIUM (message), "Disposition-Notification-To");
+	if (address == NULL) {
+		camel_folder_free_message_info (folder, info);
+		return;
+	}
+
+	/* TODO Should probably decode/format the address,
+	 *      since it could be in rfc2047 format. */
+	while (camel_mime_is_lwsp (*address))
+		address++;
+
+	camel_message_info_set_user_flag (info, "receipt-handled", TRUE);
+	camel_folder_free_message_info (folder, info);
+
+	source = em_utils_guess_mail_account_with_recipients (
+		registry, message, folder);
+
+	if (source == NULL)
+		return;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	extension = e_source_get_extension (source, extension_name);
+
+	policy = e_source_mail_account_get_mdn_request_policy (
+		E_SOURCE_MAIL_ACCOUNT (extension));
+
+	if (policy == E_MDN_REQUEST_POLICY_NEVER)
+		return;
+
+	if (policy == E_MDN_REQUEST_POLICY_ASK) {
+		GtkWindow *window;
+		const gchar *subject;
+		gint response;
+
+		/* FIXME Parent window should be passed in. */
+		window = e_shell_get_active_window (NULL);
+		subject = camel_mime_message_get_subject (message);
+
+		response = e_alert_run_dialog_for_args (
+			window, "mail:ask-receipt", address, subject, NULL);
+
+		if (response != GTK_RESPONSE_YES)
+			return;
+	}
+
+	em_utils_send_receipt (source, backend, folder, message);
+}
+
 /* Replying to messages... */
 
 EDestination **
@@ -2147,7 +2239,7 @@ em_utils_camel_address_to_destination (CamelInternetAddress *iaddr)
 static EMsgComposer *
 reply_get_composer (EShell *shell,
                     CamelMimeMessage *message,
-                    EAccount *account,
+                    const gchar *identity_uid,
                     CamelInternetAddress *to,
                     CamelInternetAddress *cc,
                     CamelFolder *folder,
@@ -2189,9 +2281,9 @@ reply_get_composer (EShell *shell,
 	}
 
 	table = e_msg_composer_get_header_table (composer);
-	e_composer_header_table_set_account (table, account);
 	e_composer_header_table_set_subject (table, subject);
 	e_composer_header_table_set_destinations_to (table, tov);
+	e_composer_header_table_set_identity_uid (table, identity_uid);
 
 	/* Add destinations instead of setting, so we don't remove
 	 * automatic CC addresses that have already been added. */
@@ -2486,7 +2578,8 @@ concat_unique_addrs (CamelInternetAddress *dest,
 }
 
 void
-em_utils_get_reply_all (CamelMimeMessage *message,
+em_utils_get_reply_all (ESourceRegistry *registry,
+                        CamelMimeMessage *message,
                         CamelInternetAddress *to,
                         CamelInternetAddress *cc,
                         CamelNNTPAddress *postto)
@@ -2499,6 +2592,7 @@ em_utils_get_reply_all (CamelMimeMessage *message,
 	const gchar *posthdr = NULL;
 	GHashTable *rcpt_hash;
 
+	g_return_if_fail (E_IS_SOURCE_REGISTRY (registry));
 	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
 	g_return_if_fail (CAMEL_IS_INTERNET_ADDRESS (to));
 	g_return_if_fail (CAMEL_IS_INTERNET_ADDRESS (cc));
@@ -2515,7 +2609,7 @@ em_utils_get_reply_all (CamelMimeMessage *message,
 	if (postto != NULL && posthdr != NULL)
 		camel_address_decode (CAMEL_ADDRESS (postto), posthdr);
 
-	rcpt_hash = em_utils_generate_account_hash ();
+	rcpt_hash = em_utils_generate_account_hash (registry);
 
 	reply_to = get_reply_to (message);
 	to_addrs = camel_mime_message_get_recipients (
@@ -2902,10 +2996,12 @@ em_utils_reply_to_message (EShell *shell,
                            EMFormat *source_formatter,
                            CamelInternetAddress *address)
 {
+	ESourceRegistry *registry;
 	CamelInternetAddress *to, *cc;
 	CamelNNTPAddress *postto = NULL;
 	EMsgComposer *composer;
-	EAccount *account;
+	ESource *source;
+	const gchar *identity_uid = NULL;
 	guint32 flags;
 
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
@@ -2914,7 +3010,11 @@ em_utils_reply_to_message (EShell *shell,
 	to = camel_internet_address_new ();
 	cc = camel_internet_address_new ();
 
-	account = em_utils_guess_account_with_recipients (message, folder);
+	registry = e_shell_get_registry (shell);
+	source = em_utils_guess_mail_identity_with_recipients (
+		registry, message, folder);
+	if (source != NULL)
+		identity_uid = e_source_get_uid (source);
 	flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN;
 
 	switch (type) {
@@ -2946,12 +3046,12 @@ em_utils_reply_to_message (EShell *shell,
 		if (folder)
 			postto = camel_nntp_address_new ();
 
-		em_utils_get_reply_all (message, to, cc, postto);
+		em_utils_get_reply_all (registry, message, to, cc, postto);
 		break;
 	}
 
 	composer = reply_get_composer (
-		shell, message, account, to, cc, folder, postto);
+		shell, message, identity_uid, to, cc, folder, postto);
 	e_msg_composer_add_message_attachments (composer, message, TRUE);
 
 	if (postto)
@@ -3068,7 +3168,7 @@ em_configure_new_composer (EMsgComposer *composer)
 
 	g_signal_connect (
 		composer, "presend",
-		G_CALLBACK (composer_presend_check_account), NULL);
+		G_CALLBACK (composer_presend_check_identity), NULL);
 
 	g_signal_connect (
 		composer, "presend",
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index bd6eb7c..12a5fa2 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -62,9 +62,6 @@ void		em_utils_handle_receipt		(EMailBackend *backend,
 						 CamelFolder *folder,
 						 const gchar *message_uid,
 						 CamelMimeMessage *message);
-void		em_utils_send_receipt		(EMailBackend *backend,
-						 CamelFolder *folder,
-						 CamelMimeMessage *message);
 gchar *		em_utils_construct_composer_text
 						(CamelMimeMessage *message,
 						 EMFormat *source_formatter);
@@ -72,7 +69,8 @@ gboolean	em_utils_is_munged_list_message	(CamelMimeMessage *message);
 void		em_utils_get_reply_sender	(CamelMimeMessage *message,
 						 CamelInternetAddress *to,
 						 CamelNNTPAddress *postto);
-void		em_utils_get_reply_all		(CamelMimeMessage *message,
+void		em_utils_get_reply_all		(ESourceRegistry *registry,
+						 CamelMimeMessage *message,
 						 CamelInternetAddress *to,
 						 CamelInternetAddress *cc,
 						 CamelNNTPAddress *postto);
diff --git a/mail/em-config.c b/mail/em-config.c
index c9bcf0a..95f1e9e 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -41,13 +41,12 @@
 G_DEFINE_TYPE (EMConfig, em_config, E_TYPE_CONFIG)
 
 struct _EMConfigPrivate {
-	gint account_changed_id;
+	gint source_changed_id;
 };
 
 static void
-emp_account_changed (EAccount *ea,
-                     gint id,
-                     EMConfig *emc)
+emp_source_changed (ESource *source,
+                    EMConfig *emc)
 {
 	e_config_target_changed ((EConfig *) emc, E_CONFIG_TARGET_CHANGED_STATE);
 }
@@ -84,9 +83,9 @@ em_config_set_target (EConfig *ep,
 			EMConfigTargetAccount *s = (EMConfigTargetAccount *) t;
 			EMConfig *config = (EMConfig *) ep;
 
-			config->priv->account_changed_id = g_signal_connect (
-				s->modified_account, "changed",
-				G_CALLBACK (emp_account_changed), ep);
+			config->priv->source_changed_id = g_signal_connect (
+				s->modified_source, "changed",
+				G_CALLBACK (emp_source_changed), ep);
 
 			em_config_target_new_account_update_settings (
 				ep, s, s->settings);
@@ -109,11 +108,11 @@ em_config_target_free (EConfig *ep,
 			EMConfigTargetAccount *s = (EMConfigTargetAccount *) t;
 			EMConfig *config = (EMConfig *) ep;
 
-			if (config->priv->account_changed_id > 0) {
+			if (config->priv->source_changed_id > 0) {
 				g_signal_handler_disconnect (
-					s->modified_account,
-					config->priv->account_changed_id);
-				config->priv->account_changed_id = 0;
+					s->modified_source,
+					config->priv->source_changed_id);
+				config->priv->source_changed_id = 0;
 			}
 
 			em_config_target_new_account_update_settings (ep, s, NULL);
@@ -136,10 +135,10 @@ em_config_target_free (EConfig *ep,
 	case EM_CONFIG_TARGET_ACCOUNT: {
 		EMConfigTargetAccount *s = (EMConfigTargetAccount *) t;
 
-		if (s->original_account != NULL)
-			g_object_unref (s->original_account);
-		if (s->modified_account != NULL)
-			g_object_unref (s->modified_account);
+		if (s->original_source != NULL)
+			g_object_unref (s->original_source);
+		if (s->modified_source != NULL)
+			g_object_unref (s->modified_source);
 		if (s->settings != NULL)
 			g_object_unref (s->settings);
 		break; }
@@ -214,8 +213,8 @@ em_config_target_new_prefs (EMConfig *emp,
 
 EMConfigTargetAccount *
 em_config_target_new_account (EMConfig *emp,
-                              EAccount *original_account,
-                              EAccount *modified_account,
+                              ESource *original_source,
+                              ESource *modified_source,
                               CamelSettings *settings)
 {
 	EMConfigTargetAccount *t;
@@ -223,15 +222,15 @@ em_config_target_new_account (EMConfig *emp,
 	t = e_config_target_new (
 		&emp->config, EM_CONFIG_TARGET_ACCOUNT, sizeof (*t));
 
-	if (original_account != NULL)
-		t->original_account = g_object_ref (original_account);
+	if (original_source != NULL)
+		t->original_source = g_object_ref (original_source);
 	else
-		t->original_account = NULL;
+		t->original_source = NULL;
 
-	if (modified_account != NULL)
-		t->modified_account = g_object_ref (modified_account);
+	if (modified_source != NULL)
+		t->modified_source = g_object_ref (modified_source);
 	else
-		t->modified_account = NULL;
+		t->modified_source = NULL;
 
 	if (settings != NULL)
 		t->settings = g_object_ref (settings);
@@ -254,7 +253,7 @@ em_config_target_new_account_update_settings (EConfig *ep,
 
 	if (target->settings != NULL) {
 		g_signal_handlers_disconnect_by_func (
-			target->settings, emp_account_changed, ep);
+			target->settings, emp_source_changed, ep);
 		g_object_unref (target->settings);
 	}
 
@@ -263,5 +262,5 @@ em_config_target_new_account_update_settings (EConfig *ep,
 	if (target->settings != NULL)
 		g_signal_connect (
 			target->settings, "notify",
-			G_CALLBACK (emp_account_changed), ep);
+			G_CALLBACK (emp_source_changed), ep);
 }
diff --git a/mail/em-config.h b/mail/em-config.h
index dcd5194e..fc342ec 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -25,7 +25,7 @@
 
 #include <camel/camel.h>
 #include <gconf/gconf-client.h>
-#include <libedataserver/e-account.h>
+#include <libedataserver/e-source.h>
 
 #include "e-util/e-config.h"
 
@@ -63,8 +63,8 @@ struct _EMConfigTargetPrefs {
 struct _EMConfigTargetAccount {
 	EConfigTarget target;
 
-	EAccount *original_account;
-	EAccount *modified_account;
+	ESource *original_source;
+	ESource *modified_source;
 	CamelSettings *settings;
 };
 
@@ -90,8 +90,8 @@ EMConfigTargetPrefs *
 						 GConfClient *gconf);
 EMConfigTargetAccount *
 		em_config_target_new_account	(EMConfig *emp,
-						 EAccount *original_account,
-						 EAccount *modified_account,
+						 ESource *original_source,
+						 ESource *modified_source,
 						 CamelSettings *settings);
 void		em_config_target_new_account_update_settings
 						(EConfig *ep,
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index b95c140..3095023 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -33,24 +33,18 @@
 #include <camel/camel.h>
 
 #include <libedataserver/e-sexp.h>
+#include <libedataserver/e-source-mail-account.h>
+#include <libedataserver/e-source-mail-identity.h>
 
-#include <e-util/e-account-utils.h>
+#include <shell/e-shell.h>
 #include <filter/e-filter-part.h>
 
 #define EM_FILTER_SOURCE_ELEMENT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), EM_TYPE_FILTER_SOURCE_ELEMENT, EMFilterSourceElementPrivate))
 
-typedef struct _SourceInfo {
-	gchar *account_name;
-	gchar *name;
-	gchar *address;
-	gchar *uid;
-} SourceInfo;
-
 struct _EMFilterSourceElementPrivate {
 	EMailBackend *backend;
-	GList *sources;
 	gchar *active_id;
 };
 
@@ -65,16 +59,6 @@ enum {
 };
 
 static void
-source_info_free (SourceInfo *info)
-{
-	g_free (info->account_name);
-	g_free (info->name);
-	g_free (info->address);
-	g_free (info->uid);
-	g_free (info);
-}
-
-static void
 filter_source_element_source_changed (GtkComboBox *combo_box,
                                       EMFilterSourceElement *fs)
 {
@@ -87,52 +71,6 @@ filter_source_element_source_changed (GtkComboBox *combo_box,
 }
 
 static void
-filter_source_element_add_source (EMFilterSourceElement *fs,
-                                  const gchar *account_name,
-                                  const gchar *name,
-                                  const gchar *addr,
-                                  const gchar *uid)
-{
-	SourceInfo *info;
-
-	g_return_if_fail (EM_IS_FILTER_SOURCE_ELEMENT (fs));
-
-	info = g_new0 (SourceInfo, 1);
-	info->account_name = g_strdup (account_name);
-	info->name = g_strdup (name);
-	info->address = g_strdup (addr);
-	info->uid = g_strdup (uid);
-
-	fs->priv->sources = g_list_append (fs->priv->sources, info);
-}
-
-static void
-filter_source_element_get_sources (EMFilterSourceElement *fs)
-{
-	EAccountList *accounts;
-	const EAccount *account;
-	EIterator *it;
-
-	/* should this get the global object from mail? */
-	accounts = e_get_account_list ();
-
-	for (it = e_list_get_iterator ((EList *) accounts);
-	     e_iterator_is_valid (it);
-	     e_iterator_next (it)) {
-		account = (const EAccount *) e_iterator_get (it);
-
-		if (account->source == NULL)
-			continue;
-
-		filter_source_element_add_source (
-			fs, account->name, account->id->name,
-			account->id->address, account->uid);
-	}
-
-	g_object_unref (it);
-}
-
-static void
 filter_source_element_set_backend (EMFilterSourceElement *element,
                                    EMailBackend *backend)
 {
@@ -200,8 +138,6 @@ filter_source_element_finalize (GObject *object)
 
 	priv = EM_FILTER_SOURCE_ELEMENT_GET_PRIVATE (object);
 
-	g_list_foreach (priv->sources, (GFunc) source_info_free, NULL);
-	g_list_free (priv->sources);
 	g_free (priv->active_id);
 
 	/* Chain up to parent's finalize() method. */
@@ -309,7 +245,6 @@ filter_source_element_clone (EFilterElement *fe)
 	EMFilterSourceElement *fs = (EMFilterSourceElement *) fe;
 	EMFilterSourceElement *cpy;
 	EMailBackend *backend;
-	GList *i;
 
 	backend = em_filter_source_element_get_backend (fs);
 	cpy = (EMFilterSourceElement *) em_filter_source_element_new (backend);
@@ -317,13 +252,6 @@ filter_source_element_clone (EFilterElement *fe)
 
 	cpy->priv->active_id = g_strdup (fs->priv->active_id);
 
-	for (i = fs->priv->sources; i != NULL; i = g_list_next (i)) {
-		SourceInfo *info = (SourceInfo *) i->data;
-		filter_source_element_add_source (
-			cpy, info->account_name, info->name,
-			info->address, info->uid);
-	}
-
 	return (EFilterElement *) cpy;
 }
 
@@ -331,29 +259,41 @@ static GtkWidget *
 filter_source_element_get_widget (EFilterElement *fe)
 {
 	EMFilterSourceElement *fs = (EMFilterSourceElement *) fe;
+	EShell *shell;
+	EMailBackend *backend;
+	ESourceRegistry *registry;
+	GList *list, *link;
 	GtkWidget *widget;
 	GtkComboBox *combo_box;
-	GList *i;
-
-	if (fs->priv->sources == NULL)
-		filter_source_element_get_sources (fs);
+	const gchar *extension_name;
 
 	widget = gtk_combo_box_text_new ();
 	combo_box = GTK_COMBO_BOX (widget);
 
-	for (i = fs->priv->sources; i != NULL; i = g_list_next (i)) {
-		SourceInfo *info = (SourceInfo *) i->data;
+	backend = em_filter_source_element_get_backend (fs);
+	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
+
+	registry = e_shell_get_registry (shell);
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceMailIdentity *extension;
 		const gchar *display_name;
 		const gchar *address;
 		const gchar *name;
 		const gchar *uid;
 		gchar *label;
 
-		uid = info->uid;
-		display_name = info->account_name;
+		uid = e_source_get_uid (source);
+		display_name = e_source_get_display_name (source);
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_IDENTITY;
+		extension = e_source_get_extension (source, extension_name);
 
-		name = info->name;
-		address = info->address;
+		name = e_source_mail_identity_get_name (extension);
+		address = e_source_mail_identity_get_address (extension);
 
 		if (g_strcmp0 (display_name, address) == 0)
 			label = g_strdup_printf (
@@ -369,6 +309,8 @@ filter_source_element_get_widget (EFilterElement *fe)
 		g_free (label);
 	}
 
+	g_list_free (link);
+
 	if (fs->priv->active_id != NULL) {
 		gtk_combo_box_set_active_id (combo_box, fs->priv->active_id);
 	} else {
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 1e78407..310f1eb 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -36,8 +36,12 @@
 
 #include <glib/gi18n.h>
 
+#include <libedataserver/e-source-mail-account.h>
+#include <libedataserver/e-source-mail-composition.h>
+#include <libedataserver/e-source-mail-identity.h>
+#include <libedataserver/e-source-mail-submission.h>
+
 #include "e-util/e-util.h"
-#include "e-util/e-account-utils.h"
 
 #include "mail-tools.h"
 #include "mail-mt.h"
@@ -67,18 +71,14 @@ struct _EMFolderTreeModelPrivate {
 	 * mimic the sidebar. */
 	GtkTreeSelection *selection;  /* weak reference */
 
-	EAccountList *accounts;
 	EMailBackend *backend;
+	ESourceRegistry *registry;
 
 	/* CamelStore -> EMFolderTreeStoreInfo */
 	GHashTable *store_index;
 
 	/* URI -> GtkTreeRowReference */
 	GHashTable *uri_index;
-
-	gulong account_changed_id;
-	gulong account_removed_id;
-	gulong account_added_id;
 };
 
 enum {
@@ -234,64 +234,102 @@ folder_tree_model_sort (GtkTreeModel *model,
 }
 
 static void
-account_changed_cb (EAccountList *accounts,
-                    EAccount *account,
-                    EMFolderTreeModel *model)
+folder_tree_model_source_added_cb (ESourceRegistry *registry,
+                                   ESource *source,
+                                   EMFolderTreeModel *model)
 {
+	ESourceMailAccount *mail_account;
 	EMailBackend *backend;
 	EMailSession *session;
 	CamelService *service;
+	const gchar *extension_name;
+	const gchar *uid;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	if (!e_source_has_extension (source, extension_name))
+		return;
 
 	backend = em_folder_tree_model_get_backend (model);
 	session = e_mail_backend_get_session (backend);
 
-	service = camel_session_get_service (
-		CAMEL_SESSION (session), account->uid);
+	uid = e_source_get_uid (source);
+	service = camel_session_get_service (CAMEL_SESSION (session), uid);
 
-	if (!CAMEL_IS_STORE (service))
-		return;
+	/* An ESource with a Mail Account extension
+	 * should have a corresponding CamelStore. */
+	g_return_if_fail (CAMEL_IS_STORE (service));
 
 	em_folder_tree_model_remove_store (model, CAMEL_STORE (service));
 
-	/* check if store needs to be added at all*/
-	if (!account->enabled)
+	mail_account = e_source_get_extension (source, extension_name);
+	if (!e_source_mail_account_get_enabled (mail_account))
 		return;
 
 	em_folder_tree_model_add_store (model, CAMEL_STORE (service));
 }
 
 static void
-account_removed_cb (EAccountList *accounts,
-                    EAccount *account,
-                    EMFolderTreeModel *model)
+folder_tree_model_source_removed_cb (ESourceRegistry *registry,
+                                     ESource *source,
+                                     EMFolderTreeModel *model)
 {
 	EMailBackend *backend;
 	EMailSession *session;
 	CamelService *service;
+	const gchar *extension_name;
+	const gchar *uid;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	if (!e_source_has_extension (source, extension_name))
+		return;
 
 	backend = em_folder_tree_model_get_backend (model);
 	session = e_mail_backend_get_session (backend);
 
-	service = camel_session_get_service (
-		CAMEL_SESSION (session), account->uid);
+	uid = e_source_get_uid (source);
+	service = camel_session_get_service (CAMEL_SESSION (session), uid);
 
-	if (!CAMEL_IS_STORE (service))
-		return;
+	/* An ESource with a Mail Account extension
+	 * should have a corresponding CamelStore. */
+	g_return_if_fail (CAMEL_IS_STORE (service));
 
 	em_folder_tree_model_remove_store (model, CAMEL_STORE (service));
 }
 
-/* HACK: FIXME: the component should listen to the account object directly */
 static void
-account_added_cb (EAccountList *accounts,
-                  EAccount *account,
-                  EMFolderTreeModel *model)
+folder_tree_model_source_changed_cb (ESourceRegistry *registry,
+                                     ESource *source,
+                                     EMFolderTreeModel *model)
 {
+	ESourceMailAccount *mail_account;
 	EMailBackend *backend;
+	EMailSession *session;
+	CamelService *service;
+	const gchar *extension_name;
+	const gchar *uid;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	if (!e_source_has_extension (source, extension_name))
+		return;
 
 	backend = em_folder_tree_model_get_backend (model);
+	session = e_mail_backend_get_session (backend);
+
+	uid = e_source_get_uid (source);
+	service = camel_session_get_service (CAMEL_SESSION (session), uid);
 
-	e_mail_store_add_by_account (backend, account);
+	/* The ESource could be anything: a calendar, address book, etc.
+	 * If we can't find a corresponding CamelStore, return silently. */
+	if (!CAMEL_IS_STORE (service))
+		return;
+
+	em_folder_tree_model_remove_store (model, CAMEL_STORE (service));
+
+	mail_account = e_source_get_extension (source, extension_name);
+	if (!e_source_mail_account_get_enabled (mail_account))
+		return;
+
+	em_folder_tree_model_add_store (model, CAMEL_STORE (service));
 }
 
 static void
@@ -492,6 +530,14 @@ folder_tree_model_dispose (GObject *object)
 		priv->backend = NULL;
 	}
 
+	if (priv->registry != NULL) {
+		g_signal_handlers_disconnect_matched (
+			priv->registry, G_SIGNAL_MATCH_DATA,
+			0, 0, NULL, NULL, object);
+		g_object_unref (priv->registry);
+		priv->registry = NULL;
+	}
+
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -506,13 +552,6 @@ folder_tree_model_finalize (GObject *object)
 	g_hash_table_destroy (priv->store_index);
 	g_hash_table_destroy (priv->uri_index);
 
-	g_signal_handler_disconnect (
-		priv->accounts, priv->account_changed_id);
-	g_signal_handler_disconnect (
-		priv->accounts, priv->account_removed_id);
-	g_signal_handler_disconnect (
-		priv->accounts, priv->account_added_id);
-
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -520,8 +559,6 @@ folder_tree_model_finalize (GObject *object)
 static void
 folder_tree_model_constructed (GObject *object)
 {
-	EMFolderTreeModelPrivate *priv;
-
 	GType col_types[] = {
 		G_TYPE_STRING,   /* display name */
 		G_TYPE_POINTER,  /* store object */
@@ -538,8 +575,6 @@ folder_tree_model_constructed (GObject *object)
 		G_TYPE_UINT	 /* user's sortorder */
 	};
 
-	priv = EM_FOLDER_TREE_MODEL_GET_PRIVATE (object);
-
 	gtk_tree_store_set_column_types (
 		GTK_TREE_STORE (object), NUM_COLUMNS, col_types);
 	gtk_tree_sortable_set_default_sort_func (
@@ -550,17 +585,6 @@ folder_tree_model_constructed (GObject *object)
 		GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
 		GTK_SORT_ASCENDING);
 
-	priv->accounts = e_get_account_list ();
-	priv->account_changed_id = g_signal_connect (
-		priv->accounts, "account-changed",
-		G_CALLBACK (account_changed_cb), object);
-	priv->account_removed_id = g_signal_connect (
-		priv->accounts, "account-removed",
-		G_CALLBACK (account_removed_cb), object);
-	priv->account_added_id = g_signal_connect (
-		priv->accounts, "account-added",
-		G_CALLBACK (account_added_cb), object);
-
 	/* Chain up to parent's constructed() method. */
 	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
@@ -681,6 +705,8 @@ folder_tree_model_set_unread_count (EMFolderTreeModel *model,
 static void
 em_folder_tree_model_init (EMFolderTreeModel *model)
 {
+	EShell *shell;
+	ESourceRegistry *registry;
 	GHashTable *store_index;
 	GHashTable *uri_index;
 
@@ -697,6 +723,22 @@ em_folder_tree_model_init (EMFolderTreeModel *model)
 	model->priv = EM_FOLDER_TREE_MODEL_GET_PRIVATE (model);
 	model->priv->store_index = store_index;
 	model->priv->uri_index = uri_index;
+
+	/* Keep our own reference to the ESourceRegistry, since we
+	 * need to disconnect signal handlers for it in dispose(). */
+	shell = e_shell_get_default ();
+	registry = e_shell_get_registry (shell);
+	model->priv->registry =  g_object_ref (registry);
+
+	g_signal_connect (
+		registry, "source-added",
+		G_CALLBACK (folder_tree_model_source_added_cb), model);
+	g_signal_connect (
+		registry, "source-removed",
+		G_CALLBACK (folder_tree_model_source_removed_cb), model);
+	g_signal_connect (
+		registry, "source-changed",
+		G_CALLBACK (folder_tree_model_source_changed_cb), model);
 }
 
 EMFolderTreeModel *
@@ -824,9 +866,10 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 	GtkTreeRowReference *uri_row, *path_row;
 	GtkTreeStore *tree_store;
 	MailFolderCache *folder_cache;
+	ESourceRegistry *registry;
 	EMailBackend *backend;
 	EMailSession *session;
-	EAccount *account;
+	ESource *source;
 	guint unread;
 	GtkTreePath *path;
 	GtkTreeIter sub;
@@ -847,6 +890,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 	if (g_hash_table_lookup (si->full_hash, fi->full_name))
 		return;
 
+	registry = model->priv->registry;
 	tree_store = GTK_TREE_STORE (model);
 
 	backend = em_folder_tree_model_get_backend (model);
@@ -854,7 +898,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 	folder_cache = e_mail_session_get_folder_cache (session);
 
 	uid = camel_service_get_uid (CAMEL_SERVICE (si->store));
-	account = e_get_account_by_uid (uid);
+	source = e_source_registry_lookup_by_uid (registry, uid);
 
 	if (!fully_loaded)
 		load = (fi->child == NULL) && !(fi->flags &
@@ -881,8 +925,8 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 	unread = fi->unread;
 	if (mail_folder_cache_get_folder_from_uri (
 		folder_cache, uri, &folder) && folder) {
-		folder_is_drafts = em_utils_folder_is_drafts (folder);
-		folder_is_outbox = em_utils_folder_is_outbox (folder);
+		folder_is_drafts = em_utils_folder_is_drafts (registry, folder);
+		folder_is_outbox = em_utils_folder_is_outbox (registry, folder);
 
 		if (folder_is_drafts || folder_is_outbox) {
 			gint total;
@@ -925,17 +969,43 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 		}
 	}
 
-	if (account != NULL && (flags & CAMEL_FOLDER_TYPE_MASK) == 0) {
-		if (!folder_is_drafts && account->drafts_folder_uri != NULL) {
+	if (source != NULL && (flags & CAMEL_FOLDER_TYPE_MASK) == 0) {
+		ESource *identity;
+		ESourceExtension *extension;
+		const gchar *extension_name;
+		const gchar *drafts_folder_uri;
+		const gchar *sent_folder_uri;
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+		extension = e_source_get_extension (source, extension_name);
+
+		identity = e_source_mail_account_get_identity (
+			E_SOURCE_MAIL_ACCOUNT (extension));
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_COMPOSITION;
+		extension = e_source_get_extension (identity, extension_name);
+
+		drafts_folder_uri =
+			e_source_mail_composition_get_drafts_folder (
+			E_SOURCE_MAIL_COMPOSITION (extension));
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+		extension = e_source_get_extension (identity, extension_name);
+
+		sent_folder_uri =
+			e_source_mail_submission_get_sent_folder (
+			E_SOURCE_MAIL_SUBMISSION (extension));
+
+		if (!folder_is_drafts && drafts_folder_uri != NULL) {
 			folder_is_drafts = e_mail_folder_uri_equal (
-				CAMEL_SESSION (session), uri,
-				account->drafts_folder_uri);
+				CAMEL_SESSION (session),
+				uri, drafts_folder_uri);
 		}
 
-		if (account->sent_folder_uri != NULL) {
+		if (sent_folder_uri != NULL) {
 			if (e_mail_folder_uri_equal (
-				CAMEL_SESSION (session), uri,
-				account->sent_folder_uri)) {
+				CAMEL_SESSION (session),
+				uri, sent_folder_uri)) {
 				add_flags = CAMEL_FOLDER_TYPE_SENT;
 			}
 		}
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 09b74bc..7984bc4 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -25,14 +25,16 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
+#include <libedataserver/e-source-registry.h>
+
 #include "mail-tools.h"
 #include "mail-ops.h"
 #include "mail-mt.h"
 
 #include <e-util/e-util.h>
-#include <e-util/e-account-utils.h>
 #include <e-util/e-util-private.h>
 #include <e-util/gconf-bridge.h>
+#include <shell/e-shell.h>
 
 #include "em-folder-utils.h"
 
@@ -1042,19 +1044,26 @@ subscription_editor_constructed (GObject *object)
 	/* Pick an initial store based on the default mail account, if
 	 * one wasn't already given in em_subscription_editor_new(). */
 	if (editor->priv->initial_store == NULL) {
-		EAccount *account;
+		EShell *shell;
+		ESource *source;
+		ESourceRegistry *registry;
+		EShellBackend *shell_backend;
 		CamelService *service;
 		EMailBackend *backend;
 		EMailSession *session;
 
-		account = e_get_default_account ();
-
 		backend = em_subscription_editor_get_backend (editor);
 		session = e_mail_backend_get_session (backend);
 
+		shell_backend = E_SHELL_BACKEND (backend);
+		shell = e_shell_backend_get_shell (shell_backend);
+		registry = e_shell_get_registry (shell);
+
+		source = e_source_registry_get_default_mail_account (registry);
+
 		service = camel_session_get_service (
 			CAMEL_SESSION (session),
-			account->uid);
+			e_source_get_uid (source));
 
 		if (CAMEL_IS_SUBSCRIBABLE (service))
 			editor->priv->initial_store = g_object_ref (service);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 6797888..f830e09 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -55,13 +55,18 @@
 #include "mail-tools.h"
 #include "e-mail-tag-editor.h"
 
+#include <libebook/e-source-address-book.h>
+#include <libedataserver/e-source-autocomplete.h>
+#include <libedataserver/e-source-mail-account.h>
+#include <libedataserver/e-source-mail-composition.h>
+#include <libedataserver/e-source-mail-identity.h>
+#include <libedataserver/e-source-mail-submission.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-flag.h>
 #include <libedataserver/e-proxy.h>
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-mktemp.h"
-#include "e-util/e-account-utils.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-alert-dialog.h"
 #include "shell/e-shell.h"
@@ -219,33 +224,6 @@ em_utils_uids_free (GPtrArray *uids)
 	g_ptr_array_free (uids, TRUE);
 }
 
-/**
- * em_utils_check_user_can_send_mail:
- *
- * Returns %TRUE if the user has an account configured (to send mail)
- * or %FALSE otherwise.
- **/
-gboolean
-em_utils_check_user_can_send_mail (void)
-{
-	EAccountList *account_list;
-	EAccount *account;
-
-	account_list = e_get_account_list ();
-
-	if (e_list_length (E_LIST (account_list)) == 0)
-		return FALSE;
-
-	if (!(account = e_get_default_account ()))
-		return FALSE;
-
-	/* Check for a transport */
-	if (!account->transport->url)
-		return FALSE;
-
-	return TRUE;
-}
-
 /* Editing Filters/Search Folders... */
 
 static GtkWidget *filter_editor = NULL;
@@ -1005,6 +983,7 @@ em_utils_selection_get_urilist (GtkSelectionData *selection_data,
 
 /**
  * em_utils_folder_is_templates:
+ * @registry: an #ESourceRegistry
  * @folder: a #CamelFolder
  *
  * Decides if @folder is a Templates folder.
@@ -1013,15 +992,16 @@ em_utils_selection_get_urilist (GtkSelectionData *selection_data,
  **/
 
 gboolean
-em_utils_folder_is_templates (CamelFolder *folder)
+em_utils_folder_is_templates (ESourceRegistry *registry,
+                              CamelFolder *folder)
 {
 	CamelFolder *local_templates_folder;
 	CamelSession *session;
 	CamelStore *store;
-	EAccountList *account_list;
-	EIterator *iterator;
+	GList *list, *iter;
 	gchar *folder_uri;
 	gboolean is_templates = FALSE;
+	const gchar *extension_name;
 
 	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
 
@@ -1036,24 +1016,29 @@ em_utils_folder_is_templates (CamelFolder *folder)
 	store = camel_folder_get_parent_store (folder);
 	session = camel_service_get_session (CAMEL_SERVICE (store));
 
-	account_list = e_get_account_list ();
-	iterator = e_list_get_iterator (E_LIST (account_list));
+	extension_name = E_SOURCE_EXTENSION_MAIL_COMPOSITION;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (iter = list; iter != NULL; iter = g_list_next (iter)) {
+		ESource *source = E_SOURCE (iter->data);
+		ESourceExtension *extension;
+		const gchar *templates_folder_uri;
 
-	while (!is_templates && e_iterator_is_valid (iterator)) {
-		EAccount *account;
+		extension = e_source_get_extension (source, extension_name);
 
-		/* XXX EIterator misuses const. */
-		account = (EAccount *) e_iterator_get (iterator);
+		templates_folder_uri =
+			e_source_mail_composition_get_templates_folder (
+			E_SOURCE_MAIL_COMPOSITION (extension));
 
-		if (account->templates_folder_uri != NULL)
+		if (templates_folder_uri != NULL)
 			is_templates = e_mail_folder_uri_equal (
-				session, folder_uri,
-				account->templates_folder_uri);
+				session, folder_uri, templates_folder_uri);
 
-		e_iterator_next (iterator);
+		if (is_templates)
+			break;
 	}
 
-	g_object_unref (iterator);
+	g_list_free (list);
 	g_free (folder_uri);
 
 	return is_templates;
@@ -1061,6 +1046,7 @@ em_utils_folder_is_templates (CamelFolder *folder)
 
 /**
  * em_utils_folder_is_drafts:
+ * @registry: an #ESourceRegistry
  * @folder: a #CamelFolder
  *
  * Decides if @folder is a Drafts folder.
@@ -1068,15 +1054,16 @@ em_utils_folder_is_templates (CamelFolder *folder)
  * Returns %TRUE if this is a Drafts folder or %FALSE otherwise.
  **/
 gboolean
-em_utils_folder_is_drafts (CamelFolder *folder)
+em_utils_folder_is_drafts (ESourceRegistry *registry,
+                           CamelFolder *folder)
 {
 	CamelFolder *local_drafts_folder;
 	CamelSession *session;
 	CamelStore *store;
-	EAccountList *account_list;
-	EIterator *iterator;
+	GList *list, *iter;
 	gchar *folder_uri;
 	gboolean is_drafts = FALSE;
+	const gchar *extension_name;
 
 	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
 
@@ -1091,24 +1078,29 @@ em_utils_folder_is_drafts (CamelFolder *folder)
 	store = camel_folder_get_parent_store (folder);
 	session = camel_service_get_session (CAMEL_SERVICE (store));
 
-	account_list = e_get_account_list ();
-	iterator = e_list_get_iterator (E_LIST (account_list));
+	extension_name = E_SOURCE_EXTENSION_MAIL_COMPOSITION;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (iter = list; iter != NULL; iter = g_list_next (iter)) {
+		ESource *source = E_SOURCE (iter->data);
+		ESourceExtension *extension;
+		const gchar *drafts_folder_uri;
 
-	while (!is_drafts && e_iterator_is_valid (iterator)) {
-		EAccount *account;
+		extension = e_source_get_extension (source, extension_name);
 
-		/* XXX EIterator misuses const. */
-		account = (EAccount *) e_iterator_get (iterator);
+		drafts_folder_uri =
+			e_source_mail_composition_get_drafts_folder (
+			E_SOURCE_MAIL_COMPOSITION (extension));
 
-		if (account->drafts_folder_uri != NULL)
+		if (drafts_folder_uri != NULL)
 			is_drafts = e_mail_folder_uri_equal (
-				session, folder_uri,
-				account->drafts_folder_uri);
+				session, folder_uri, drafts_folder_uri);
 
-		e_iterator_next (iterator);
+		if (is_drafts)
+			break;
 	}
 
-	g_object_unref (iterator);
+	g_list_free (list);
 	g_free (folder_uri);
 
 	return is_drafts;
@@ -1116,6 +1108,7 @@ em_utils_folder_is_drafts (CamelFolder *folder)
 
 /**
  * em_utils_folder_is_sent:
+ * @registry: an #ESourceRegistry
  * @folder: a #CamelFolder
  *
  * Decides if @folder is a Sent folder.
@@ -1123,15 +1116,16 @@ em_utils_folder_is_drafts (CamelFolder *folder)
  * Returns %TRUE if this is a Sent folder or %FALSE otherwise.
  **/
 gboolean
-em_utils_folder_is_sent (CamelFolder *folder)
+em_utils_folder_is_sent (ESourceRegistry *registry,
+                         CamelFolder *folder)
 {
 	CamelFolder *local_sent_folder;
 	CamelSession *session;
 	CamelStore *store;
-	EAccountList *account_list;
-	EIterator *iterator;
+	GList *list, *iter;
 	gchar *folder_uri;
 	gboolean is_sent = FALSE;
+	const gchar *extension_name;
 
 	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
 
@@ -1146,24 +1140,29 @@ em_utils_folder_is_sent (CamelFolder *folder)
 	store = camel_folder_get_parent_store (folder);
 	session = camel_service_get_session (CAMEL_SERVICE (store));
 
-	account_list = e_get_account_list ();
-	iterator = e_list_get_iterator (E_LIST (account_list));
+	extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (iter = list; iter != NULL; iter = g_list_next (iter)) {
+		ESource *source = E_SOURCE (iter->data);
+		ESourceExtension *extension;
+		const gchar *sent_folder_uri;
 
-	while (!is_sent && e_iterator_is_valid (iterator)) {
-		EAccount *account;
+		extension = e_source_get_extension (source, extension_name);
 
-		/* XXX EIterator misuses const. */
-		account = (EAccount *) e_iterator_get (iterator);
+		sent_folder_uri =
+			e_source_mail_submission_get_sent_folder (
+			E_SOURCE_MAIL_SUBMISSION (extension));
 
-		if (account->sent_folder_uri != NULL)
+		if (sent_folder_uri != NULL)
 			is_sent = e_mail_folder_uri_equal (
-				session, folder_uri,
-				account->sent_folder_uri);
+				session, folder_uri, sent_folder_uri);
 
-		e_iterator_next (iterator);
+		if (is_sent)
+			break;
 	}
 
-	g_object_unref (iterator);
+	g_list_free (list);
 	g_free (folder_uri);
 
 	return is_sent;
@@ -1171,6 +1170,7 @@ em_utils_folder_is_sent (CamelFolder *folder)
 
 /**
  * em_utils_folder_is_outbox:
+ * @registry: an #ESourceRegistry
  * @folder: a #CamelFolder
  *
  * Decides if @folder is an Outbox folder.
@@ -1178,7 +1178,8 @@ em_utils_folder_is_sent (CamelFolder *folder)
  * Returns %TRUE if this is an Outbox folder or %FALSE otherwise.
  **/
 gboolean
-em_utils_folder_is_outbox (CamelFolder *folder)
+em_utils_folder_is_outbox (ESourceRegistry *registry,
+                           CamelFolder *folder)
 {
 	CamelFolder *local_outbox_folder;
 
@@ -1325,10 +1326,17 @@ em_utils_empty_trash (GtkWidget *parent,
                       EMailBackend *backend)
 {
 	EMailSession *session;
+	ESourceRegistry *registry;
+	EShellBackend *shell_backend;
+	EShell *shell;
 	GList *list, *iter;
 
 	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
 
+	shell_backend = E_SHELL_BACKEND (backend);
+	shell = e_shell_backend_get_shell (shell_backend);
+	registry = e_shell_get_registry (shell);
+
 	if (!em_utils_prompt_user ((GtkWindow *) parent,
 		"/apps/evolution/mail/prompts/empty_trash",
 		"mail:ask-empty-trash", NULL))
@@ -1338,9 +1346,9 @@ em_utils_empty_trash (GtkWidget *parent,
 	list = camel_session_list_services (CAMEL_SESSION (session));
 
 	for (iter = list; iter != NULL; iter = g_list_next (iter)) {
-		EAccount *account;
 		CamelProvider *provider;
 		CamelService *service;
+		ESource *source;
 		const gchar *uid;
 
 		service = CAMEL_SERVICE (iter->data);
@@ -1353,12 +1361,20 @@ em_utils_empty_trash (GtkWidget *parent,
 		if ((provider->flags & CAMEL_PROVIDER_IS_STORAGE) == 0)
 			continue;
 
-		account = e_get_account_by_uid (uid);
+		source = e_source_registry_lookup_by_uid (registry, uid);
 
 		/* The local store has no corresponding
-		 * EAccount, so skip the enabled check. */
-		if (account != NULL) {
-			if (!account->enabled)
+		 * ESource, so skip the enabled check. */
+		if (source != NULL) {
+			ESourceExtension *extension;
+			gboolean enabled;
+
+			extension = e_source_get_extension (
+				source, E_SOURCE_EXTENSION_MAIL_ACCOUNT);
+			enabled = e_source_mail_account_get_enabled (
+				E_SOURCE_MAIL_ACCOUNT (extension));
+
+			if (!enabled)
 				continue;
 		}
 
@@ -1370,19 +1386,6 @@ em_utils_empty_trash (GtkWidget *parent,
 
 /* ********************************************************************** */
 
-/* runs sync, in main thread */
-static gpointer
-emu_addr_setup (gpointer user_data)
-{
-	GError *err = NULL;
-	ESourceList **psource_list = user_data;
-
-	if (!e_book_client_get_sources (psource_list, &err))
-		g_error_free (err);
-
-	return NULL;
-}
-
 static void
 emu_addr_cancel_stop (gpointer data)
 {
@@ -1498,8 +1501,6 @@ static GHashTable *emu_books_hash = NULL;
  * broken books, which failed to open for some reason */
 static GHashTable *emu_broken_books_hash = NULL;
 
-static ESourceList *emu_books_source_list = NULL;
-
 static gboolean
 search_address_in_addressbooks (const gchar *address,
                                 gboolean local_only,
@@ -1507,24 +1508,25 @@ search_address_in_addressbooks (const gchar *address,
                                                            gpointer user_data),
                                 gpointer user_data)
 {
+	EShell *shell;
+	ESourceRegistry *registry;
+	GList *list, *link;
+	GList *addr_sources = NULL;
 	gboolean found = FALSE, stop = FALSE, found_any = FALSE;
 	gchar *lowercase_addr;
 	gpointer ptr;
 	EBookQuery *book_query;
 	gchar *query;
-	GSList *s, *g, *addr_sources = NULL;
 	GHook *hook_cancellable;
 	GCancellable *cancellable;
+	const gchar *extension_name;
 
 	if (!address || !*address)
 		return FALSE;
 
 	G_LOCK (contact_cache);
 
-	if (!emu_books_source_list) {
-		mail_call_main (
-			MAIL_CALL_p_p, (MailMainFunc)
-			emu_addr_setup, &emu_books_source_list);
+	if (emu_books_hash == NULL) {
 		emu_books_hash = g_hash_table_new_full (
 			g_str_hash, g_str_equal, g_free, g_object_unref);
 		emu_broken_books_hash = g_hash_table_new_full (
@@ -1533,11 +1535,6 @@ search_address_in_addressbooks (const gchar *address,
 			g_str_hash, g_str_equal, g_free, NULL);
 	}
 
-	if (!emu_books_source_list) {
-		G_UNLOCK (contact_cache);
-		return FALSE;
-	}
-
 	lowercase_addr = g_utf8_strdown (address, -1);
 	ptr = g_hash_table_lookup (contact_cache, lowercase_addr);
 	if (ptr != NULL && (check_contact == NULL || ptr == NOT_FOUND_BOOK)) {
@@ -1550,44 +1547,60 @@ search_address_in_addressbooks (const gchar *address,
 	query = e_book_query_to_string (book_query);
 	e_book_query_unref (book_query);
 
-	for (g = e_source_list_peek_groups (emu_books_source_list);
-			g; g = g_slist_next (g)) {
-		ESourceGroup *group = g->data;
+	/* FIXME: Pass the ESourceRegistry in. */
+	shell = e_shell_get_default ();
+	registry = e_shell_get_registry (shell);
+	extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
+	list = e_source_registry_list_sources (registry, extension_name);
 
-		if (!group)
-			continue;
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceExtension *extension;
+		const gchar *backend_name;
+		gboolean source_is_local;
+		gboolean autocomplete;
+
+		backend_name = e_source_get_backend_name (source);
+		source_is_local = (g_strcmp0 (backend_name, "local") == 0);
 
-		if (local_only && !(e_source_group_peek_base_uri (group) &&
-			g_str_has_prefix (
-			e_source_group_peek_base_uri (group), "local:")))
+		if (local_only && !source_is_local)
 			continue;
 
-		for (s = e_source_group_peek_sources (group); s; s = g_slist_next (s)) {
-			ESource *source = s->data;
-			const gchar *completion = e_source_get_property (source, "completion");
+		extension_name = E_SOURCE_EXTENSION_AUTOCOMPLETE;
+		extension = e_source_get_extension (source, extension_name);
 
-			if (completion && g_ascii_strcasecmp (completion, "true") == 0) {
-				addr_sources = g_slist_prepend (addr_sources, g_object_ref (source));
-			}
-		}
+		autocomplete = e_source_autocomplete_get_include_me (
+			E_SOURCE_AUTOCOMPLETE (extension));
+
+		if (!autocomplete)
+			continue;
+
+		addr_sources = g_list_prepend (
+			addr_sources, g_object_ref (source));
 	}
 
+	g_list_free (list);
+
 	cancellable = g_cancellable_new ();
 	hook_cancellable = mail_cancel_hook_add (emu_addr_cancel_cancellable, cancellable);
 
-	for (s = addr_sources; !stop && !found && s; s = g_slist_next (s)) {
-		ESource *source = s->data;
+	for (link = addr_sources; !stop && !found && link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
 		GSList *contacts;
 		EBookClient *book_client = NULL;
 		GHook *hook_stop;
 		gboolean cached_book = FALSE;
 		GError *err = NULL;
+		const gchar *display_name;
+		const gchar *uid;
+
+		uid = e_source_get_uid (source);
+		display_name = e_source_get_display_name (source);
 
 		/* failed to load this book last time, skip it now */
-		if (g_hash_table_lookup (emu_broken_books_hash,
-				e_source_peek_uid (source)) != NULL) {
+		if (g_hash_table_lookup (emu_broken_books_hash, uid) != NULL) {
 			d(printf ("%s: skipping broken book '%s'\n",
-				G_STRFUNC, e_source_peek_name (source)));
+				G_STRFUNC, display_name));
 			continue;
 		}
 
@@ -1595,7 +1608,7 @@ search_address_in_addressbooks (const gchar *address,
 
 		hook_stop = mail_cancel_hook_add (emu_addr_cancel_stop, &stop);
 
-		book_client = g_hash_table_lookup (emu_books_hash, e_source_peek_uid (source));
+		book_client = g_hash_table_lookup (emu_books_hash, uid);
 		if (!book_client) {
 			book_client = e_book_client_new (source, &err);
 
@@ -1606,8 +1619,7 @@ search_address_in_addressbooks (const gchar *address,
 				} else if (err) {
 					gchar *source_uid;
 
-					source_uid = g_strdup (
-						e_source_peek_uid (source));
+					source_uid = g_strdup (uid);
 
 					g_hash_table_insert (
 						emu_broken_books_hash,
@@ -1616,7 +1628,7 @@ search_address_in_addressbooks (const gchar *address,
 					g_warning (
 						"%s: Unable to create addressbook '%s': %s",
 						G_STRFUNC,
-						e_source_peek_name (source),
+						display_name,
 						err->message);
 				}
 				g_clear_error (&err);
@@ -1630,8 +1642,7 @@ search_address_in_addressbooks (const gchar *address,
 				} else if (err) {
 					gchar *source_uid;
 
-					source_uid = g_strdup (
-						e_source_peek_uid (source));
+					source_uid = g_strdup (uid);
 
 					g_hash_table_insert (
 						emu_broken_books_hash,
@@ -1640,7 +1651,7 @@ search_address_in_addressbooks (const gchar *address,
 					g_warning (
 						"%s: Unable to open addressbook '%s': %s",
 						G_STRFUNC,
-						e_source_peek_name (source),
+						display_name,
 						err->message);
 				}
 				g_clear_error (&err);
@@ -1676,13 +1687,14 @@ search_address_in_addressbooks (const gchar *address,
 			    (g_error_matches (err, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) ||
 			     g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)));
 			if (err && !stop) {
-				gchar *source_uid = g_strdup (e_source_peek_uid (source));
+				gchar *source_uid = g_strdup (uid);
 
 				g_hash_table_insert (emu_broken_books_hash, source_uid, source_uid);
 
 				g_warning (
 					"%s: Can't get contacts from '%s': %s",
-					G_STRFUNC, e_source_peek_name (source),
+					G_STRFUNC,
+					display_name,
 					err->message);
 			}
 			g_clear_error (&err);
@@ -1696,16 +1708,14 @@ search_address_in_addressbooks (const gchar *address,
 			g_object_unref (book_client);
 		} else if (!stop && book_client && !cached_book) {
 			g_hash_table_insert (
-				emu_books_hash, g_strdup (
-				e_source_peek_uid (source)), book_client);
+				emu_books_hash, g_strdup (uid), book_client);
 		}
 	}
 
 	mail_cancel_hook_remove (hook_cancellable);
 	g_object_unref (cancellable);
 
-	g_slist_foreach (addr_sources, (GFunc) g_object_unref, NULL);
-	g_slist_free (addr_sources);
+	g_list_free_full (addr_sources, (GDestroyNotify) g_object_unref);
 
 	g_free (query);
 
@@ -1922,11 +1932,6 @@ emu_free_mail_cache (void)
 		emu_broken_books_hash = NULL;
 	}
 
-	if (emu_books_source_list) {
-		g_object_unref (emu_books_source_list);
-		emu_books_source_list = NULL;
-	}
-
 	if (contact_cache) {
 		g_hash_table_destroy (contact_cache);
 		contact_cache = NULL;
@@ -1945,29 +1950,6 @@ emu_free_mail_cache (void)
 	free_account_sort_order_cache ();
 }
 
-void
-em_utils_clear_get_password_canceled_accounts_flag (void)
-{
-	EAccountList *account_list;
-	EIterator *iterator;
-
-	account_list = e_get_account_list ();
-
-	for (iterator = e_list_get_iterator (E_LIST (account_list));
-	     e_iterator_is_valid (iterator);
-	     e_iterator_next (iterator)) {
-		EAccount *account = (EAccount *) e_iterator_get (iterator);
-
-		if (account && account->source)
-			account->source->get_password_canceled = FALSE;
-
-		if (account && account->transport)
-			account->transport->get_password_canceled = FALSE;
-	}
-
-	g_object_unref (iterator);
-}
-
 gchar *
 em_utils_url_unescape_amp (const gchar *url)
 {
@@ -1999,128 +1981,265 @@ em_utils_url_unescape_amp (const gchar *url)
 	return buff;
 }
 
-static EAccount *
-guess_account_from_folder (CamelFolder *folder)
+static ESource *
+guess_mail_account_from_folder (ESourceRegistry *registry,
+                                CamelFolder *folder)
 {
+	ESource *source;
 	CamelStore *store;
 	const gchar *uid;
 
+	/* Lookup an ESource by CamelStore UID. */
 	store = camel_folder_get_parent_store (folder);
 	uid = camel_service_get_uid (CAMEL_SERVICE (store));
+	source = e_source_registry_lookup_by_uid (registry, uid);
+
+	/* If we found an ESource, make sure it's a mail account. */
+	if (source != NULL) {
+		const gchar *extension_name;
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+		if (!e_source_has_extension (source, extension_name))
+			source = NULL;
+	}
 
-	return e_get_account_by_uid (uid);
+	return source;
 }
 
-static EAccount *
-guess_account_from_message (CamelMimeMessage *message)
+static ESource *
+guess_mail_account_from_message (ESourceRegistry *registry,
+                                 CamelMimeMessage *message)
 {
+	ESource *source = NULL;
 	const gchar *uid;
 
+	/* Lookup an ESource by 'X-Evolution-Source' header. */
 	uid = camel_mime_message_get_source (message);
+	if (uid != NULL)
+		source = e_source_registry_lookup_by_uid (registry, uid);
+
+	/* If we found an ESource, make sure it's a mail account. */
+	if (source != NULL) {
+		const gchar *extension_name;
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+		if (!e_source_has_extension (source, extension_name))
+			source = NULL;
+	}
 
-	return (uid != NULL) ? e_get_account_by_uid (uid) : NULL;
+	return source;
 }
 
 GHashTable *
-em_utils_generate_account_hash (void)
+em_utils_generate_account_hash (ESourceRegistry *registry)
 {
 	GHashTable *account_hash;
-	EAccount *account, *def;
-	EAccountList *account_list;
-	EIterator *iterator;
-
-	account_list = e_get_account_list ();
-	account_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-
-	def = e_get_default_account ();
-
-	iterator = e_list_get_iterator (E_LIST (account_list));
-
-	while (e_iterator_is_valid (iterator)) {
-		account = (EAccount *) e_iterator_get (iterator);
-
-		if (account->id->address) {
-			EAccount *acnt;
-
-			/* Accounts with identical email addresses that are
-			 * enabled take precedence over the accounts that
-			 * aren't. If all accounts with matching email
-			 * addresses are disabled, then the first one in
-			 * the list takes precedence. The default account
-			 * always takes precedence no matter what. */
-			acnt = g_hash_table_lookup (
-				account_hash, account->id->address);
-			if (acnt && acnt != def && !acnt->enabled && account->enabled) {
-				g_hash_table_remove (
-					account_hash, acnt->id->address);
-				acnt = NULL;
-			}
+	ESource *default_source;
+	GList *list, *link;
+	const gchar *extension_name;
+
+	g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL);
+
+	account_hash = g_hash_table_new_full (
+		(GHashFunc) camel_strcase_hash,
+		(GEqualFunc) camel_strcase_equal,
+		(GDestroyNotify) g_free,
+		(GDestroyNotify) g_object_unref);
+
+	default_source = e_source_registry_get_default_mail_account (registry);
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESource *cached_source;
+		ESource *identity_source;
+		ESourceExtension *extension;
+		const gchar *address;
+		gboolean insert_source;
+		gboolean cached_is_default;
+		gboolean cached_is_enabled;
+		gboolean source_is_default;
+		gboolean source_is_enabled;
 
-			if (!acnt)
-				g_hash_table_insert (
-					account_hash, (gchar *)
-					account->id->address,
-					(gpointer) account);
+		source_is_default = e_source_equal (source, default_source);
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+		extension = e_source_get_extension (source, extension_name);
+
+		source_is_enabled = e_source_mail_account_get_enabled (
+			E_SOURCE_MAIL_ACCOUNT (extension));
+
+		identity_source = e_source_mail_account_get_identity (
+			E_SOURCE_MAIL_ACCOUNT (extension));
+
+		if (identity_source == NULL)
+			continue;
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_IDENTITY;
+		extension = e_source_get_extension (
+			identity_source, extension_name);
+
+		address = e_source_mail_identity_get_address (
+			E_SOURCE_MAIL_IDENTITY (extension));
+
+		if (address == NULL)
+			continue;
+
+		cached_source = g_hash_table_lookup (account_hash, address);
+
+		if (cached_source != NULL) {
+			cached_is_default = e_source_equal (
+				cached_source, default_source);
+			extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+			extension = e_source_get_extension (
+				cached_source, extension_name);
+			cached_is_enabled =
+				e_source_mail_account_get_enabled (
+				E_SOURCE_MAIL_ACCOUNT (extension));
+		} else {
+			cached_is_default = FALSE;
+			cached_is_enabled = FALSE;
 		}
 
-		e_iterator_next (iterator);
+		/* Accounts with identical email addresses that are enabled
+		 * take precedence over disabled accounts.  If all accounts
+		 * with matching email addresses are disabled, the first
+		 * one in the list takes precedence.  The default account
+		 * always takes precedence no matter what. */
+		insert_source =
+			source_is_default ||
+			cached_source == NULL ||
+			(source_is_enabled &&
+			 !cached_is_enabled &&
+			 !cached_is_default);
+
+		if (insert_source)
+			g_hash_table_insert (
+				account_hash,
+				g_strdup (address),
+				g_object_ref (source));
 	}
 
-	g_object_unref (iterator);
-
-	/* The default account has to be there if none
-	 * of the enabled accounts are present. */
-	if (g_hash_table_size (account_hash) == 0 && def && def->id->address)
-		g_hash_table_insert (
-			account_hash, (gchar *)
-			def->id->address,
-			(gpointer) def);
+	g_list_free (list);
 
 	return account_hash;
 }
 
-EAccount *
-em_utils_guess_account (CamelMimeMessage *message,
-                        CamelFolder *folder)
+ESource *
+em_utils_guess_mail_account (ESourceRegistry *registry,
+                             CamelMimeMessage *message,
+                             CamelFolder *folder)
 {
-	EAccount *account = NULL;
+	ESource *source = NULL;
+	const gchar *newsgroups;
 
+	g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL);
 	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
 
 	if (folder != NULL)
 		g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
 
 	/* check for newsgroup header */
-	if (folder != NULL
-	    && camel_medium_get_header (CAMEL_MEDIUM (message), "Newsgroups"))
-		account = guess_account_from_folder (folder);
+	newsgroups = camel_medium_get_header (
+		CAMEL_MEDIUM (message), "Newsgroups");
+	if (folder != NULL && newsgroups != NULL)
+		source = guess_mail_account_from_folder (registry, folder);
 
 	/* check for source folder */
-	if (account == NULL && folder != NULL)
-		account = guess_account_from_folder (folder);
+	if (source == NULL && folder != NULL)
+		source = guess_mail_account_from_folder (registry, folder);
 
 	/* then message source */
-	if (account == NULL)
-		account = guess_account_from_message (message);
+	if (source == NULL)
+		source = guess_mail_account_from_message (registry, message);
 
-	return account;
+	return source;
 }
 
-EAccount *
-em_utils_guess_account_with_recipients (CamelMimeMessage *message,
-                                        CamelFolder *folder)
+ESource *
+em_utils_guess_mail_identity (ESourceRegistry *registry,
+                              CamelMimeMessage *message,
+                              CamelFolder *folder)
 {
-	EAccount *account = NULL;
-	EAccountList *account_list;
+	ESource *source;
+	ESourceExtension *extension;
+	const gchar *extension_name;
+
+	g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL);
+	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
+
+	if (folder != NULL)
+		g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
+
+	source = em_utils_guess_mail_account (registry, message, folder);
+
+	if (source == NULL)
+		return NULL;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	extension = e_source_get_extension (source, extension_name);
+
+	return e_source_mail_account_get_identity (
+		E_SOURCE_MAIL_ACCOUNT (extension));
+}
+
+static gboolean
+mail_account_in_recipients (ESourceRegistry *registry,
+                            ESource *source,
+                            GHashTable *recipients)
+{
+	ESourceExtension *extension;
+	const gchar *extension_name;
+	const gchar *address;
+	gboolean enabled;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	extension = e_source_get_extension (source, extension_name);
+
+	enabled = e_source_mail_account_get_enabled (
+		E_SOURCE_MAIL_ACCOUNT (extension));
+
+	/* Disregard disabled mail accounts. */
+	if (!enabled)
+		return FALSE;
+
+	source = e_source_mail_account_get_identity (
+		E_SOURCE_MAIL_ACCOUNT (extension));
+
+	if (source == NULL)
+		return FALSE;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_IDENTITY;
+	extension = e_source_get_extension (source, extension_name);
+
+	address = e_source_mail_identity_get_address (
+		E_SOURCE_MAIL_IDENTITY (extension));
+
+	if (address == NULL)
+		return FALSE;
+
+	return (g_hash_table_lookup (recipients, address) != NULL);
+}
+
+ESource *
+em_utils_guess_mail_account_with_recipients (ESourceRegistry *registry,
+                                             CamelMimeMessage *message,
+                                             CamelFolder *folder)
+{
+	ESource *source = NULL;
 	GHashTable *recipients;
-	EIterator *iterator;
 	CamelInternetAddress *addr;
+	GList *list, *iter;
+	const gchar *extension_name;
 	const gchar *type;
 	const gchar *key;
 
 	/* This policy is subject to debate and tweaking,
 	 * but please also document the rational here. */
 
+	g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL);
 	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
 
 	/* Build a set of email addresses in which to test for membership.
@@ -2150,53 +2269,128 @@ em_utils_guess_account_with_recipients (CamelMimeMessage *message,
 	}
 
 	/* First Preference: We were given a folder that maps to an
-	 * enabled account, and that account's email address appears
+	 * enabled mail account, and that account's address appears
 	 * in the list of To: or Cc: recipients. */
 
 	if (folder != NULL)
-		account = guess_account_from_folder (folder);
+		source = guess_mail_account_from_folder (registry, folder);
 
-	if (account == NULL || !account->enabled)
+	if (source == NULL)
 		goto second_preference;
 
-	if ((key = account->id->address) == NULL)
-		goto second_preference;
-
-	if (g_hash_table_lookup (recipients, key) != NULL)
+	if (mail_account_in_recipients (registry, source, recipients))
 		goto exit;
 
 second_preference:
 
-	/* Second Preference: Choose any enabled account whose email
+	/* Second Preference: Choose any enabled mail account whose
 	 * address appears in the list to To: or Cc: recipients. */
 
-	account_list = e_get_account_list ();
-	iterator = e_list_get_iterator (E_LIST (account_list));
-
-	while (e_iterator_is_valid (iterator)) {
-		account = (EAccount *) e_iterator_get (iterator);
-		e_iterator_next (iterator);
+	source = NULL;
 
-		if (account == NULL || !account->enabled)
-			continue;
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	list = e_source_registry_list_sources (registry, extension_name);
 
-		if ((key = account->id->address) == NULL)
-			continue;
+	for (iter = list; iter != NULL; iter = g_list_next (iter)) {
+		ESource *temp = E_SOURCE (iter->data);
 
-		if (g_hash_table_lookup (recipients, key) != NULL) {
-			g_object_unref (iterator);
-			goto exit;
+		if (mail_account_in_recipients (registry, temp, recipients)) {
+			source = temp;
+			break;
 		}
 	}
-	g_object_unref (iterator);
 
-	/* Last Preference: Defer to em_utils_guess_account(). */
-	account = em_utils_guess_account (message, folder);
+	g_list_free (list);
+
+	if (source != NULL)
+		goto exit;
+
+	/* Last Preference: Defer to em_utils_guess_mail_account(). */
+	source = em_utils_guess_mail_account (registry, message, folder);
 
 exit:
 	g_hash_table_destroy (recipients);
 
-	return account;
+	return source;
+}
+
+ESource *
+em_utils_guess_mail_identity_with_recipients (ESourceRegistry *registry,
+                                              CamelMimeMessage *message,
+                                              CamelFolder *folder)
+{
+	ESource *source;
+	ESourceExtension *extension;
+	const gchar *extension_name;
+
+	g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL);
+	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
+
+	source = em_utils_guess_mail_account_with_recipients (
+		registry, message, folder);
+
+	if (source == NULL)
+		return NULL;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	extension = e_source_get_extension (source, extension_name);
+
+	return e_source_mail_account_get_identity (
+		E_SOURCE_MAIL_ACCOUNT (extension));
+}
+
+gboolean
+em_utils_mail_identity_is_enabled (ESourceRegistry *registry,
+                                   ESource *mail_identity_source)
+{
+	GList *list, *link;
+	const gchar *extension_name;
+	gboolean found_account = FALSE;
+	gboolean found_enabled_account = FALSE;
+
+	g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), FALSE);
+
+	if (mail_identity_source == NULL)
+		return FALSE;
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_IDENTITY;
+	if (!e_source_has_extension (mail_identity_source, extension_name))
+		return FALSE;
+
+	/* If any enabled account references the given identity, then
+	 * the identity is enabled.  If no accounts reference the given
+	 * identity, then the identity is assumed to be enabled.  So in
+	 * other words, an identity is disabled if and only if it is
+	 * referenced exclusively by disabled accounts. */
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	list = e_source_registry_list_sources (registry, extension_name);
+
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceMailAccount *extension;
+		gboolean enabled;
+
+		extension = e_source_get_extension (source, extension_name);
+
+		enabled = e_source_mail_account_get_enabled (extension);
+		source = e_source_mail_account_get_identity (extension);
+
+		if (source == NULL)
+			continue;
+
+		if (e_source_equal (source, mail_identity_source)) {
+			found_account = TRUE;
+			found_enabled_account |= enabled;
+		}
+
+		if (found_enabled_account)
+			break;
+	}
+
+	g_list_free (list);
+
+	return found_enabled_account || !found_account;
 }
 
 void
diff --git a/mail/em-utils.h b/mail/em-utils.h
index b07b74b..94bafda 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <camel/camel.h>
 #include <libedataserver/e-proxy.h>
+#include <libedataserver/e-source-registry.h>
 
 #include <mail/e-mail-reader.h>
 #include <mail/e-mail-session.h>
@@ -42,8 +43,6 @@ gboolean em_utils_prompt_user (GtkWindow *parent, const gchar *promptkey, const
 GPtrArray *em_utils_uids_copy (GPtrArray *uids);
 void em_utils_uids_free (GPtrArray *uids);
 
-gboolean em_utils_check_user_can_send_mail (void);
-
 void em_utils_edit_filters (GtkWidget *parent, EMailBackend *backend);
 void em_filename_make_safe (gchar *string);
 void em_utils_edit_vfolders (GtkWidget *parent);
@@ -62,10 +61,14 @@ void em_utils_selection_get_uidlist (GtkSelectionData *data, EMailSession *sessi
 void em_utils_selection_set_urilist (GtkSelectionData *data, CamelFolder *folder, GPtrArray *uids);
 void em_utils_selection_get_urilist (GtkSelectionData *data, CamelFolder *folder);
 
-gboolean	em_utils_folder_is_drafts	(CamelFolder *folder);
-gboolean	em_utils_folder_is_templates	(CamelFolder *folder);
-gboolean	em_utils_folder_is_sent		(CamelFolder *folder);
-gboolean	em_utils_folder_is_outbox	(CamelFolder *folder);
+gboolean	em_utils_folder_is_drafts	(ESourceRegistry *registry,
+						 CamelFolder *folder);
+gboolean	em_utils_folder_is_templates	(ESourceRegistry *registry,
+						 CamelFolder *folder);
+gboolean	em_utils_folder_is_sent		(ESourceRegistry *registry,
+						 CamelFolder *folder);
+gboolean	em_utils_folder_is_outbox	(ESourceRegistry *registry,
+						 CamelFolder *folder);
 
 EProxy *	em_utils_get_proxy		(void);
 
@@ -79,15 +82,27 @@ void em_utils_empty_trash (GtkWidget *parent, EMailBackend *backend);
 gboolean em_utils_in_addressbook (CamelInternetAddress *addr, gboolean local_only);
 CamelMimePart *em_utils_contact_photo (CamelInternetAddress *addr, gboolean local);
 
-/* clears flag 'get_password_canceled' at every known accounts, so if needed, get_password will show dialog */
-void em_utils_clear_get_password_canceled_accounts_flag (void);
-
 /* Unescapes &amp; back to a real & in URIs */
 gchar *em_utils_url_unescape_amp (const gchar *url);
 
-GHashTable * em_utils_generate_account_hash (void);
-struct _EAccount *em_utils_guess_account (CamelMimeMessage *message, CamelFolder *folder);
-struct _EAccount *em_utils_guess_account_with_recipients (CamelMimeMessage *message, CamelFolder *folder);
+GHashTable *	em_utils_generate_account_hash	(ESourceRegistry *registry);
+ESource *	em_utils_guess_mail_account	(ESourceRegistry *registry,
+						 CamelMimeMessage *message,
+						 CamelFolder *folder);
+ESource *	em_utils_guess_mail_account_with_recipients
+						(ESourceRegistry *registry,
+						 CamelMimeMessage *message,
+						 CamelFolder *folder);
+ESource *	em_utils_guess_mail_identity	(ESourceRegistry *registry,
+						 CamelMimeMessage *message,
+						 CamelFolder *folder);
+ESource *	em_utils_guess_mail_identity_with_recipients
+						(ESourceRegistry *registry,
+						 CamelMimeMessage *message,
+						 CamelFolder *folder);
+gboolean	em_utils_mail_identity_is_enabled
+						(ESourceRegistry *registry,
+						 ESource *mail_identity_source);
 
 void emu_remove_from_mail_cache (const GSList *addresses);
 void emu_remove_from_mail_cache_1 (const gchar *address);
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 7356772..e81fd9b 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -28,13 +28,11 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <gconf/gconf-client.h>
 
 #include <libedataserver/e-data-server-util.h>
-#include <e-util/e-util.h>
-#include "e-util/e-account-utils.h"
-#include "e-util/e-signature-utils.h"
 
-#include <gconf/gconf-client.h>
+#include <e-util/e-util.h>
 
 #include "e-mail-local.h"
 #include "e-mail-folder-utils.h"
@@ -159,27 +157,6 @@ gconf_int_value_changed (GConfClient *client,
 	}
 }
 
-void
-mail_config_write (void)
-{
-	GConfClient *client;
-	EAccountList *account_list;
-	ESignatureList *signature_list;
-
-	if (!config)
-		return;
-
-	account_list = e_get_account_list ();
-	signature_list = e_get_signature_list ();
-
-	e_account_list_save (account_list);
-	e_signature_list_save (signature_list);
-
-	client = gconf_client_get_default ();
-	gconf_client_suggest_sync (client, NULL);
-	g_object_unref (client);
-}
-
 gint
 mail_config_get_address_count (void)
 {
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 2903809..c66630d 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -29,7 +29,6 @@ G_BEGIN_DECLS
 
 /* Configuration */
 void		mail_config_init		(EMailSession *session);
-void		mail_config_write		(void);
 
 /* General Accessor functions */
 
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 30bbce6..0d1855a 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -41,6 +41,7 @@
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-marshal.h>
 #include <e-util/e-util.h>
+#include <shell/e-shell.h>
 
 #include "mail-mt.h"
 #include "mail-folder-cache.h"
@@ -255,11 +256,18 @@ update_1folder (MailFolderCache *self,
                 const gchar *msg_subject,
                 CamelFolderInfo *info)
 {
+	EShell *shell;
 	struct _folder_update *up;
+	ESourceRegistry *registry;
 	CamelFolder *folder;
 	gint unread = -1;
 	gint deleted;
 
+	/* FIXME MailFolderCache should store an EMailBackend
+	 *       so we can access the registry properly. */
+	shell = e_shell_get_default ();
+	registry = e_shell_get_registry (shell);
+
 	folder = mfi->folder;
 	if (folder) {
 		gboolean folder_is_sent;
@@ -268,9 +276,9 @@ update_1folder (MailFolderCache *self,
 		gboolean folder_is_vtrash;
 		gboolean special_case;
 
-		folder_is_sent = em_utils_folder_is_sent (folder);
-		folder_is_drafts = em_utils_folder_is_drafts (folder);
-		folder_is_outbox = em_utils_folder_is_outbox (folder);
+		folder_is_sent = em_utils_folder_is_sent (registry, folder);
+		folder_is_drafts = em_utils_folder_is_drafts (registry, folder);
+		folder_is_outbox = em_utils_folder_is_outbox (registry, folder);
 		folder_is_vtrash = CAMEL_IS_VTRASH_FOLDER (folder);
 
 		special_case =
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 0ff745e..092da2a 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -35,7 +35,10 @@
 #include <glib/gi18n.h>
 
 #include <libedataserver/e-data-server-util.h>
-#include "e-util/e-account-utils.h"
+#include <libedataserver/e-source-mail-account.h>
+#include <libedataserver/e-source-mail-submission.h>
+
+#include <shell/e-shell.h>
 
 #include "em-filter-rule.h"
 #include "em-utils.h"
@@ -472,6 +475,49 @@ static void	report_status		(struct _send_queue_msg *m,
 					 const gchar *desc,
 					 ...);
 
+static gboolean
+get_submission_details_from_identity (EMailBackend *backend,
+                                      const gchar *identity_uid,
+                                      gchar **out_transport_uid,
+                                      gchar **out_sent_folder_uri)
+{
+	EShell *shell;
+	ESource *source;
+	ESourceRegistry *registry;
+	ESourceExtension *extension;
+	EShellBackend *shell_backend;
+	const gchar *extension_name;
+	const gchar *sent_folder_uri;
+	const gchar *transport_uid;
+
+	shell_backend = E_SHELL_BACKEND (backend);
+	shell = e_shell_backend_get_shell (shell_backend);
+	registry = e_shell_get_registry (shell);
+
+	extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+	source = e_source_registry_lookup_by_uid (registry, identity_uid);
+
+	if (source == NULL)
+		return FALSE;
+
+	if (!e_source_has_extension (source, extension_name))
+		return FALSE;
+
+	extension = e_source_get_extension (source, extension_name);
+
+	sent_folder_uri = e_source_mail_submission_get_sent_folder (
+		E_SOURCE_MAIL_SUBMISSION (extension));
+
+	transport_uid = e_source_mail_submission_get_transport_uid (
+		E_SOURCE_MAIL_SUBMISSION (extension));
+
+	*out_transport_uid = g_strdup (transport_uid);
+
+	*out_sent_folder_uri = g_strdup (sent_folder_uri);
+
+	return TRUE;
+}
+
 /* send 1 message to a specific transport */
 static void
 mail_send_message (struct _send_queue_msg *m,
@@ -482,12 +528,12 @@ mail_send_message (struct _send_queue_msg *m,
                    GCancellable *cancellable,
                    GError **error)
 {
-	EAccount *account = NULL;
+	CamelService *service;
 	EMailSession *session;
 	const CamelInternetAddress *iaddr;
 	CamelAddress *from, *recipients;
 	CamelMessageInfo *info = NULL;
-	CamelProvider *provider;
+	CamelProvider *provider = NULL;
 	gchar *transport_uid = NULL;
 	gchar *sent_folder_uri = NULL;
 	const gchar *resent_from, *tmp;
@@ -508,53 +554,38 @@ mail_send_message (struct _send_queue_msg *m,
 	err = g_string_new ("");
 	xev = mail_tool_remove_xevolution_headers (message);
 
-	session = e_mail_backend_get_session (m->backend);
-
-	tmp = camel_header_raw_find (&xev, "X-Evolution-Account", NULL);
+	tmp = camel_header_raw_find (&xev, "X-Evolution-Identity", NULL);
 	if (tmp != NULL) {
-		gchar *name;
-
-		name = g_strstrip (g_strdup (tmp));
-		if ((account = e_get_account_by_uid (name))
-		    /* 'old' x-evolution-account stored the name, how silly */
-		    || (account = e_get_account_by_name (name))) {
-			if (account->transport) {
-				CamelService *service;
-				gchar *transport_uid;
-
-				transport_uid = g_strconcat (
-					account->uid, "-transport", NULL);
-				service = camel_session_get_service (
-					CAMEL_SESSION (session),
-					transport_uid);
-				g_free (transport_uid);
-
-				if (CAMEL_IS_TRANSPORT (service))
-					transport = CAMEL_TRANSPORT (service);
-			}
+		gchar *identity_uid;
 
-			sent_folder_uri = g_strdup (account->sent_folder_uri);
-		}
-		g_free (name);
+		identity_uid = g_strstrip (g_strdup (tmp));
+		get_submission_details_from_identity (
+			m->backend, identity_uid,
+			&transport_uid, &sent_folder_uri);
+		g_free (identity_uid);
 	}
 
-	if (!account) {
-		/* default back to these headers */
-		tmp = camel_header_raw_find(&xev, "X-Evolution-Transport", NULL);
-		if (tmp)
-			transport_uid = g_strstrip (g_strdup (tmp));
+	tmp = camel_header_raw_find (&xev, "X-Evolution-Transport", NULL);
+	if (transport_uid == NULL && tmp != NULL)
+		transport_uid = g_strstrip (g_strdup (tmp));
 
-		tmp = camel_header_raw_find(&xev, "X-Evolution-Fcc", NULL);
-		if (tmp)
-			sent_folder_uri = g_strstrip (g_strdup (tmp));
-	}
+	tmp = camel_header_raw_find (&xev, "X-Evolution-Fcc", NULL);
+	if (sent_folder_uri == NULL && tmp != NULL)
+		sent_folder_uri = g_strstrip (g_strdup (tmp));
+
+	session = e_mail_backend_get_session (m->backend);
+
+	service = camel_session_get_service (
+		CAMEL_SESSION (session), transport_uid);
+	if (service != NULL)
+		provider = camel_service_get_provider (service);
 
-	if (transport != NULL) {
+	if (CAMEL_IS_TRANSPORT (service)) {
 		CamelURL *url;
 		gchar *url_string;
 		gchar *escaped;
 
-		url = camel_service_get_camel_url (CAMEL_SERVICE (transport));
+		url = camel_service_get_camel_url (service);
 		url_string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
 		escaped = escape_percent_sign (url_string);
 
@@ -586,12 +617,12 @@ mail_send_message (struct _send_queue_msg *m,
 
 	if (camel_address_length (recipients) > 0) {
 		if (!em_utils_connect_service_sync (
-			CAMEL_SERVICE (transport), cancellable, error))
+			service, cancellable, error))
 			goto exit;
 
 		if (!camel_transport_send_to_sync (
-			transport, message, from,
-			recipients, cancellable, error))
+			CAMEL_TRANSPORT (service), message,
+			from, recipients, cancellable, error))
 			goto exit;
 	}
 
@@ -642,8 +673,6 @@ mail_send_message (struct _send_queue_msg *m,
 		}
 	}
 
-	provider = camel_service_get_provider (CAMEL_SERVICE (transport));
-
 	if (provider == NULL
 	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) {
 		GError *local_error = NULL;
@@ -1328,16 +1357,23 @@ expunge_pop3_stores (CamelFolder *expunging,
                      GCancellable *cancellable,
                      GError **error)
 {
+	EShell *shell;
+	EShellBackend *shell_backend;
 	GHashTable *expunging_uids;
+	ESourceRegistry *registry;
 	EMailSession *session;
 	GPtrArray *uids;
-	EAccount *account;
-	EIterator *iter;
+	GList *list, *link;
+	const gchar *extension_name;
 	gboolean success = TRUE;
 	guint ii;
 
 	session = e_mail_backend_get_session (backend);
 
+	shell_backend = E_SHELL_BACKEND (backend);
+	shell = e_shell_backend_get_shell (shell_backend);
+	registry = e_shell_get_registry (shell);
+
 	uids = camel_folder_get_uids (expunging);
 
 	if (uids == NULL)
@@ -1397,55 +1433,76 @@ expunge_pop3_stores (CamelFolder *expunging,
 		return TRUE;
 	}
 
-	for (iter = e_list_get_iterator ((EList *) e_get_account_list ());
-	     e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		account = (EAccount *) e_iterator_get (iter);
+	extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
+	list = e_source_registry_list_sources (registry, extension_name);
 
-		if (account->enabled &&
-		    account->source && account->source->url &&
-		    g_str_has_prefix (account->source->url, "pop://")) {
-			CamelFolder *folder;
-			gboolean any_found = FALSE;
+	for (link = list; link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceExtension *extension;
+		CamelFolder *folder;
+		CamelService *service;
+		const gchar *backend_name;
+		const gchar *source_uid;
+		gboolean any_found = FALSE;
+		gboolean enabled;
 
-			folder = e_mail_session_get_inbox_sync (
-				session, account->uid, cancellable, error);
+		source_uid = e_source_get_uid (source);
+		backend_name = e_source_get_backend_name (source);
+		extension = e_source_get_extension (source, extension_name);
 
-			/* Abort the loop on error. */
-			if (folder == NULL) {
-				success = FALSE;
-				break;
-			}
+		enabled = e_source_mail_account_get_enabled (
+			E_SOURCE_MAIL_ACCOUNT (extension));
 
-			uids = camel_folder_get_uids (folder);
-			if (uids) {
-				for (ii = 0; ii < uids->len; ii++) {
-					/* ensure the ID is from this account,
-					 * as it's generated by evolution */
-					const gchar *source_uid;
-
-					source_uid = g_hash_table_lookup (
-						expunging_uids, uids->pdata[ii]);
-					if (folder_is_from_source_uid (folder, source_uid)) {
-						any_found = TRUE;
-						camel_folder_delete_message (folder, uids->pdata[ii]);
-					}
-				}
-				camel_folder_free_uids (folder, uids);
-			}
+		if (!enabled || g_strcmp0 (backend_name, "pop") != 0)
+			continue;
+
+		service = camel_session_get_service (
+			CAMEL_SESSION (session), source_uid);
 
-			if (any_found)
-				success = camel_folder_synchronize_sync (folder, TRUE, cancellable, error);
+		folder = camel_store_get_inbox_folder_sync (
+			CAMEL_STORE (service), cancellable, error);
 
+		/* Abort the loop on error. */
+		if (folder == NULL) {
+			success = FALSE;
+			break;
+		}
+
+		uids = camel_folder_get_uids (folder);
+
+		if (uids == NULL) {
 			g_object_unref (folder);
+			continue;
+		}
 
-			/* Abort the loop on error. */
-			if (!success)
-				break;
+		for (ii = 0; ii < uids->len; ii++) {
+			/* ensure the ID is from this account,
+			 * as it's generated by evolution */
+			const gchar *source_uid;
+
+			source_uid = g_hash_table_lookup (
+				expunging_uids, uids->pdata[ii]);
+			if (folder_is_from_source_uid (folder, source_uid)) {
+				any_found = TRUE;
+				camel_folder_delete_message (
+					folder, uids->pdata[ii]);
+			}
 		}
+
+		camel_folder_free_uids (folder, uids);
+
+		if (any_found)
+			success = camel_folder_synchronize_sync (
+				folder, TRUE, cancellable, error);
+
+		g_object_unref (folder);
+
+		/* Abort the loop on error. */
+		if (!success)
+			break;
 	}
 
-	if (iter)
-		g_object_unref (iter);
+	g_list_free (list);
 
 	g_hash_table_destroy (expunging_uids);
 
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 33ac977..b5b2578 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -29,10 +29,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libedataserver/e-account-list.h"
-
 #include "shell/e-shell.h"
-#include "e-util/e-account-utils.h"
 #include "e-util/gconf-bridge.h"
 
 #include "e-mail-folder-utils.h"
@@ -279,7 +276,9 @@ dialog_response (GtkDialog *gd,
 }
 
 static GStaticMutex status_lock = G_STATIC_MUTEX_INIT;
+#if 0  /* ACCOUNT_MGMT */
 static gchar *format_url (EAccount *account, const gchar *internal_url);
+#endif /* ACCOUNT_MGMT */
 
 static gint
 operation_status_timeout (gpointer data)
@@ -296,6 +295,7 @@ operation_status_timeout (gpointer data)
 			gtk_label_set_text (
 				GTK_LABEL (info->status_label),
 				info->what);
+#if 0  /* ACCOUNT_MGMT */
 		if (info->send_url && info->send_account_label) {
 			gchar *tmp = format_url (NULL, info->send_url);
 
@@ -308,6 +308,7 @@ operation_status_timeout (gpointer data)
 
 			g_free (tmp);
 		}
+#endif /* ACCOUNT_MGMT */
 
 		g_static_mutex_unlock (&status_lock);
 
@@ -353,6 +354,7 @@ operation_status (CamelOperation *op,
 	set_send_status (info, what, pc);
 }
 
+#if 0  /* ACCOUNT_MGMT */
 static gchar *
 format_url (EAccount *account,
             const gchar *internal_url)
@@ -395,6 +397,7 @@ format_url (EAccount *account,
 
 	return pretty_url;
 }
+#endif /* ACCOUNT_MGMT */
 
 static send_info_t
 get_receive_type (CamelURL *url)
@@ -423,6 +426,7 @@ get_receive_type (CamelURL *url)
 	return SEND_INVALID;
 }
 
+#if 0  /* ACCOUNT_MGMT */
 static struct _send_data *
 build_dialog (GtkWindow *parent,
               EMailBackend *backend,
@@ -735,6 +739,7 @@ build_dialog (GtkWindow *parent,
 
 	return data;
 }
+#endif /* ACCOUNT_MGMT */
 
 static void
 update_folders (gchar *uri,
@@ -802,9 +807,9 @@ receive_done (gpointer data)
 
 	/* if we've been called to run again - run again */
 	if (info->type == SEND_SEND && info->state == SEND_ACTIVE && info->again) {
-		EMailSession *session;
 		CamelFolder *local_outbox;
 		CamelService *service;
+		EMailSession *session;
 
 		session = e_mail_backend_get_session (info->backend);
 
@@ -1085,7 +1090,7 @@ receive_update_got_store (CamelStore *store,
 	session = e_mail_backend_get_session (info->backend);
 	folder_cache = e_mail_session_get_folder_cache (session);
 
-	if (store) {
+	if (store != NULL) {
 		mail_folder_cache_note_store (
 			folder_cache,
 			CAMEL_SESSION (session),
@@ -1101,6 +1106,7 @@ send_receive (GtkWindow *parent,
               EMailBackend *backend,
               gboolean allow_send)
 {
+#if 0  /* ACCOUNT_MGMT */
 	CamelFolder *local_outbox;
 	struct _send_data *data;
 	EMailSession *session;
@@ -1171,6 +1177,7 @@ send_receive (GtkWindow *parent,
 			break;
 		}
 	}
+#endif /* ACCOUNT_MGMT */
 
 	return send_recv_dialog;
 }
@@ -1189,15 +1196,18 @@ mail_receive (GtkWindow *parent,
 	return send_receive (parent, backend, FALSE);
 }
 
+#if 0  /* ACCOUNT_MGMT */
 struct _auto_data {
 	EAccount *account;
 	EMailBackend *backend;
 	gint period;		/* in seconds */
 	gint timeout_id;
 };
+#endif /* ACCOUNT_MGMT */
 
 static GHashTable *auto_active;
 
+#if 0  /* ACCOUNT_MGMT */
 static gboolean
 auto_timeout (gpointer data)
 {
@@ -1325,12 +1335,14 @@ auto_online (EShell *shell)
 	if (iter)
 		g_object_unref (iter);
 }
+#endif /* ACCOUNT_MGMT */
 
 /* call to setup initial, and after changes are made to the config */
 /* FIXME: Need a cleanup funciton for when object is deactivated */
 void
 mail_autoreceive_init (EMailBackend *backend)
 {
+#if 0  /* ACCOUNT_MGMT */
 	EShellBackend *shell_backend;
 	EShellSettings *shell_settings;
 	EAccountList *accounts;
@@ -1378,10 +1390,12 @@ mail_autoreceive_init (EMailBackend *backend)
 	g_signal_connect (
 		shell, "notify::online",
 		G_CALLBACK (auto_online), NULL);
+#endif /* ACCOUNT_MGMT */
 }
 
 /* We setup the download info's in a hashtable, if we later
  * need to build the gui, we insert them in to add them. */
+#if 0  /* ACCONT_MGMT */
 void
 mail_receive_account (EMailBackend *backend,
                       EAccount *account)
@@ -1469,10 +1483,12 @@ mail_receive_account (EMailBackend *backend,
 		g_return_if_reached ();
 	}
 }
+#endif /* ACCOUNT_MGMT */
 
 void
 mail_send (EMailBackend *backend)
 {
+#if 0  /* ACCOUNT_MGMT */
 	CamelFolder *local_outbox;
 	CamelService *service;
 	EMailSession *session;
@@ -1545,4 +1561,5 @@ mail_send (EMailBackend *backend)
 		receive_get_folder, info,
 		receive_status, info,
 		receive_done, info);
+#endif /* ACCOUNT_MGMT */
 }
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index f702b74..8e84e36 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 #include <mail/e-mail-backend.h>
-#include <libedataserver/e-account.h>
 
 G_BEGIN_DECLS
 
@@ -38,8 +37,10 @@ GtkWidget *	mail_receive			(GtkWindow *parent,
 						 EMailBackend *backend);
 
 /* receive a single account */
+#if 0  /* ACCOUNT_MGMT */
 void		mail_receive_account		(EMailBackend *backend,
 						 EAccount *account);
+#endif /* ACCOUNT_MGMT */
 
 void		mail_send			(EMailBackend *backend);
 
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index c1e451d..481f25e 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -27,12 +27,12 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-
-#include <libedataserver/e-account-list.h>
+#include <libedataserver/e-source-mail-composition.h>
+#include <libedataserver/e-source-mail-identity.h>
+#include <libedataserver/e-source-mail-submission.h>
 
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
-#include "e-util/e-account-utils.h"
 
 #include "e-mail-backend.h"
 #include "e-mail-session.h"
@@ -350,11 +350,12 @@ static gint
 uri_is_ignore (EMailBackend *backend,
                const gchar *uri)
 {
+	EShell *shell;
+	ESourceRegistry *registry;
 	EMailSession *session;
 	CamelSession *camel_session;
-	EAccountList *accounts;
-	EAccount *account;
-	EIterator *iter;
+	GList *list, *link;
+	const gchar *extension_name;
 	const gchar *local_drafts_uri;
 	const gchar *local_outbox_uri;
 	const gchar *local_sent_uri;
@@ -379,27 +380,36 @@ uri_is_ignore (EMailBackend *backend,
 	if (e_mail_folder_uri_equal (camel_session, local_drafts_uri, uri))
 		return TRUE;
 
-	accounts = e_get_account_list ();
-	iter = e_list_get_iterator (E_LIST (accounts));
+	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
+	registry = e_shell_get_registry (shell);
 
-	while (!found && e_iterator_is_valid (iter)) {
-		/* XXX EIterator misuses const. */
-		account = (EAccount *) e_iterator_get (iter);
+	extension_name = E_SOURCE_EXTENSION_MAIL_IDENTITY;
+	list = e_source_registry_list_sources (registry, extension_name);
 
-		if (!found && account->sent_folder_uri != NULL)
-			found = e_mail_folder_uri_equal (
-				camel_session, uri,
-				account->sent_folder_uri);
+	for (link = list; !found && link != NULL; link = g_list_next (link)) {
+		ESource *source = E_SOURCE (link->data);
+		ESourceMailComposition *mc;
+		ESourceMailSubmission *ms;
+		const gchar *folder_uri;
+
+		extension_name = E_SOURCE_EXTENSION_MAIL_COMPOSITION;
+		mc = e_source_get_extension (source, extension_name);
+		folder_uri = e_source_mail_composition_get_drafts_folder (mc);
 
-		if (!found && account->drafts_folder_uri != NULL)
+		if (!found && folder_uri != NULL)
 			found = e_mail_folder_uri_equal (
-				camel_session, uri,
-				account->drafts_folder_uri);
+				camel_session, uri, folder_uri);
 
-		e_iterator_next (iter);
+		extension_name = E_SOURCE_EXTENSION_MAIL_SUBMISSION;
+		ms = e_source_get_extension (source, extension_name);
+		folder_uri = e_source_mail_submission_get_sent_folder (ms);
+
+		if (!found && folder_uri != NULL)
+			found = e_mail_folder_uri_equal (
+				camel_session, uri, folder_uri);
 	}
 
-	g_object_unref (iter);
+	g_list_free (list);
 
 	return found;
 }
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index f32b4ce..1227148 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -318,24 +318,6 @@ all proxy information will be deleted permanently.</_secondary>
     <button _label="_Disable" response="GTK_RESPONSE_YES"/>
   </error>
 
-  <error id="no-save-signature" type="error">
-    <_primary>Could not save signature file.</_primary>
-    <secondary xml:space="preserve">{0}.</secondary>
-  </error>
-
-  <error id="signature-notscript" type="error">
-    <_primary>Cannot set signature script "{0}".</_primary>
-    <_secondary xml:space="preserve">The script file must exist and be executable.</_secondary>
-  </error>
-
-  <error id="ask-signature-changed" type="question" default="GTK_RESPONSE_YES">
-    <_primary>Do you wish to save your changes?</_primary>
-    <_secondary xml:space="preserve">This signature has been changed, but has not been saved.</_secondary>
-    <button _label="_Discard changes" response="GTK_RESPONSE_NO"/>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
-  </error>
-
   <error id="vfolder-notexist" type="error">
     <_primary>Cannot edit Search Folder "{0}" as it does not exist.</_primary>
     <_secondary xml:space="preserve">This folder may have been added implicitly,
@@ -451,16 +433,6 @@ An mbox account will be created to preserve the old mbox folders. You can delete
     <button _label="N_ever" response="GTK_RESPONSE_CANCEL"/>
   </error>
 
-  <error id="signature-already-exists" type="error" modal="true">
-    <_primary>Signature Already Exists</_primary>
-    <_secondary>A signature already exists with the name "{0}". Please specify a different name. </_secondary>
-  </error>
-  
-  <error id="blank-signature" type="error" modal="true">
-    <_primary>Blank Signature</_primary>
-    <_secondary>Please provide an unique name to identify this signature.</_secondary>
-  </error>
-  
   <error id="send-no-account-enabled" type="warning">
     <_primary>This message cannot be sent because the account you chose to send with is not enabled</_primary>
     <_secondary xml:space="preserve">Please enable the account or send using another account.</_secondary>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]