Merge branch 'master' into wip/gsettings

author: Rodrigo Moya <rodrigo@gnome-db.org> 2011-11-14 20:08:57 +0800
committer: Rodrigo Moya <rodrigo@gnome-db.org> 2011-11-14 20:08:57 +0800
commit: 7ab5ae3fc72516cceeb09a48bc5a39f7b57933de (patch)
tree: f1d1afbfa9d8c97dc691a2d241c9ec368fdf67d3 /mail
parent: cda52538315c481bc3b11ff2db40f7165113d1ab (diff)
parent: c4308051159a37f16521b881f59259861998f4ae (diff)
download: gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar
gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.gz
gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.bz2
gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.lz
gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.xz
gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.zst
gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.zip
201 files changed, 7924 insertions, 508 deletions
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 1ddbec649c..0a14a19ee9 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . default importers
+SUBDIRS = . default importers mail-autoconfig
 
 privsolib_LTLIBRARIES = libevolution-mail.la
 
@@ -105,6 +105,7 @@ mailinclude_HEADERS =					\
 	mail-autofilter.h				\
 	mail-config.h					\
 	mail-folder-cache.h				\
+	mail-guess-servers.h				\
 	mail-mt.h					\
 	mail-ops.h					\
 	mail-send-recv.h				\
@@ -178,6 +179,7 @@ libevolution_mail_la_SOURCES =				\
 	mail-autofilter.c				\
 	mail-config.c					\
 	mail-folder-cache.c				\
+	mail-guess-servers.c				\
 	mail-mt.c					\
 	mail-ops.c					\
 	mail-send-recv.c				\
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 59605e24a4..f3ce503012 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -70,16 +70,6 @@
 
 #define d(x) x
 
-typedef struct _MigrateStateInfo MigrateStateInfo;
-
-struct _MigrateStateInfo {
-	gchar *label_name;
-	gdouble progress;
-};
-
-static gboolean
-update_states_in_main_thread (MigrateStateInfo *info);
-
 /* 1.4 upgrade functions */
 
 #define EM_TYPE_MIGRATE_SESSION \
@@ -119,100 +109,9 @@ em_migrate_session_new (const gchar *user_data_dir)
 		"user-data-dir", user_data_dir, NULL);
 }
 
-static GtkWidget *window;
-static GtkLabel *label;
 static GtkProgressBar *progress;
 
 static void
-em_migrate_setup_progress_dialog (const gchar *title,
-                                  const gchar *desc)
-{
-	GtkWidget *vbox, *hbox, *w;
-	gchar *markup;
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title ((GtkWindow *) window, _("Migrating..."));
-	gtk_window_set_modal ((GtkWindow *) window, TRUE);
-	gtk_container_set_border_width ((GtkContainer *) window, 6);
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add ((GtkContainer *) window, vbox);
-
-	w = gtk_label_new (desc);
-
-	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_widget_show (w);
-	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
-
-	label = (GtkLabel *) gtk_label_new ("");
-	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
-
-	progress = (GtkProgressBar *) gtk_progress_bar_new ();
-	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
-
-	/* Prepare the message */
-	vbox = gtk_vbox_new (FALSE, 12);
-	gtk_widget_show (vbox);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
-
-	w = gtk_label_new (NULL);
-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
-	markup = g_strconcat (
-		"<big><b>",
-		title ? title : _("Migration"),
-		"</b></big>", NULL);
-	gtk_label_set_markup (GTK_LABEL (w), markup);
-	gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0);
-	g_free (markup);
-
-	w = gtk_label_new (desc);
-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
-	gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-	gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0);
-
-	/* Progress bar */
-	w = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0);
-
-	label = GTK_LABEL (gtk_label_new (""));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
-	gtk_label_set_line_wrap (label, TRUE);
-	gtk_widget_show (GTK_WIDGET (label));
-	gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (label), TRUE, TRUE, 0);
-
-	progress = GTK_PROGRESS_BAR (gtk_progress_bar_new ());
-	gtk_widget_show (GTK_WIDGET (progress));
-	gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (progress), TRUE, TRUE, 0);
-
-	gtk_container_add (GTK_CONTAINER (window), hbox);
-	gtk_widget_show_all (hbox);
-	gtk_widget_show (window);
-}
-
-static void
-em_migrate_close_progress_dialog (void)
-{
-	gtk_widget_destroy ((GtkWidget *) window);
-}
-
-static void
-em_migrate_set_folder_name (const gchar *folder_name)
-{
-	gchar *text;
-
-	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
-	gtk_label_set_text (label, text);
-	g_free (text);
-}
-
-static void
 em_migrate_set_progress (double percent)
 {
 	gchar text[5];
@@ -566,253 +465,6 @@ em_update_sa_junk_setting_2_23 (void)
 	g_object_unref (client);
 }
 
-#ifndef G_OS_WIN32
-
-static gboolean
-update_states_in_main_thread (MigrateStateInfo *info)
-{
-	g_return_val_if_fail (info != NULL, FALSE);
-	g_return_val_if_fail (info->label_name != NULL, FALSE);
-
-	em_migrate_set_progress (info->progress);
-	em_migrate_set_folder_name (info->label_name);
-
-	/* XXX Why is this necessary? */
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-	return FALSE;
-}
-
-static void
-migrate_state_info_free (MigrateStateInfo *info)
-{
-	g_free (info->label_name);
-	g_slice_free (MigrateStateInfo, info);
-}
-
-static void
-migrate_folders (CamelStore *store,
-                 gboolean is_local,
-                 CamelFolderInfo *fi,
-                 const gchar *acc,
-                 gboolean *done,
-                 gint *nth_folder,
-                 gint total_folders)
-{
-	CamelFolder *folder;
-
-	while (fi) {
-		MigrateStateInfo *info;
-
-		*nth_folder = *nth_folder + 1;
-
-		info = g_slice_new0 (MigrateStateInfo);
-		info->label_name = g_strdup_printf (
-			"%s/%s", acc, fi->full_name);
-		info->progress = (gdouble) (*nth_folder) / total_folders;
-
-		g_idle_add_full (
-			G_PRIORITY_LOW, (GSourceFunc)
-			update_states_in_main_thread, info,
-			(GDestroyNotify) migrate_state_info_free);
-
-		if (is_local)
-			folder = camel_store_get_folder_sync (
-				store, fi->full_name,
-				CAMEL_STORE_IS_MIGRATING, NULL, NULL);
-		else
-			folder = camel_store_get_folder_sync (
-				store, fi->full_name, 0, NULL, NULL);
-
-		if (folder != NULL)
-			camel_folder_summary_migrate_infos (folder->summary);
-		migrate_folders (
-			store, is_local, fi->child,
-			acc, done, nth_folder, total_folders);
-		fi = fi->next;
-	}
-
-	if ((*nth_folder) == (total_folders - 1))
-		*done = TRUE;
-}
-
-#endif /* G_OS_WIN32 */
-
-/* This could be in CamelStore.ch */
-static void
-count_folders (CamelFolderInfo *fi,
-               gint *count)
-{
-	while (fi) {
-		*count = *count + 1;
-		count_folders (fi->child, count);
-		fi = fi->next;
-	}
-}
-
-static CamelStore *
-setup_local_store (EShellBackend *shell_backend,
-                   EMMigrateSession *session)
-{
-	CamelSettings *settings;
-	CamelService *service;
-	const gchar *data_dir;
-	gchar *path;
-
-	service = camel_session_add_service (
-		CAMEL_SESSION (session), "local", "mbox",
-		CAMEL_PROVIDER_STORE, NULL);
-
-	settings = camel_service_get_settings (service);
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
-
-	path = g_build_filename (data_dir, "local", NULL);
-	g_object_set (settings, "path", path, NULL);
-	g_free (path);
-
-	return CAMEL_STORE (service);
-}
-
-#ifndef G_OS_WIN32
-
-struct migrate_folders_to_db_structure {
-	gchar *account_name;
-	CamelStore *store;
-	CamelFolderInfo *info;
-	gboolean done;
-	gboolean is_local_store;
-};
-
-static void
-migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs)
-{
-		gint num_of_folders = 0, nth_folder = 0;
-		count_folders (migrate_dbs->info, &num_of_folders);
-		migrate_folders (
-			migrate_dbs->store, migrate_dbs->is_local_store,
-			migrate_dbs->info, migrate_dbs->account_name,
-			&(migrate_dbs->done), &nth_folder, num_of_folders);
-}
-
-static void
-migrate_to_db (EShellBackend *shell_backend)
-{
-	EMMigrateSession *session;
-	EAccountList *accounts;
-	EMailBackend *mail_backend;
-	EMailSession *mail_session;
-	EIterator *iter;
-	gint i = 0, len;
-	CamelStore *store = NULL;
-	CamelSettings *settings;
-	CamelFolderInfo *info;
-	const gchar *data_dir;
-	const gchar *path;
-
-	if (!(accounts = e_get_account_list ()))
-		return;
-
-	mail_backend = E_MAIL_BACKEND (shell_backend);
-	mail_session = e_mail_backend_get_session (mail_backend);
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
-
-	/* Initialize the mail stores early so we can add a new one. */
-	e_mail_store_init (mail_session, data_dir);
-
-	iter = e_list_get_iterator ((EList *) accounts);
-	len = e_list_length ((EList *) accounts);
-
-	session = em_migrate_session_new (data_dir);
-	camel_session_set_online ((CamelSession *) session, FALSE);
-	em_migrate_setup_progress_dialog (
-		_("Migrating Folders"),
-		_("The summary format of the Evolution mailbox "
-		  "folders has been moved to SQLite since Evolution 2.24.\n\nPlease be "
-		  "patient while Evolution migrates your folders..."));
-
-	em_migrate_set_progress ((gdouble) i / (len + 1));
-	store = setup_local_store (shell_backend, session);
-
-	settings = camel_service_get_settings (CAMEL_SERVICE (store));
-	path = camel_local_settings_get_path (CAMEL_LOCAL_SETTINGS (settings));
-
-	info = camel_store_get_folder_info_sync (
-		store, NULL,
-		CAMEL_STORE_FOLDER_INFO_RECURSIVE |
-		CAMEL_STORE_FOLDER_INFO_FAST |
-		CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,
-		NULL, NULL);
-	if (info) {
-		struct migrate_folders_to_db_structure migrate_dbs;
-
-		if (path != NULL && g_str_has_suffix (path, ".evolution/mail/local"))
-			migrate_dbs.is_local_store = TRUE;
-		else
-			migrate_dbs.is_local_store = FALSE;
-		migrate_dbs.account_name = _("On This Computer");
-		migrate_dbs.info = info;
-		migrate_dbs.store = store;
-		migrate_dbs.done = FALSE;
-
-		g_thread_create (
-			(GThreadFunc) migrate_folders_to_db_thread,
-			&migrate_dbs, TRUE, NULL);
-		while (!migrate_dbs.done)
-			g_main_context_iteration (NULL, TRUE);
-	}
-	i++;
-	em_migrate_set_progress ((gdouble) i / (len + 1));
-
-	while (e_iterator_is_valid (iter)) {
-		EAccount *account = (EAccount *) e_iterator_get (iter);
-		EAccountService *service;
-
-		service = account->source;
-		em_migrate_set_progress ((gdouble) i / (len + 1));
-		if (account->enabled
-		    && service->url != NULL && service->url[0]
-		    && strncmp (service->url, "mbox:", 5) != 0) {
-
-			store = e_mail_store_add_by_account (
-				mail_session, account);
-
-			info = camel_store_get_folder_info_sync (
-				store, NULL,
-				CAMEL_STORE_FOLDER_INFO_RECURSIVE |
-				CAMEL_STORE_FOLDER_INFO_FAST |
-				CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,
-				NULL, NULL);
-			if (info) {
-				struct migrate_folders_to_db_structure migrate_dbs;
-
-				migrate_dbs.account_name = account->name;
-				migrate_dbs.info = info;
-				migrate_dbs.store = store;
-				migrate_dbs.done = FALSE;
-
-				g_thread_create (
-					(GThreadFunc)
-					migrate_folders_to_db_thread,
-					&migrate_dbs, TRUE, NULL);
-				while (!migrate_dbs.done)
-					g_main_context_iteration (NULL, TRUE);
-			} else
-				printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC);
-		}
-		i++;
-		e_iterator_next (iter);
-
-	}
-
-	g_object_unref (iter);
-	em_migrate_close_progress_dialog ();
-
-	g_object_unref (session);
-}
-
-#endif
-
 static gboolean
 mbox_to_maildir_migration_needed (EShellBackend *shell_backend)
 {
@@ -1539,10 +1191,8 @@ e_mail_migrate (EShellBackend *shell_backend,
 	if (major < 2 || (major == 2 && minor < 22))
 		em_update_message_notify_settings_2_21 ();
 
-	if (major < 2 || (major == 2 && minor < 24)) {
+	if (major < 2 || (major == 2 && minor < 24))
 		em_update_sa_junk_setting_2_23 ();
-		migrate_to_db (shell_backend);
-	}
 #else
 	if (major < 2 || (major == 2 && minor < 24))
 		g_warning (
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 04d69ad211..2bc3bf3d81 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -69,6 +69,7 @@
 #include "em-utils.h"
 #include "mail-ops.h"
 #include "mail-mt.h"
+#include "mail-guess-servers.h"
 
 #if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 #include "smime/gui/e-cert-selector.h"
@@ -81,24 +82,6 @@
 
 #define d(x)
 
-static ServerData mail_servers[] = {
-	{ "gmail", "imap.gmail.com", "smtp.gmail.com", "imap",
-	  CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT },
-	{ "googlemail", "imap.gmail.com", "smtp.gmail.com", "imap",
-	  CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT },
-	{ "yahoo", "pop3.yahoo.com", "smtp.yahoo.com", "pop",
-	  CAMEL_NETWORK_SECURITY_METHOD_NONE },
-	{ "aol", "imap.aol.com", "smtp.aol.com", "imap",
-	  CAMEL_NETWORK_SECURITY_METHOD_NONE },
-	{ "msn", "pop3.email.msn.com", "smtp.email.msn.com", "pop",
-	  CAMEL_NETWORK_SECURITY_METHOD_NONE, "@", "@"},
-	{ "hotmail", "pop3.live.com", "smtp.live.com", "pop",
-	  CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT, "@", "@"},
-	{ "live.com", "pop3.live.com", "smtp.live.com", "pop",
-	  CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT, "@", "@"},
-
-};
-
 /* econfig item for the extra config hings */
 struct _receive_options_item {
 	EMConfigItem item;
@@ -214,14 +197,41 @@ struct _EMAccountEditorPrivate {
 	GtkButton *smime_encrypt_key_select;
 	GtkButton *smime_encrypt_key_clear;
 
+	/* Review */
+	GtkLabel *review_name;
+	GtkLabel *review_email;
+	GtkLabel *send_name;
+	GtkLabel *send_stype;
+	GtkLabel *send_saddress;
+	GtkLabel *send_encryption;
+	GtkLabel *receive_name;
+	GtkLabel *receive_stype;
+	GtkLabel *receive_saddress;
+	GtkLabel *receive_encryption;
+	GtkWidget *review_box;
+
+	/* google and yahoo specific data*/
+	gboolean is_gmail;
+	gboolean is_yahoo;
+
+	GtkWidget *calendar;
+	GtkWidget *gcontacts;
+	GtkWidget *info_label;
+
+	GtkWidget *account_label;
+	GtkWidget *gmail_link;
+	GtkWidget *yahoo_cal_box;
+	GtkWidget *yahoo_cal_entry;
+
 	/* for e-config callbacks, each page sets up its widgets, then they are dealed out by the get_widget callback in order*/
 	GHashTable *widgets;
 
 	/* for assistant page preparation */
 	guint identity_set : 1;
 	guint receive_set : 1;
+	guint receive_opt_set : 1;
 	guint send_set : 1;
-	guint management_set : 1;
+	guint review_set : 1;
 
 	ServerData *selected_server;
 };
@@ -251,7 +261,6 @@ enum {
 
 static void em_account_editor_construct (EMAccountEditor *emae, EMAccountEditorType type, const gchar *id);
 static void emae_account_folder_changed (EMFolderSelectionButton *folder, EMAccountEditor *emae);
-static ServerData * emae_check_servers (const gchar *email);
 
 static gpointer parent_class;
 
@@ -1138,7 +1147,6 @@ emae_init (EMAccountEditor *emae)
 		emae, EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorPrivate);
 
 	emae->priv->selected_server = NULL;
-	emae->emae_check_servers = emae_check_servers;
 	emae->priv->source.emae = emae;
 	emae->priv->transport.emae = emae;
 	emae->priv->widgets = g_hash_table_new (g_str_hash, g_str_equal);
@@ -1146,6 +1154,9 @@ emae_init (EMAccountEditor *emae)
 	/* Pick default storage and transport protocols. */
 	emae->priv->source.protocol = "imapx";
 	emae->priv->transport.protocol = "smtp";
+
+	emae->priv->is_gmail = FALSE;
+	emae->priv->is_yahoo = FALSE;
 }
 
 GType
@@ -2202,10 +2213,12 @@ emae_service_provider_changed (EMAccountEditorService *service)
 {
 	EConfig *config;
 	EMConfigTargetSettings *target;
-	CamelProvider *provider;
+	CamelProvider *provider = NULL;
 	const gchar *description;
 
-	provider = camel_provider_get (service->protocol, NULL);
+	/* Protocol is NULL when server type is 'None'. */
+	if (service->protocol != NULL)
+		provider = camel_provider_get (service->protocol, NULL);
 
 	description = (provider != NULL) ? provider->description : "";
 	gtk_label_set_text (service->description, description);
@@ -2376,7 +2389,7 @@ emae_refresh_providers (EMAccountEditor *emae,
 		if (!(mail_or_news_domain
 		      && provider->object_types[service->type]
 		      && (service->type != CAMEL_PROVIDER_STORE ||
-		         (provider->flags & CAMEL_PROVIDER_IS_SOURCE) != 0))
+			 (provider->flags & CAMEL_PROVIDER_IS_SOURCE) != 0))
 		    /* hardcode not showing providers who's transport is done in the store */
 		    || (service->type == CAMEL_PROVIDER_TRANSPORT
 			&& CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)))
@@ -2554,7 +2567,7 @@ emae_setup_service (EMAccountEditor *emae,
                     GtkBuilder *builder)
 {
 	struct _service_info *info = &emae_service_info[service->type];
-	CamelProvider *provider;
+	CamelProvider *provider = NULL;
 	CamelURL *url;
 
 	/* GtkComboBox internalizes ID strings, which for the provider
@@ -2564,7 +2577,9 @@ emae_setup_service (EMAccountEditor *emae,
 		service->protocol = g_intern_string (url->protocol);
 	camel_url_free (url);
 
-	provider = camel_provider_get (service->protocol, NULL);
+	/* Protocol is NULL when server type is 'None'. */
+	if (service->protocol != NULL)
+		provider = camel_provider_get (service->protocol, NULL);
 
 	/* Extract all widgets we need from the builder file. */
 
@@ -2814,9 +2829,9 @@ emae_create_basic_assistant_page (EMAccountEditor *emae,
 	} else if (g_ascii_strcasecmp (page_id, "transport_page") == 0) {
 		title = _("Sending Email");
 		label = _("Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider.");
-	} else if (g_ascii_strcasecmp (page_id, "management_page") == 0) {
-		title = _("Account Information");
-		label = _("Please enter a descriptive name for this account below.\nThis name will be used for display purposes only.");
+	} else if (g_ascii_strcasecmp (page_id, "review_page") == 0) {
+		title = _("Review Account");
+		label = _("Time to check things over before we try and connect to the server and fetch your mail.");
 	} else if (g_ascii_strcasecmp (page_id, "finish_page") == 0) {
 		page_type = GTK_ASSISTANT_PAGE_CONFIRM;
 		fill_space = TRUE;
@@ -3577,7 +3592,7 @@ emae_send_page (EConfig *ec,
 	GtkWidget *w;
 	GtkBuilder *builder;
 
-	provider = emae_get_store_provider (emae);
+	provider = emae_get_transport_provider (emae);
 
 	if (provider == NULL)
 		return NULL;
@@ -4124,7 +4139,7 @@ static EMConfigItem emae_editor_items[] = {
 static gboolean emae_editor_items_translated = FALSE;
 
 static GtkWidget *
-emae_management_page (EConfig *ec,
+emae_review_page (EConfig *ec,
                       EConfigItem *item,
                       GtkWidget *parent,
                       GtkWidget *old,
@@ -4134,16 +4149,35 @@ emae_management_page (EConfig *ec,
 	EMAccountEditor *emae = data;
 	EMAccountEditorPrivate *priv = emae->priv;
 	GtkWidget *w;
+	GtkBuilder *builder;
+
+	builder = gtk_builder_new ();
+	e_load_ui_builder_definition (builder, "mail-config.ui");
 
-	w = priv->management_frame;
+	priv->review_name = (GtkLabel*) e_builder_get_widget (builder, "personal-name-entry");
+	priv->review_email = (GtkLabel*) e_builder_get_widget (builder, "personal-email-entry");
+	priv->receive_stype = (GtkLabel*) e_builder_get_widget (builder, "receive_server_type");
+	priv->send_stype = (GtkLabel*) e_builder_get_widget (builder, "send_server_type");
+	priv->receive_saddress = (GtkLabel*) e_builder_get_widget (builder, "receive_server_address");
+	priv->send_saddress = (GtkLabel*) e_builder_get_widget (builder, "send_server_address");
+	priv->receive_name = (GtkLabel*) e_builder_get_widget (builder, "receive_username");
+	priv->send_name = (GtkLabel*) e_builder_get_widget (builder, "send_username");
+	priv->receive_encryption = (GtkLabel*) e_builder_get_widget (builder, "receive_encryption");
+	priv->send_encryption = (GtkLabel*) e_builder_get_widget (builder, "send_encryption");
+
+	w = e_builder_get_widget (builder, item->label);
+	priv->review_box = gtk_vbox_new (FALSE, 2);
+	gtk_widget_show (priv->review_box);
 	if (((EConfig *) priv->config)->type == E_CONFIG_ASSISTANT) {
 		GtkWidget *page;
 
 		page = emae_create_basic_assistant_page (
 			emae, GTK_ASSISTANT (parent),
-			"management_page", position);
+			"review_page", position);
 
-		gtk_widget_reparent (w, page);
+		gtk_box_pack_start (GTK_BOX (page), w, FALSE, FALSE, 0);
+		gtk_box_pack_start (GTK_BOX (page), priv->review_box, FALSE, FALSE, 0);
+		gtk_widget_reparent (priv->management_frame, page);
 
 		w = page;
 	}
@@ -4199,7 +4233,7 @@ static EMConfigItem emae_assistant_items[] = {
 	{ E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/00.folders", (gchar *) "special-folders-table", emae_widget_glade },
 	{ E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "composing-messages-table", emae_widget_glade },
 
-	{ E_CONFIG_PAGE, (gchar *) "40.management", (gchar *) "management_frame", emae_management_page },
+	{ E_CONFIG_PAGE, (gchar *) "50.review", (gchar *) "vboxReviewBorder", emae_review_page },
 
 	{ E_CONFIG_PAGE_FINISH, (gchar *) "999.end", (gchar *) "finish_page", emae_widget_assistant_page },
 	{ 0 },
@@ -4238,7 +4272,7 @@ static gboolean
 emae_service_complete (EMAccountEditor *emae,
                        EMAccountEditorService *service)
 {
-	CamelProvider *provider;
+	CamelProvider *provider = NULL;
 	const gchar *host = NULL;
 	const gchar *path = NULL;
 	const gchar *user = NULL;
@@ -4251,7 +4285,9 @@ emae_service_complete (EMAccountEditor *emae,
 	gboolean need_port;
 	gboolean need_user;
 
-	provider = camel_provider_get (service->protocol, NULL);
+	/* Protocol is NULL when server type is 'None'. */
+	if (service->protocol != NULL)
+		provider = camel_provider_get (service->protocol, NULL);
 
 	if (provider == NULL)
 		return TRUE;
@@ -4301,17 +4337,93 @@ emae_service_complete (EMAccountEditor *emae,
 static ServerData *
 emae_check_servers (const gchar *email)
 {
-	gint len = G_N_ELEMENTS (mail_servers), i;
-	gchar *server = strchr (email, '@');
-
-	server++;
+	ServerData *sdata = g_new0 (ServerData, 1);
+	EmailProvider *provider = g_new0 (EmailProvider, 1);
+	gchar *dupe = g_strdup (email);
+	gchar *tmp;
+
+	/* FIXME: Find a way to free the provider once given to account settings. */
+	provider->email = (gchar *) email;
+	tmp = strchr (email, '@');
+	tmp++;
+	provider->domain = tmp;
+	tmp = strchr (dupe, '@');
+	*tmp = 0;
+	provider->username = (gchar *) g_quark_to_string (g_quark_from_string (dupe));
+	g_free (dupe);
+
+	if (!mail_guess_servers (provider)) {
+		g_free (provider);
+		g_free (sdata);
+		return NULL;
+	}
+	/*printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n",
+	  provider->recv_type, provider->recv_hostname, provider->recv_port, provider->recv_username, provider->recv_auth,
+	  provider->send_type, provider->send_hostname, provider->send_port, provider->send_username, provider->send_auth,
+	  provider->recv_socket_type, provider->send_socket_type); */
+
+	sdata->recv = provider->recv_hostname;
+	sdata->recv_port = provider->recv_port;
+	sdata->send = provider->send_hostname;
+	sdata->send_port = provider->send_port;
+	if (strcmp (provider->recv_type, "pop3") == 0)
+		sdata->proto = g_strdup ("pop");
+	else if (strcmp (provider->recv_type, "imap") == 0)
+		sdata->proto = g_strdup ("imapx");
+	else
+		sdata->proto = provider->recv_type;
+	if (provider->recv_socket_type) {
+		CamelNetworkSecurityMethod method;
+
+		if (g_ascii_strcasecmp (provider->recv_socket_type, "SSL") == 0)
+			method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+		else if (g_ascii_strcasecmp (provider->recv_socket_type, "secure") == 0)
+			method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+		else if (g_ascii_strcasecmp (provider->recv_socket_type, "STARTTLS") == 0)
+			method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+		else if (g_ascii_strcasecmp (provider->recv_socket_type, "TLS") == 0)
+			method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+		else
+			method = CAMEL_NETWORK_SECURITY_METHOD_NONE;
+
+		sdata->security_method = method;
+		sdata->recv_security_method = method;
+	}
 
-	for (i = 0; i < len; i++) {
-		if (strstr (server, mail_servers[i].key) != NULL)
-			return &mail_servers[i];
+	if (provider->send_socket_type) {
+		CamelNetworkSecurityMethod method;
+
+		if (g_ascii_strcasecmp (provider->send_socket_type, "SSL") == 0)
+			method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+		else if (g_ascii_strcasecmp (provider->send_socket_type, "secure") == 0)
+			method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+		else if (g_ascii_strcasecmp (provider->send_socket_type, "STARTTLS") == 0)
+			method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+		else if (g_ascii_strcasecmp (provider->send_socket_type, "TLS") == 0)
+			method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+		else
+			method = CAMEL_NETWORK_SECURITY_METHOD_NONE;
+
+		sdata->send_security_method = method;
 	}
 
-	return NULL;
+	sdata->send_auth = provider->send_auth;
+	sdata->recv_auth = provider->recv_auth;
+	sdata->send_user = provider->send_username;
+	sdata->recv_user = provider->recv_username;
+
+	g_free (provider);
+
+	return sdata;
+}
+
+static void
+emae_destroy_widget (GtkWidget *widget)
+{
+	if (widget && GTK_IS_WIDGET (widget)) {
+		gtk_widget_destroy (widget);
+		widget = NULL;
+	}
 }
 
 static gboolean
@@ -4355,7 +4467,6 @@ emae_check_complete (EConfig *ec,
 			if (!emae->priv->receive_set) {
 				ServerData *sdata;
 				gchar *user, *at;
-				gchar *uri = g_strdup (e_account_get_string (account, E_ACCOUNT_SOURCE_URL));
 				CamelURL *url;
 
 				emae->priv->receive_set = 1;
@@ -4366,16 +4477,21 @@ emae_check_complete (EConfig *ec,
 				user[at - tmp] = 0;
 				at++;
 
-				sdata = emae->priv->selected_server = emae->emae_check_servers (tmp);
-				if (new_account && uri && (url = camel_url_new (uri, NULL)) != NULL) {
+				sdata = emae->priv->selected_server = emae_check_servers (tmp);
+				if (new_account && (url = emae_account_url (emae, E_ACCOUNT_SOURCE_URL))) {
 					const gchar *use_user = user;
+					gchar *uri;
+
 					refresh = TRUE;
 					if (sdata && sdata->recv_user && *sdata->recv_user)
 						use_user = g_str_equal (sdata->recv_user, "@") ? tmp : sdata->recv_user;
+
+					camel_url_set_user (url, use_user);
 					gtk_entry_set_text (emae->priv->source.username, use_user);
 
 					if (sdata != NULL) {
 						CamelNetworkSecurityMethod method;
+
 						if (sdata->recv_security_method != CAMEL_NETWORK_SECURITY_METHOD_NONE)
 							method = sdata->recv_security_method;
 						else
@@ -4383,15 +4499,21 @@ emae_check_complete (EConfig *ec,
 						g_object_set (emae->priv->source.settings, "security-method", method, NULL);
 
 						camel_url_set_protocol (url, sdata->proto);
+						emae->priv->source.protocol = sdata->proto;
 						camel_url_set_host (url, sdata->recv);
 						if (sdata->recv_port && *sdata->recv_port)
 							camel_url_set_port (url, atoi (sdata->recv_port));
+
+						e_account_set_bool (account, E_ACCOUNT_SOURCE_AUTO_CHECK, TRUE);
+						e_account_set_bool (account, E_ACCOUNT_SOURCE_SAVE_PASSWD, TRUE);
+						if (g_strcmp0 (url->protocol, "pop") == 0)
+							e_account_set_bool (account, E_ACCOUNT_SOURCE_KEEP_ON_SERVER, TRUE);
+
 						gtk_entry_set_text (emae->priv->source.hostname, sdata->recv);
 						gtk_entry_set_text (emae->priv->transport.hostname, sdata->send);
 					} else {
 						camel_url_set_host (url, "");
 					}
-					g_free (uri);
 					uri = camel_url_to_string (url, 0);
 					e_account_set_string (account, E_ACCOUNT_SOURCE_URL, uri);
 					if (sdata != NULL && sdata->recv_auth && *sdata->recv_auth)
@@ -4400,16 +4522,15 @@ emae_check_complete (EConfig *ec,
 							sdata->recv_auth);
 
 					camel_url_free (url);
+					g_free (uri);
 				} else
 					gtk_entry_set_text (emae->priv->source.username, user);
-				g_free (uri);
 
 			}
 		} else if (!strcmp (pageid, "30.send")) {
 			if (!emae->priv->send_set) {
 				CamelURL *url;
 				gchar *at, *user;
-				gchar *uri = (gchar *) e_account_get_string (account, E_ACCOUNT_TRANSPORT_URL);
 				ServerData *sdata;
 
 				emae->priv->send_set = 1;
@@ -4421,9 +4542,10 @@ emae_check_complete (EConfig *ec,
 				at++;
 
 				sdata = emae->priv->selected_server;
-				if (sdata != NULL && uri && (url = camel_url_new (uri, NULL)) != NULL) {
+				if (sdata != NULL && (url = emae_account_url (emae, E_ACCOUNT_TRANSPORT_URL))) {
 					CamelNetworkSecurityMethod method;
 					const gchar *use_user = user;
+					gchar *uri;
 
 					refresh = TRUE;
 
@@ -4440,10 +4562,13 @@ emae_check_complete (EConfig *ec,
 
 					if (sdata->send_user && *sdata->send_user)
 						use_user = g_str_equal (sdata->send_user, "@") ? tmp : sdata->send_user;
+
+					camel_url_set_user (url, use_user);
 					gtk_entry_set_text (emae->priv->transport.username, use_user);
 
 					uri = camel_url_to_string (url, 0);
 					e_account_set_string (account, E_ACCOUNT_TRANSPORT_URL, uri);
+					e_account_set_bool (account, E_ACCOUNT_TRANSPORT_SAVE_PASSWD, TRUE);
 					g_free (uri);
 					camel_url_free (url);
 					gtk_toggle_button_set_active (emae->priv->transport.needs_auth, TRUE);
@@ -4453,27 +4578,32 @@ emae_check_complete (EConfig *ec,
 							sdata->send_auth);
 					else
 						emae_authtype_changed (emae->priv->transport.authtype, &emae->priv->transport);
-					uri = (gchar *) e_account_get_string (account, E_ACCOUNT_TRANSPORT_URL);
 				} else
 					gtk_entry_set_text (emae->priv->transport.username, user);
 			}
 
 		} else if (!strcmp (pageid, "20.receive_options")) {
-			CamelProvider *provider;
+			if (!emae->priv->receive_opt_set) {
+				CamelProvider *provider;
 
-			provider = emae_get_store_provider (emae);
+				provider = emae_get_store_provider (emae);
 
-			if (provider != NULL
-			    && emae->priv->extra_provider != provider) {
-				emae->priv->extra_provider = provider;
-				emae_auto_detect (emae);
+				if (provider != NULL
+				&& emae->priv->extra_provider != provider) {
+					emae->priv->extra_provider = provider;
+					emae_auto_detect (emae);
+				}
+
+				emae->priv->receive_opt_set = 1;
 			}
-		} else if (!strcmp (pageid, "40.management")) {
-			if (!emae->priv->management_set) {
+		} else if (!strcmp (pageid, "50.review")) {
+			if (!emae->priv->review_set) {
 				gchar *template;
 				guint i = 0, len;
+				gchar *uri, *enc, *buff, *cal_name;
+				CamelURL *url;
+				CamelNetworkSecurityMethod method;
 
-				emae->priv->management_set = 1;
 				tmp = e_account_get_string (account, E_ACCOUNT_ID_ADDRESS);
 				len = strlen (tmp);
 				template = g_alloca (len + 14);
@@ -4482,6 +4612,122 @@ emae_check_complete (EConfig *ec,
 					sprintf (template + len, " (%d)", i++);
 
 				gtk_entry_set_text (emae->priv->identity_entries[0], template);
+
+				gtk_label_set_text (emae->priv->review_name, e_account_get_string (account, E_ACCOUNT_ID_NAME));
+				gtk_label_set_text (emae->priv->review_email, e_account_get_string (account, E_ACCOUNT_ID_ADDRESS));
+				uri = (gchar * ) e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
+				if (uri  && (url = camel_url_new (uri, NULL))) {
+					gtk_label_set_text (emae->priv->receive_stype, url->protocol);
+					gtk_label_set_text (emae->priv->receive_saddress, url->host);
+					gtk_label_set_text (emae->priv->receive_name, url->user);
+					g_object_get (emae->priv->source.settings, "security-method", &method, NULL);
+					if (method == CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT)
+						enc = g_strdup (_("Always(SSL)"));
+					else if (method == CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT)
+						enc = g_strdup (_("When possible(TLS)"));
+					else
+						enc = g_strdup (_("Never"));
+
+					gtk_label_set_text (emae->priv->receive_encryption, enc);
+					g_free (enc);
+				}
+				uri = (gchar * ) e_account_get_string (account, E_ACCOUNT_TRANSPORT_URL);
+				if (uri  && (url = camel_url_new (uri, NULL))) {
+					gtk_label_set_text (emae->priv->send_stype, url->protocol);
+					gtk_label_set_text (emae->priv->send_saddress, url->host);
+					gtk_label_set_text (emae->priv->send_name, url->user);
+					g_object_get (emae->priv->transport.settings, "security-method", &method, NULL);
+					if (method == CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT)
+						enc = g_strdup (_("Always(SSL)"));
+					else if (method == CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT)
+						enc = g_strdup (_("When possible(TLS)"));
+					else
+						enc = g_strdup (_("Never"));
+
+					gtk_label_set_text (emae->priv->send_encryption, enc);
+					g_free (enc);
+				}
+
+				if (g_strrstr (account->source->url, "gmail") || g_strrstr (account->source->url, "googlemail")) {
+					emae->priv->is_gmail = TRUE;
+
+					emae_destroy_widget (emae->priv->gcontacts);
+					emae_destroy_widget (emae->priv->calendar);
+					emae_destroy_widget (emae->priv->account_label);
+					emae_destroy_widget (emae->priv->gmail_link);
+
+					emae->priv->gcontacts = gtk_check_button_new_with_mnemonic (_("Setup Google con_tacts with Evolution"));
+					emae->priv->calendar = gtk_check_button_new_with_mnemonic (_("Setup Google ca_lendar with Evolution"));
+
+					gtk_toggle_button_set_active ((GtkToggleButton *) emae->priv->gcontacts, TRUE);
+					gtk_toggle_button_set_active ((GtkToggleButton *) emae->priv->calendar, TRUE);
+
+					gtk_widget_show (emae->priv->gcontacts);
+					gtk_widget_show (emae->priv->calendar);
+
+					emae->priv->account_label = gtk_label_new (NULL);
+					buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Google account settings:"));
+					gtk_label_set_markup ((GtkLabel *) emae->priv->account_label, buff);
+					g_free (buff);
+					gtk_widget_show (emae->priv->account_label);
+
+					gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->account_label, FALSE, FALSE, 0);
+					gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->gcontacts, FALSE, FALSE, 0);
+					gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->calendar, FALSE, FALSE, 0);
+
+					emae->priv->gmail_link = gtk_link_button_new_with_label ("https://mail.google.com/mail/?ui=2&amp;shva=1#settings/fwdandpop", _("You may need to enable IMAP access."));
+					gtk_widget_show (emae->priv->gmail_link);
+					gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->gmail_link, FALSE, FALSE, 0);
+
+				}  else if ((g_strrstr(account->source->url, "yahoo.") || g_strrstr(account->source->url, "ymail.")
+						|| g_strrstr(account->source->url, "rocketmail."))) {
+
+					emae->priv->is_yahoo = TRUE;
+
+					emae_destroy_widget (emae->priv->calendar);
+					emae_destroy_widget (emae->priv->info_label);
+					emae_destroy_widget (emae->priv->yahoo_cal_entry);
+					emae_destroy_widget (emae->priv->account_label);
+					emae_destroy_widget (emae->priv->yahoo_cal_box);
+
+					emae->priv->calendar = gtk_check_button_new_with_mnemonic (_("Setup _Yahoo calendar with Evolution"));
+
+					gtk_toggle_button_set_active ((GtkToggleButton *) emae->priv->calendar, TRUE);
+
+					emae->priv->info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct."));
+					gtk_label_set_line_wrap ((GtkLabel *) emae->priv->info_label, TRUE);
+					gtk_label_set_line_wrap_mode ((GtkLabel *) emae->priv->info_label, PANGO_WRAP_WORD);
+					gtk_label_set_selectable ((GtkLabel *) emae->priv->info_label, TRUE);
+
+					gtk_widget_show (emae->priv->calendar);
+					gtk_widget_show (emae->priv->info_label);
+
+					emae->priv->account_label = gtk_label_new (NULL);
+					buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Yahoo account settings:"));
+					gtk_label_set_markup ((GtkLabel *) emae->priv->account_label, buff);
+					g_free (buff);
+					gtk_widget_show (emae->priv->account_label);
+
+#define PACK_IN_BOX_AND_TEXT(txt,box,child,num) { GtkWidget *txtlbl = gtk_label_new_with_mnemonic (txt); gtk_label_set_mnemonic_widget ((GtkLabel*)txtlbl, child); box = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)box, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)box, child, FALSE, FALSE, num); gtk_widget_show_all (box);}
+
+					gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->account_label, FALSE, FALSE, 0);
+					gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->calendar, FALSE, FALSE, 0);
+
+					emae->priv->yahoo_cal_entry = gtk_entry_new ();
+					gtk_widget_show (emae->priv->yahoo_cal_entry);
+					gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->info_label, FALSE, FALSE, 0);
+					PACK_IN_BOX_AND_TEXT(_("Yahoo Calen_dar name:"), emae->priv->yahoo_cal_box, emae->priv->yahoo_cal_entry, 0);
+					gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->yahoo_cal_box, FALSE, FALSE, 0);
+					cal_name = g_strdup (e_account_get_string (account, E_ACCOUNT_ID_NAME));
+					cal_name = g_strdelimit(cal_name, " ", '_');
+					gtk_entry_set_text ((GtkEntry *) emae->priv->yahoo_cal_entry, cal_name);
+					g_free (cal_name);
+#undef PACK_IN_BOX_AND_TEXT
+				} else {
+					emae->priv->is_gmail = FALSE;
+					emae->priv->is_yahoo = FALSE;
+				}
+
 			}
 		}
 	}
@@ -4530,13 +4776,13 @@ emae_check_complete (EConfig *ec,
 		}
 	}
 
-	if (ok && (pageid == NULL || !strcmp (pageid, "40.management"))) {
+	if (ok && (pageid == NULL || !strcmp (pageid, "50.review"))) {
 		ok = (tmp = e_account_get_string (account, E_ACCOUNT_NAME))
 			&& tmp[0]
 			&& ((ea = e_get_account_by_name (tmp)) == NULL
 			    || ea == original_account);
 		if (!ok) {
-			d (printf ("management page incomplete\n"));
+			d (printf ("review page incomplete\n"));
 		}
 	}
 
@@ -4589,6 +4835,211 @@ forget_password_if_needed (EAccount *original_account,
 	}
 }
 
+#define CALENDAR_CALDAV_URI "caldav://%s@www.google.com/calendar/dav/%s/events"
+#define GMAIL_CALENDAR_LOCATION "://www.google.com/calendar/feeds/"
+#define CALENDAR_DEFAULT_PATH "/private/full"
+#define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars"
+#define YAHOO_CALENDAR_LOCATION "%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s"
+
+static gchar *
+sanitize_user_mail (const gchar *user)
+{
+	if (!user)
+		return NULL;
+
+	if (strstr (user, "%40") != NULL) {
+		return g_strdup (user);
+	} else if (!is_email (user)) {
+		return g_strconcat (user, "%40gmail.com", NULL);
+	} else {
+		gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (user) + 2));
+		gchar *at = strchr (user, '@');
+
+		strncpy (tmp, user, at - user);
+		strcat (tmp, "%40");
+		strcat (tmp, at + 1);
+
+		return tmp;
+	}
+}
+
+static void
+setup_google_addressbook (EMAccountEditor *emae)
+{
+	GConfClient *gconf;
+	ESourceList *slist;
+	ESourceGroup *sgrp;
+	GSList *sources;
+	gboolean source_already_exists = FALSE;
+	CamelURL *url;
+	gchar * username;
+
+	gconf = gconf_client_get_default ();
+	slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" );
+	sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE);
+	url = emae_account_url (emae, E_ACCOUNT_SOURCE_URL);
+	username = g_strdup (url->user);
+
+	sources = e_source_group_peek_sources (sgrp);
+	for (; sources; sources = sources->next) {
+		ESource *existing = (ESource *) sources->data;
+		if (!g_strcmp0 (e_source_peek_relative_uri (existing), username)) {
+			source_already_exists = TRUE;
+			break;
+		}
+	}
+
+	if (!source_already_exists) {
+		ESource *abook;
+
+		/* FIXME: Not sure if we should localize 'Contacts' */
+		abook = e_source_new ("Contacts", "");
+		e_source_set_property (abook, "default", "true");
+		e_source_set_property (abook, "offline_sync", "1");
+		e_source_set_property (abook, "auth", "plain/password");
+		e_source_set_property (abook, "use-ssl", "true");
+		e_source_set_property (abook, "remember_password", "true");
+		e_source_set_property (abook, "refresh-interval", "86400");
+		e_source_set_property (abook, "completion", "true");
+		e_source_set_property (abook, "username", username);
+
+		e_source_group_add_source (sgrp, abook, -1);
+		e_source_set_relative_uri (abook, username);
+		e_source_list_sync (slist, NULL);
+
+		g_object_unref (abook);
+	}
+
+	g_free (username);
+	g_object_unref (slist);
+	g_object_unref (sgrp);
+	g_object_unref (gconf);
+}
+
+static void
+setup_google_calendar (EMAccountEditor *emae)
+{
+	GConfClient *gconf;
+	ESourceList *slist;
+	ESourceGroup *sgrp;
+	ESource *calendar;
+	gchar *sanitize_uname, *username;
+	gchar *abs_uri, *rel_uri;
+	GSList *ids, *temp;
+	CamelURL *url;
+
+	gconf = gconf_client_get_default ();
+	slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
+	sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE);
+	url = emae_account_url (emae, E_ACCOUNT_SOURCE_URL);
+	username = g_strdup (url->user);
+
+	/* FIXME: Not sure if we should localize 'Calendar' */
+	calendar = e_source_new ("Calendar", "");
+	e_source_set_property (calendar, "ssl", "1");
+	e_source_set_property (calendar, "refresh", "30");
+	e_source_set_property (calendar, "auth", "1");
+	e_source_set_property (calendar, "offline_sync", "1");
+	e_source_set_property (calendar, "username", username);
+	e_source_set_property (calendar, "setup-username", username);
+	e_source_set_property (calendar, "default", "true");
+	e_source_set_property (calendar, "alarm", "true");
+	e_source_set_readonly (calendar, FALSE);
+
+	e_source_group_add_source (sgrp, calendar, -1);
+
+	sanitize_uname = sanitize_user_mail (username);
+
+	abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, username);
+	e_source_set_absolute_uri (calendar, abs_uri);
+
+	rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL);
+	e_source_set_relative_uri (calendar, rel_uri);
+
+	e_source_list_sync (slist, NULL);
+
+	ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL);
+	ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar)));
+	gconf_client_set_list (gconf,  SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL);
+	temp = ids;
+
+	for (; temp != NULL; temp = g_slist_next (temp))
+		g_free (temp->data);
+
+	g_free (username);
+	g_slist_free (ids);
+	g_free (abs_uri);
+	g_free (rel_uri);
+	g_free (sanitize_uname);
+	g_object_unref (slist);
+	g_object_unref (sgrp);
+	g_object_unref (calendar);
+	g_object_unref (gconf);
+}
+
+static void
+setup_yahoo_calendar (EMAccountEditor *emae)
+{
+	GConfClient *gconf;
+	ESourceList *slist;
+	ESourceGroup *sgrp;
+	ESource *calendar;
+	gchar *sanitize_uname;
+	gchar *abs_uri, *rel_uri;
+	GSList *ids, *temp;
+	const gchar *email;
+
+	gconf = gconf_client_get_default ();
+	email = e_account_get_string (em_account_editor_get_modified_account (emae), E_ACCOUNT_ID_ADDRESS);
+	slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
+	sgrp = e_source_list_peek_group_by_base_uri (slist, "caldav://");
+	if (!sgrp) {
+		sgrp = e_source_list_ensure_group (slist, _("CalDAV"), "caldav://", TRUE);
+	}
+
+	printf("Setting up Yahoo Calendar: list:%p CalDAVGrp: %p\n", slist, sgrp);
+
+	/* FIXME: Not sure if we should localize 'Calendar' */
+	calendar = e_source_new ("Yahoo", "");
+	e_source_set_property (calendar, "ssl", "1");
+	e_source_set_property (calendar, "refresh", "30");
+	e_source_set_property (calendar, "refresh-type", "0");
+	e_source_set_property (calendar, "auth", "1");
+	e_source_set_property (calendar, "offline_sync", "1");
+	e_source_set_property (calendar, "username", email);
+	e_source_set_property (calendar, "default", "true");
+	e_source_set_property (calendar, "alarm", "true");
+
+	e_source_set_readonly (calendar, FALSE);
+
+	sanitize_uname = sanitize_user_mail (email);
+
+	abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/",
+			sanitize_uname, email,  gtk_entry_get_text ((GtkEntry *) emae->priv->yahoo_cal_entry));
+	rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text ((GtkEntry *) emae->priv->yahoo_cal_entry));
+	e_source_set_relative_uri (calendar, rel_uri);
+
+	e_source_group_add_source (sgrp, calendar, -1);
+	e_source_list_sync (slist, NULL);
+
+	ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL);
+	ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar)));
+	gconf_client_set_list (gconf,  SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL);
+	temp = ids;
+
+	for (; temp != NULL; temp = g_slist_next (temp))
+		g_free (temp->data);
+
+	g_slist_free (ids);
+	g_free (abs_uri);
+	g_free (rel_uri);
+	g_free (sanitize_uname);
+	g_object_unref (slist);
+	g_object_unref (sgrp);
+	g_object_unref (calendar);
+	g_object_unref (gconf);
+}
+
 static void
 emae_commit (EConfig *ec,
              EMAccountEditor *emae)
@@ -4605,6 +5056,17 @@ emae_commit (EConfig *ec,
 	modified_account = em_account_editor_get_modified_account (emae);
 	original_account = em_account_editor_get_original_account (emae);
 
+	/* check for google and yahoo specific settings */
+	if (!original_account && emae->priv->is_gmail) {
+		if (gtk_toggle_button_get_active ((GtkToggleButton *) emae->priv->gcontacts))
+			setup_google_addressbook (emae);
+		if (gtk_toggle_button_get_active ((GtkToggleButton *) emae->priv->calendar))
+			setup_google_calendar (emae);
+	} else if (!original_account && emae->priv->is_gmail) {
+		if (gtk_toggle_button_get_active ((GtkToggleButton *) emae->priv->calendar))
+			setup_yahoo_calendar (emae);
+	}
+
 	/* Do some last minute tweaking. */
 
 	settings = emae->priv->source.settings;
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index 3416b5d161..3b30112f73 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -88,7 +88,6 @@ struct _EMAccountEditor {
 	GtkWidget **pages; /* Pages for Anjal's page type editor */
 
 	guint do_signature:1;	/* allow editing signature */
-	ServerData * (*emae_check_servers) (const gchar *email);
 };
 
 struct _EMAccountEditorClass {
diff --git a/mail/em-utils.c b/mail/em-utils.c
index a3e9a049d6..a3be92d4c0 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -218,33 +218,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;
diff --git a/mail/em-utils.h b/mail/em-utils.h
index b07b74b186..b7e3ec6f49 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -42,8 +42,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);
diff --git a/mail/mail-autoconfig/Makefile.am b/mail/mail-autoconfig/Makefile.am
new file mode 100644
index 0000000000..451101d364
--- /dev/null
+++ b/mail/mail-autoconfig/Makefile.am
@@ -0,0 +1,186 @@
+autoconfig_DATA =				\
+	abc.plala.or.jp				\
+	agate.plala.or.jp			\
+	amail.plala.or.jp			\
+	amber.plala.or.jp			\
+	a.memail.jp				\
+	amethyst.broba.cc			\
+	aol.com					\
+	apost.plala.or.jp			\
+	aqua.plala.or.jp			\
+	arcor.de				\
+	ballade.plala.or.jp			\
+	bay.gunmanet.ne.jp			\
+	bb-niigata.jp				\
+	bc.iij4u.or.jp				\
+	beige.plala.or.jp			\
+	blue.plala.or.jp			\
+	bmail.plala.or.jp			\
+	bolero.plala.or.jp			\
+	bpost.plala.or.jp			\
+	brown.plala.or.jp			\
+	camel.plala.or.jp			\
+	cameo.plala.or.jp			\
+	cc9.ne.jp				\
+	cek.ne.jp				\
+	clio.ne.jp				\
+	cmail.plala.or.jp			\
+	co1.wind.jp				\
+	co2.wind.jp				\
+	co3.wind.jp				\
+	cocoa.plala.or.jp			\
+	coda.plala.or.jp			\
+	comcast.net				\
+	concerto.plala.or.jp			\
+	coral.plala.or.jp			\
+	courante.plala.or.jp			\
+	cpost.plala.or.jp			\
+	cream.plala.or.jp			\
+	dance.plala.or.jp			\
+	dan.gunmanet.ne.jp			\
+	dmail.plala.or.jp			\
+	e23.jp					\
+	earthlink.net				\
+	ebony.plala.or.jp			\
+	email.plala.or.jp			\
+	fantasy.plala.or.jp			\
+	flamenco.plala.or.jp			\
+	fmail.plala.or.jp			\
+	free.fr					\
+	freenet.de				\
+	fuga.plala.or.jp			\
+	gmail.com				\
+	gmail.plala.or.jp			\
+	gmx.com					\
+	gmx.net					\
+	googlemail.com				\
+	goo.jp					\
+	go.tvm.ne.jp				\
+	grape.plala.or.jp			\
+	gray.plala.or.jp			\
+	hal.ne.jp				\
+	hana.or.jp				\
+	hotmail.co.jp				\
+	hotmail.com				\
+	hotmail.co.uk				\
+	hotmail.de				\
+	hotmail.fr				\
+	hotmail.it				\
+	ic-net.or.jp				\
+	iiyama-catv.ne.jp			\
+	imail.plala.or.jp			\
+	inbox.lt				\
+	inbox.lv				\
+	indigo.plala.or.jp			\
+	inet-shibata.or.jp			\
+	ivory.plala.or.jp			\
+	iwafune.ne.jp				\
+	jade.plala.or.jp			\
+	janis.or.jp				\
+	jet.ne.jp				\
+	ji.jet.ne.jp				\
+	jmail.plala.or.jp			\
+	k1.wind.jp				\
+	khaki.plala.or.jp			\
+	kmail.plala.or.jp			\
+	kokuyou.ne.jp				\
+	lapis.plala.or.jp			\
+	laposte.net				\
+	lemon.plala.or.jp			\
+	lilac.plala.or.jp			\
+	lime.plala.or.jp			\
+	live.co.jp				\
+	live.com				\
+	live.co.uk				\
+	live.de					\
+	live.fr					\
+	live.it					\
+	ma100.tiki.ne.jp			\
+	mac.com					\
+	mahoroba.ne.jp				\
+	mail.gunmanet.jp			\
+	mail.iwafune.ne.jp			\
+	maroon.plala.or.jp			\
+	me.com					\
+	minuet.plala.or.jp			\
+	ml.murakami.ne.jp			\
+	ml.shibata.ne.jp			\
+	mnet.ne.jp				\
+	mopera.net				\
+	msn.com					\
+	navy.plala.or.jp			\
+	nifty.com				\
+	nsat.jp					\
+	olive.plala.or.jp			\
+	online.de				\
+	opal.plala.or.jp			\
+	orange.fr				\
+	orange.plala.or.jp			\
+	orchid.plala.or.jp			\
+	palette.plala.or.jp			\
+	pal.kijimadaira.jp			\
+	parabox.or.jp				\
+	peach.plala.or.jp			\
+	peoplepc.com				\
+	plum.plala.or.jp			\
+	po.dcn.ne.jp				\
+	polka.plala.or.jp			\
+	pop.shibata.ne.jp			\
+	po.wind.jp				\
+	purple.plala.or.jp			\
+	rainbow.plala.or.jp			\
+	red.plala.or.jp				\
+	rmail.plala.or.jp			\
+	rondo.plala.or.jp			\
+	rose.plala.or.jp			\
+	rouge.plala.or.jp			\
+	ruby.plala.or.jp			\
+	sakunet.ne.jp				\
+	sea.plala.or.jp				\
+	sepia.plala.or.jp			\
+	serenade.plala.or.jp			\
+	silk.plala.or.jp			\
+	silver.plala.or.jp			\
+	sky.plala.or.jp				\
+	smail.plala.or.jp			\
+	snow.plala.or.jp			\
+	sonata.plala.or.jp			\
+	so.wind.ne.jp				\
+	suite.plala.or.jp			\
+	symphony.plala.or.jp			\
+	taupe.plala.or.jp			\
+	tiki.ne.jp				\
+	tmail.plala.or.jp			\
+	toccata.plala.or.jp			\
+	t-online.de				\
+	topaz.plala.or.jp			\
+	trio.plala.or.jp			\
+	umail.plala.or.jp			\
+	verizon.net				\
+	violet.plala.or.jp			\
+	vm.aikis.or.jp				\
+	vmail.plala.or.jp			\
+	vp.tiki.ne.jp				\
+	waltz.plala.or.jp			\
+	wanadoo.fr				\
+	wave.plala.or.jp			\
+	web.de					\
+	white.plala.or.jp			\
+	wine.plala.or.jp			\
+	wmail.plala.or.jp			\
+	xmail.plala.or.jp			\
+	xpost.plala.or.jp			\
+	xp.wind.jp				\
+	xs4all.nl				\
+	yahoo.com				\
+	ybb.ne.jp				\
+	yellow.plala.or.jp			\
+	ymail.plala.or.jp			\
+	ypost.plala.or.jp			\
+	zmail.plala.or.jp
+
+autoconfigdir = $(privdatadir)/mail-autoconfig
+
+EXTRA_DIST =			\
+	$(autoconfig_DATA)	\
+	README
diff --git a/mail/mail-autoconfig/README b/mail/mail-autoconfig/README
new file mode 100644
index 0000000000..ec68d405b4
--- /dev/null
+++ b/mail/mail-autoconfig/README
@@ -0,0 +1,22 @@
+The files in this directory are used by Evolution's control center
+capplet to automatically configure email accounts.  This so that you
+can tell it, "My mail is example@gmail.com" and it will automatically
+figure out that it must use imap.googlemail.com and smtp.googlemail.com.
+
+These files are copied from
+http://live.mozillamessaging.com/autoconfig/
+
+We should update these files periodically, maybe.
+
+  Federico Mena Quintero
+  March 2010
+
+We duplicate these files (with various modifications) inside the
+'api-web' module in git.
+
+The come from:
+  http://svn.mozilla.org/mozillamessaging.com/sites/autoconfig.mozillamessaging.com/trunk/
+
+and should be re-synched with the Mozilla guys as often as possible.
+The best thing to ping is: ispdb@googlegroups.com or for a
+personal contact on the Mozilla side: Blake Winton bwinton mozillamessaging com
diff --git a/mail/mail-autoconfig/a.memail.jp b/mail/mail-autoconfig/a.memail.jp
new file mode 100644
index 0000000000..61eb90d86d
--- /dev/null
+++ b/mail/mail-autoconfig/a.memail.jp
@@ -0,0 +1,1423 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="biglobe.ne.jp">
+    <domain>007.biglobe.ne.jp</domain>
+    <domain>2001.biglobe.ne.jp</domain>
+    <domain>4649.biglobe.ne.jp</domain>
+    <domain>777.biglobe.ne.jp</domain>
+    <domain>a.biglobe.ne.jp</domain>
+    <domain>a.memail.jp</domain>
+    <domain>ab.biglobe.ne.jp</domain>
+    <domain>ab.memail.jp</domain>
+    <domain>abashiri.eeyo.jp</domain>
+    <domain>abukuma.eeyo.jp</domain>
+    <domain>ace.biglobe.ne.jp</domain>
+    <domain>ace.memail.jp</domain>
+    <domain>achoo.biglobe.ne.jp</domain>
+    <domain>achoo.memail.jp</domain>
+    <domain>adachi.eeyo.jp</domain>
+    <domain>aizu.eeyo.jp</domain>
+    <domain>akan.eeyo.jp</domain>
+    <domain>aki.eeyo.jp</domain>
+    <domain>akita.eeyo.jp</domain>
+    <domain>alien.biglobe.ne.jp</domain>
+    <domain>alien.memail.jp</domain>
+    <domain>aloha.biglobe.ne.jp</domain>
+    <domain>aloha.memail.jp</domain>
+    <domain>amakusa.eeyo.jp</domain>
+    <domain>amami.eeyo.jp</domain>
+    <domain>amethyst.biglobe.ne.jp</domain>
+    <domain>amethyst.memail.jp</domain>
+    <domain>amigo.biglobe.ne.jp</domain>
+    <domain>amigo.memail.jp</domain>
+    <domain>angel.biglobe.ne.jp</domain>
+    <domain>angel.memail.jp</domain>
+    <domain>angler.biglobe.ne.jp</domain>
+    <domain>angler.memail.jp</domain>
+    <domain>aomori.eeyo.jp</domain>
+    <domain>appi.eeyo.jp</domain>
+    <domain>apricot.biglobe.ne.jp</domain>
+    <domain>apricot.memail.jp</domain>
+    <domain>aqua.biglobe.ne.jp</domain>
+    <domain>aqua.memail.jp</domain>
+    <domain>aquamarine.biglobe.ne.jp</domain>
+    <domain>aquamarine.memail.jp</domain>
+    <domain>aquarius.biglobe.ne.jp</domain>
+    <domain>aquarius.memail.jp</domain>
+    <domain>arashiyama.eeyo.jp</domain>
+    <domain>aries.biglobe.ne.jp</domain>
+    <domain>aries.memail.jp</domain>
+    <domain>arima.eeyo.jp</domain>
+    <domain>asahikawa.eeyo.jp</domain>
+    <domain>asakusa.eeyo.jp</domain>
+    <domain>asama.eeyo.jp</domain>
+    <domain>ashizuri.eeyo.jp</domain>
+    <domain>aso.eeyo.jp</domain>
+    <domain>asuka.eeyo.jp</domain>
+    <domain>atami.eeyo.jp</domain>
+    <domain>atsumi.eeyo.jp</domain>
+    <domain>autumn.biglobe.ne.jp</domain>
+    <domain>autumn.memail.jp</domain>
+    <domain>awa.eeyo.jp</domain>
+    <domain>awaji.eeyo.jp</domain>
+    <domain>ayu.biglobe.ne.jp</domain>
+    <domain>ayu.memail.jp</domain>
+    <domain>azumino.eeyo.jp</domain>
+    <domain>b.biglobe.ne.jp</domain>
+    <domain>b.memail.jp</domain>
+    <domain>bamboo.biglobe.ne.jp</domain>
+    <domain>bamboo.memail.jp</domain>
+    <domain>banana.biglobe.ne.jp</domain>
+    <domain>banana.memail.jp</domain>
+    <domain>bandai.eeyo.jp</domain>
+    <domain>baseball.biglobe.ne.jp</domain>
+    <domain>baseball.memail.jp</domain>
+    <domain>basil.biglobe.ne.jp</domain>
+    <domain>basil.memail.jp</domain>
+    <domain>basketball.biglobe.ne.jp</domain>
+    <domain>basketball.memail.jp</domain>
+    <domain>bass.biglobe.ne.jp</domain>
+    <domain>bass.memail.jp</domain>
+    <domain>bat.biglobe.ne.jp</domain>
+    <domain>bat.memail.jp</domain>
+    <domain>bazar.de.gozarre.jp</domain>
+    <domain>bcs.biglobe.ne.jp</domain>
+    <domain>bear.biglobe.ne.jp</domain>
+    <domain>bear.memail.jp</domain>
+    <domain>beat.biglobe.ne.jp</domain>
+    <domain>beat.memail.jp</domain>
+    <domain>beautiful.biglobe.ne.jp</domain>
+    <domain>beautiful.memail.jp</domain>
+    <domain>beer.biglobe.ne.jp</domain>
+    <domain>beer.memail.jp</domain>
+    <domain>believe.biglobe.ne.jp</domain>
+    <domain>believe.memail.jp</domain>
+    <domain>bell.biglobe.ne.jp</domain>
+    <domain>bell.memail.jp</domain>
+    <domain>beppu.eeyo.jp</domain>
+    <domain>bike.biglobe.ne.jp</domain>
+    <domain>bike.memail.jp</domain>
+    <domain>bingo.eeyo.jp</domain>
+    <domain>bird.biglobe.ne.jp</domain>
+    <domain>bird.memail.jp</domain>
+    <domain>bitchu.eeyo.jp</domain>
+    <domain>biwako.eeyo.jp</domain>
+    <domain>bizen.eeyo.jp</domain>
+    <domain>black.biglobe.ne.jp</domain>
+    <domain>black.memail.jp</domain>
+    <domain>blue.biglobe.ne.jp</domain>
+    <domain>blue.memail.jp</domain>
+    <domain>blues.biglobe.ne.jp</domain>
+    <domain>blues.memail.jp</domain>
+    <domain>bluesky.biglobe.ne.jp</domain>
+    <domain>bluesky.memail.jp</domain>
+    <domain>bma.biglobe.ne.jp</domain>
+    <domain>boar.biglobe.ne.jp</domain>
+    <domain>boar.memail.jp</domain>
+    <domain>bohemian.biglobe.ne.jp</domain>
+    <domain>bohemian.memail.jp</domain>
+    <domain>boso.eeyo.jp</domain>
+    <domain>bowwow.biglobe.ne.jp</domain>
+    <domain>bowwow.memail.jp</domain>
+    <domain>bqd.biglobe.ne.jp</domain>
+    <domain>bravo.biglobe.ne.jp</domain>
+    <domain>bravo.memail.jp</domain>
+    <domain>breeze.biglobe.ne.jp</domain>
+    <domain>breeze.memail.jp</domain>
+    <domain>bridge.biglobe.ne.jp</domain>
+    <domain>bridge.memail.jp</domain>
+    <domain>bro.biglobe.ne.jp</domain>
+    <domain>bro.memail.jp</domain>
+    <domain>bungo.eeyo.jp</domain>
+    <domain>butterfly.biglobe.ne.jp</domain>
+    <domain>butterfly.memail.jp</domain>
+    <domain>buzen.eeyo.jp</domain>
+    <domain>c.biglobe.ne.jp</domain>
+    <domain>c.memail.jp</domain>
+    <domain>cafe.biglobe.ne.jp</domain>
+    <domain>cafe.memail.jp</domain>
+    <domain>cake.biglobe.ne.jp</domain>
+    <domain>cake.memail.jp</domain>
+    <domain>cancer.biglobe.ne.jp</domain>
+    <domain>cancer.memail.jp</domain>
+    <domain>candy.biglobe.ne.jp</domain>
+    <domain>candy.memail.jp</domain>
+    <domain>capricorn.biglobe.ne.jp</domain>
+    <domain>capricorn.memail.jp</domain>
+    <domain>cat.biglobe.ne.jp</domain>
+    <domain>cat.memail.jp</domain>
+    <domain>catch.biglobe.ne.jp</domain>
+    <domain>catch.memail.jp</domain>
+    <domain>center.biglobe.ne.jp</domain>
+    <domain>center.memail.jp</domain>
+    <domain>chameleon.biglobe.ne.jp</domain>
+    <domain>chameleon.memail.jp</domain>
+    <domain>cheers.biglobe.ne.jp</domain>
+    <domain>cheers.memail.jp</domain>
+    <domain>cheetah.biglobe.ne.jp</domain>
+    <domain>cheetah.memail.jp</domain>
+    <domain>cherry.biglobe.ne.jp</domain>
+    <domain>cherry.memail.jp</domain>
+    <domain>chiba.eeyo.jp</domain>
+    <domain>chichibu.eeyo.jp</domain>
+    <domain>chikugo.eeyo.jp</domain>
+    <domain>chikuho.eeyo.jp</domain>
+    <domain>chikushi.eeyo.jp</domain>
+    <domain>chikuzen.eeyo.jp</domain>
+    <domain>chita.eeyo.jp</domain>
+    <domain>chocolate.biglobe.ne.jp</domain>
+    <domain>chocolate.memail.jp</domain>
+    <domain>chokaisan.eeyo.jp</domain>
+    <domain>chu.biglobe.ne.jp</domain>
+    <domain>chu.memail.jp</domain>
+    <domain>chubu.eeyo.jp</domain>
+    <domain>chugoku.eeyo.jp</domain>
+    <domain>ciao.biglobe.ne.jp</domain>
+    <domain>ciao.memail.jp</domain>
+    <domain>classical.biglobe.ne.jp</domain>
+    <domain>classical.memail.jp</domain>
+    <domain>clever.biglobe.ne.jp</domain>
+    <domain>clever.memail.jp</domain>
+    <domain>club.biglobe.ne.jp</domain>
+    <domain>club.memail.jp</domain>
+    <domain>cobra.biglobe.ne.jp</domain>
+    <domain>cobra.memail.jp</domain>
+    <domain>comet.biglobe.ne.jp</domain>
+    <domain>comet.memail.jp</domain>
+    <domain>condor.biglobe.ne.jp</domain>
+    <domain>condor.memail.jp</domain>
+    <domain>cool.biglobe.ne.jp</domain>
+    <domain>cool.memail.jp</domain>
+    <domain>coral.biglobe.ne.jp</domain>
+    <domain>coral.memail.jp</domain>
+    <domain>cow.biglobe.ne.jp</domain>
+    <domain>cow.memail.jp</domain>
+    <domain>crow.biglobe.ne.jp</domain>
+    <domain>crow.memail.jp</domain>
+    <domain>cute.biglobe.ne.jp</domain>
+    <domain>cute.memail.jp</domain>
+    <domain>d.biglobe.ne.jp</domain>
+    <domain>d.memail.jp</domain>
+    <domain>dad.biglobe.ne.jp</domain>
+    <domain>dad.memail.jp</domain>
+    <domain>daisen.eeyo.jp</domain>
+    <domain>daisuki.biglobe.ne.jp</domain>
+    <domain>daisuki.memail.jp</domain>
+    <domain>dance.biglobe.ne.jp</domain>
+    <domain>dance.memail.jp</domain>
+    <domain>darling.biglobe.ne.jp</domain>
+    <domain>darling.memail.jp</domain>
+    <domain>dazaifu.eeyo.jp</domain>
+    <domain>de.gozarre.jp</domain>
+    <domain>dear.biglobe.ne.jp</domain>
+    <domain>dear.memail.jp</domain>
+    <domain>denbe.biglobe.ne.jp</domain>
+    <domain>denbe.memail.jp</domain>
+    <domain>dewa.eeyo.jp</domain>
+    <domain>diamond.biglobe.ne.jp</domain>
+    <domain>diamond.memail.jp</domain>
+    <domain>dog.biglobe.ne.jp</domain>
+    <domain>dog.memail.jp</domain>
+    <domain>dogo.eeyo.jp</domain>
+    <domain>dokidoki.biglobe.ne.jp</domain>
+    <domain>dokidoki.memail.jp</domain>
+    <domain>doll.biglobe.ne.jp</domain>
+    <domain>doll.memail.jp</domain>
+    <domain>dolphin.biglobe.ne.jp</domain>
+    <domain>dolphin.memail.jp</domain>
+    <domain>dotonbori.eeyo.jp</domain>
+    <domain>dr.biglobe.ne.jp</domain>
+    <domain>dr.memail.jp</domain>
+    <domain>dragon.biglobe.ne.jp</domain>
+    <domain>dragon.memail.jp</domain>
+    <domain>dreamer.biglobe.ne.jp</domain>
+    <domain>dreamer.memail.jp</domain>
+    <domain>drum.biglobe.ne.jp</domain>
+    <domain>drum.memail.jp</domain>
+    <domain>duck.biglobe.ne.jp</domain>
+    <domain>duck.memail.jp</domain>
+    <domain>dunk.biglobe.ne.jp</domain>
+    <domain>dunk.memail.jp</domain>
+    <domain>e.biglobe.ne.jp</domain>
+    <domain>e.memail.jp</domain>
+    <domain>eagle.biglobe.ne.jp</domain>
+    <domain>eagle.memail.jp</domain>
+    <domain>earth.biglobe.ne.jp</domain>
+    <domain>earth.memail.jp</domain>
+    <domain>east.biglobe.ne.jp</domain>
+    <domain>east.memail.jp</domain>
+    <domain>echigo.eeyo.jp</domain>
+    <domain>echizen.eeyo.jp</domain>
+    <domain>edo.eeyo.jp</domain>
+    <domain>ehime.eeyo.jp</domain>
+    <domain>eight.biglobe.ne.jp</domain>
+    <domain>eight.memail.jp</domain>
+    <domain>elephant.biglobe.ne.jp</domain>
+    <domain>elephant.memail.jp</domain>
+    <domain>eleven.biglobe.ne.jp</domain>
+    <domain>eleven.memail.jp</domain>
+    <domain>emerald.biglobe.ne.jp</domain>
+    <domain>emerald.memail.jp</domain>
+    <domain>energy.biglobe.ne.jp</domain>
+    <domain>energy.memail.jp</domain>
+    <domain>enjoy.biglobe.ne.jp</domain>
+    <domain>enjoy.memail.jp</domain>
+    <domain>erimo.eeyo.jp</domain>
+    <domain>etchu.eeyo.jp</domain>
+    <domain>f.biglobe.ne.jp</domain>
+    <domain>f.memail.jp</domain>
+    <domain>fairy.biglobe.ne.jp</domain>
+    <domain>fairy.memail.jp</domain>
+    <domain>falcon.biglobe.ne.jp</domain>
+    <domain>falcon.memail.jp</domain>
+    <domain>fan.biglobe.ne.jp</domain>
+    <domain>fan.memail.jp</domain>
+    <domain>fantasy.biglobe.ne.jp</domain>
+    <domain>fantasy.memail.jp</domain>
+    <domain>fawn.biglobe.ne.jp</domain>
+    <domain>fawn.memail.jp</domain>
+    <domain>ferret.biglobe.ne.jp</domain>
+    <domain>ferret.memail.jp</domain>
+    <domain>fever.biglobe.ne.jp</domain>
+    <domain>fever.memail.jp</domain>
+    <domain>fight.biglobe.ne.jp</domain>
+    <domain>fight.memail.jp</domain>
+    <domain>fine.biglobe.ne.jp</domain>
+    <domain>fine.memail.jp</domain>
+    <domain>fire.biglobe.ne.jp</domain>
+    <domain>fire.memail.jp</domain>
+    <domain>first.biglobe.ne.jp</domain>
+    <domain>first.memail.jp</domain>
+    <domain>fish.biglobe.ne.jp</domain>
+    <domain>fish.memail.jp</domain>
+    <domain>fist.biglobe.ne.jp</domain>
+    <domain>fist.memail.jp</domain>
+    <domain>five.biglobe.ne.jp</domain>
+    <domain>five.memail.jp</domain>
+    <domain>folk.biglobe.ne.jp</domain>
+    <domain>folk.memail.jp</domain>
+    <domain>force.biglobe.ne.jp</domain>
+    <domain>force.memail.jp</domain>
+    <domain>forest.biglobe.ne.jp</domain>
+    <domain>forest.memail.jp</domain>
+    <domain>four.biglobe.ne.jp</domain>
+    <domain>four.memail.jp</domain>
+    <domain>fox.biglobe.ne.jp</domain>
+    <domain>fox.memail.jp</domain>
+    <domain>fresh.biglobe.ne.jp</domain>
+    <domain>fresh.memail.jp</domain>
+    <domain>fruit.biglobe.ne.jp</domain>
+    <domain>fruit.memail.jp</domain>
+    <domain>fuji.eeyo.jp</domain>
+    <domain>fukui.eeyo.jp</domain>
+    <domain>fukuoka.eeyo.jp</domain>
+    <domain>fukushima.eeyo.jp</domain>
+    <domain>fukuyama.eeyo.jp</domain>
+    <domain>funky.biglobe.ne.jp</domain>
+    <domain>funky.memail.jp</domain>
+    <domain>furano.eeyo.jp</domain>
+    <domain>future.biglobe.ne.jp</domain>
+    <domain>future.memail.jp</domain>
+    <domain>g.biglobe.ne.jp</domain>
+    <domain>g.memail.jp</domain>
+    <domain>gaia.biglobe.ne.jp</domain>
+    <domain>gaia.memail.jp</domain>
+    <domain>galaxy.biglobe.ne.jp</domain>
+    <domain>galaxy.memail.jp</domain>
+    <domain>gambler.biglobe.ne.jp</domain>
+    <domain>gambler.memail.jp</domain>
+    <domain>gamer.biglobe.ne.jp</domain>
+    <domain>gamer.memail.jp</domain>
+    <domain>garnet.biglobe.ne.jp</domain>
+    <domain>garnet.memail.jp</domain>
+    <domain>gassan.eeyo.jp</domain>
+    <domain>gem.biglobe.ne.jp</domain>
+    <domain>gem.memail.jp</domain>
+    <domain>gemini.biglobe.ne.jp</domain>
+    <domain>gemini.memail.jp</domain>
+    <domain>genius.biglobe.ne.jp</domain>
+    <domain>genius.memail.jp</domain>
+    <domain>genki.biglobe.ne.jp</domain>
+    <domain>genki.memail.jp</domain>
+    <domain>george.biglobe.ne.jp</domain>
+    <domain>gifu.eeyo.jp</domain>
+    <domain>ginga.biglobe.ne.jp</domain>
+    <domain>ginga.memail.jp</domain>
+    <domain>giraffe.biglobe.ne.jp</domain>
+    <domain>giraffe.memail.jp</domain>
+    <domain>glasses.biglobe.ne.jp</domain>
+    <domain>glasses.memail.jp</domain>
+    <domain>globe.biglobe.ne.jp</domain>
+    <domain>globe.memail.jp</domain>
+    <domain>gold.biglobe.ne.jp</domain>
+    <domain>gold.memail.jp</domain>
+    <domain>golden.biglobe.ne.jp</domain>
+    <domain>golden.memail.jp</domain>
+    <domain>golf.biglobe.ne.jp</domain>
+    <domain>golf.memail.jp</domain>
+    <domain>good.biglobe.ne.jp</domain>
+    <domain>good.memail.jp</domain>
+    <domain>grace.biglobe.ne.jp</domain>
+    <domain>grace.memail.jp</domain>
+    <domain>grandma.biglobe.ne.jp</domain>
+    <domain>grandma.memail.jp</domain>
+    <domain>grandpa.biglobe.ne.jp</domain>
+    <domain>grandpa.memail.jp</domain>
+    <domain>grazie.biglobe.ne.jp</domain>
+    <domain>grazie.memail.jp</domain>
+    <domain>great.biglobe.ne.jp</domain>
+    <domain>great.memail.jp</domain>
+    <domain>green.biglobe.ne.jp</domain>
+    <domain>green.memail.jp</domain>
+    <domain>groove.biglobe.ne.jp</domain>
+    <domain>groove.memail.jp</domain>
+    <domain>guitar.biglobe.ne.jp</domain>
+    <domain>guitar.memail.jp</domain>
+    <domain>gunma.eeyo.jp</domain>
+    <domain>guts.biglobe.ne.jp</domain>
+    <domain>guts.memail.jp</domain>
+    <domain>guy.biglobe.ne.jp</domain>
+    <domain>guy.memail.jp</domain>
+    <domain>h.biglobe.ne.jp</domain>
+    <domain>h.memail.jp</domain>
+    <domain>hachijo.eeyo.jp</domain>
+    <domain>hachinohe.eeyo.jp</domain>
+    <domain>hachioji.eeyo.jp</domain>
+    <domain>hagi.eeyo.jp</domain>
+    <domain>hakata.eeyo.jp</domain>
+    <domain>hakkoda.eeyo.jp</domain>
+    <domain>hakodate.eeyo.jp</domain>
+    <domain>hakone.eeyo.jp</domain>
+    <domain>hakuba.eeyo.jp</domain>
+    <domain>hakusan.eeyo.jp</domain>
+    <domain>hamamatsu.eeyo.jp</domain>
+    <domain>hamster.biglobe.ne.jp</domain>
+    <domain>hamster.memail.jp</domain>
+    <domain>hanabi.biglobe.ne.jp</domain>
+    <domain>hanabi.memail.jp</domain>
+    <domain>handsome.biglobe.ne.jp</domain>
+    <domain>handsome.memail.jp</domain>
+    <domain>happo.eeyo.jp</domain>
+    <domain>happy.biglobe.ne.jp</domain>
+    <domain>happy.memail.jp</domain>
+    <domain>harajuku.eeyo.jp</domain>
+    <domain>harima.eeyo.jp</domain>
+    <domain>harmony.biglobe.ne.jp</domain>
+    <domain>harmony.memail.jp</domain>
+    <domain>hawk.biglobe.ne.jp</domain>
+    <domain>hawk.memail.jp</domain>
+    <domain>heart.biglobe.ne.jp</domain>
+    <domain>heart.memail.jp</domain>
+    <domain>hello.biglobe.ne.jp</domain>
+    <domain>hello.memail.jp</domain>
+    <domain>hey.biglobe.ne.jp</domain>
+    <domain>hey.memail.jp</domain>
+    <domain>hi.biglobe.ne.jp</domain>
+    <domain>hi.memail.jp</domain>
+    <domain>hida.eeyo.jp</domain>
+    <domain>hidaka.eeyo.jp</domain>
+    <domain>hiei.eeyo.jp</domain>
+    <domain>higo.eeyo.jp</domain>
+    <domain>himeji.eeyo.jp</domain>
+    <domain>hiphop.biglobe.ne.jp</domain>
+    <domain>hiphop.memail.jp</domain>
+    <domain>hippo.biglobe.ne.jp</domain>
+    <domain>hippo.memail.jp</domain>
+    <domain>hirosaki.eeyo.jp</domain>
+    <domain>hiroshima.eeyo.jp</domain>
+    <domain>hit.biglobe.ne.jp</domain>
+    <domain>hit.memail.jp</domain>
+    <domain>hita.eeyo.jp</domain>
+    <domain>hitachi.eeyo.jp</domain>
+    <domain>hizen.eeyo.jp</domain>
+    <domain>hobby.biglobe.ne.jp</domain>
+    <domain>hobby.memail.jp</domain>
+    <domain>hockey.biglobe.ne.jp</domain>
+    <domain>hockey.memail.jp</domain>
+    <domain>hodaka.eeyo.jp</domain>
+    <domain>hokkaido.eeyo.jp</domain>
+    <domain>hokuriku.eeyo.jp</domain>
+    <domain>honey.biglobe.ne.jp</domain>
+    <domain>honey.memail.jp</domain>
+    <domain>hoop.biglobe.ne.jp</domain>
+    <domain>hoop.memail.jp</domain>
+    <domain>horse.biglobe.ne.jp</domain>
+    <domain>horse.memail.jp</domain>
+    <domain>hot.biglobe.ne.jp</domain>
+    <domain>hot.memail.jp</domain>
+    <domain>houki.eeyo.jp</domain>
+    <domain>hyoryugai.biglobe.ne.jp</domain>
+    <domain>hyuga.eeyo.jp</domain>
+    <domain>i.biglobe.ne.jp</domain>
+    <domain>i.memail.jp</domain>
+    <domain>ibusuki.eeyo.jp</domain>
+    <domain>ice.biglobe.ne.jp</domain>
+    <domain>ice.memail.jp</domain>
+    <domain>ichigo.biglobe.ne.jp</domain>
+    <domain>ichigo.memail.jp</domain>
+    <domain>ichihara.eeyo.jp</domain>
+    <domain>iga.eeyo.jp</domain>
+    <domain>ikaho.eeyo.jp</domain>
+    <domain>ikaruga.eeyo.jp</domain>
+    <domain>ikebukuro.eeyo.jp</domain>
+    <domain>iki.eeyo.jp</domain>
+    <domain>imari.eeyo.jp</domain>
+    <domain>inaba.eeyo.jp</domain>
+    <domain>iriomote.eeyo.jp</domain>
+    <domain>iron.biglobe.ne.jp</domain>
+    <domain>iron.memail.jp</domain>
+    <domain>ise.eeyo.jp</domain>
+    <domain>ishigaki.eeyo.jp</domain>
+    <domain>ishikari.eeyo.jp</domain>
+    <domain>ishikawa.eeyo.jp</domain>
+    <domain>ishizuchi.eeyo.jp</domain>
+    <domain>ivory.biglobe.ne.jp</domain>
+    <domain>ivory.memail.jp</domain>
+    <domain>ivy.biglobe.ne.jp</domain>
+    <domain>ivy.memail.jp</domain>
+    <domain>iwaki.eeyo.jp</domain>
+    <domain>iwami.eeyo.jp</domain>
+    <domain>iwashiro.eeyo.jp</domain>
+    <domain>iwata.eeyo.jp</domain>
+    <domain>iwate.eeyo.jp</domain>
+    <domain>iyo.eeyo.jp</domain>
+    <domain>izu.eeyo.jp</domain>
+    <domain>izuhara.eeyo.jp</domain>
+    <domain>izumi.eeyo.jp</domain>
+    <domain>izumo.eeyo.jp</domain>
+    <domain>j.biglobe.ne.jp</domain>
+    <domain>j.memail.jp</domain>
+    <domain>jambo.biglobe.ne.jp</domain>
+    <domain>jambo.memail.jp</domain>
+    <domain>jazz.biglobe.ne.jp</domain>
+    <domain>jazz.memail.jp</domain>
+    <domain>jewel.biglobe.ne.jp</domain>
+    <domain>jewel.memail.jp</domain>
+    <domain>joetsu.eeyo.jp</domain>
+    <domain>joke.biglobe.ne.jp</domain>
+    <domain>joke.memail.jp</domain>
+    <domain>joy.biglobe.ne.jp</domain>
+    <domain>joy.memail.jp</domain>
+    <domain>jr.biglobe.ne.jp</domain>
+    <domain>jr.memail.jp</domain>
+    <domain>jumbo.biglobe.ne.jp</domain>
+    <domain>jumbo.memail.jp</domain>
+    <domain>jump.biglobe.ne.jp</domain>
+    <domain>jump.memail.jp</domain>
+    <domain>jungle.biglobe.ne.jp</domain>
+    <domain>jungle.memail.jp</domain>
+    <domain>jupiter.biglobe.ne.jp</domain>
+    <domain>jupiter.memail.jp</domain>
+    <domain>k.biglobe.ne.jp</domain>
+    <domain>k.memail.jp</domain>
+    <domain>kaga.eeyo.jp</domain>
+    <domain>kagawa.eeyo.jp</domain>
+    <domain>kagoshima.eeyo.jp</domain>
+    <domain>kai.eeyo.jp</domain>
+    <domain>kamakura.eeyo.jp</domain>
+    <domain>kamikochi.eeyo.jp</domain>
+    <domain>kanazawa.eeyo.jp</domain>
+    <domain>kanto.eeyo.jp</domain>
+    <domain>karatsu.eeyo.jp</domain>
+    <domain>karuizawa.eeyo.jp</domain>
+    <domain>kashima.eeyo.jp</domain>
+    <domain>kashiwa.eeyo.jp</domain>
+    <domain>kasukabe.eeyo.jp</domain>
+    <domain>katsuyama.eeyo.jp</domain>
+    <domain>kawachi.eeyo.jp</domain>
+    <domain>kawasaki.eeyo.jp</domain>
+    <domain>kazusa.eeyo.jp</domain>
+    <domain>kba.biglobe.ne.jp</domain>
+    <domain>kbd.biglobe.ne.jp</domain>
+    <domain>kbe.biglobe.ne.jp</domain>
+    <domain>kbf.biglobe.ne.jp</domain>
+    <domain>kbh.biglobe.ne.jp</domain>
+    <domain>kca.biglobe.ne.jp</domain>
+    <domain>kcd.biglobe.ne.jp</domain>
+    <domain>kce.biglobe.ne.jp</domain>
+    <domain>kcf.biglobe.ne.jp</domain>
+    <domain>kch.biglobe.ne.jp</domain>
+    <domain>kde.biglobe.ne.jp</domain>
+    <domain>kdn.biglobe.ne.jp</domain>
+    <domain>kdp.biglobe.ne.jp</domain>
+    <domain>kdr.biglobe.ne.jp</domain>
+    <domain>kdt.biglobe.ne.jp</domain>
+    <domain>keb.biglobe.ne.jp</domain>
+    <domain>ked.biglobe.ne.jp</domain>
+    <domain>keh.biglobe.ne.jp</domain>
+    <domain>kej.biglobe.ne.jp</domain>
+    <domain>kem.biglobe.ne.jp</domain>
+    <domain>kfa.biglobe.ne.jp</domain>
+    <domain>kfd.biglobe.ne.jp</domain>
+    <domain>kfx.biglobe.ne.jp</domain>
+    <domain>kfy.biglobe.ne.jp</domain>
+    <domain>kfz.biglobe.ne.jp</domain>
+    <domain>kha.biglobe.ne.jp</domain>
+    <domain>khc.biglobe.ne.jp</domain>
+    <domain>khe.biglobe.ne.jp</domain>
+    <domain>khf.biglobe.ne.jp</domain>
+    <domain>khh.biglobe.ne.jp</domain>
+    <domain>kib.biglobe.ne.jp</domain>
+    <domain>kichijoji.eeyo.jp</domain>
+    <domain>kif.biglobe.ne.jp</domain>
+    <domain>kih.biglobe.ne.jp</domain>
+    <domain>kii.eeyo.jp</domain>
+    <domain>king.biglobe.ne.jp</domain>
+    <domain>king.memail.jp</domain>
+    <domain>kinki.eeyo.jp</domain>
+    <domain>kinugawa.eeyo.jp</domain>
+    <domain>kir.biglobe.ne.jp</domain>
+    <domain>kirigamine.eeyo.jp</domain>
+    <domain>kirishima.eeyo.jp</domain>
+    <domain>kiso.eeyo.jp</domain>
+    <domain>kiss.biglobe.ne.jp</domain>
+    <domain>kiss.memail.jp</domain>
+    <domain>kitakata.eeyo.jp</domain>
+    <domain>kitakyushu.eeyo.jp</domain>
+    <domain>kitami.eeyo.jp</domain>
+    <domain>kiu.biglobe.ne.jp</domain>
+    <domain>kiyosato.eeyo.jp</domain>
+    <domain>kjb.biglobe.ne.jp</domain>
+    <domain>kjc.biglobe.ne.jp</domain>
+    <domain>kjd.biglobe.ne.jp</domain>
+    <domain>kje.biglobe.ne.jp</domain>
+    <domain>kjf.biglobe.ne.jp</domain>
+    <domain>kkd.biglobe.ne.jp</domain>
+    <domain>kke.biglobe.ne.jp</domain>
+    <domain>kkf.biglobe.ne.jp</domain>
+    <domain>kkh.biglobe.ne.jp</domain>
+    <domain>kki.biglobe.ne.jp</domain>
+    <domain>kmd.biglobe.ne.jp</domain>
+    <domain>kme.biglobe.ne.jp</domain>
+    <domain>kmf.biglobe.ne.jp</domain>
+    <domain>kmh.biglobe.ne.jp</domain>
+    <domain>kmj.biglobe.ne.jp</domain>
+    <domain>kna.biglobe.ne.jp</domain>
+    <domain>knd.biglobe.ne.jp</domain>
+    <domain>kne.biglobe.ne.jp</domain>
+    <domain>knh.biglobe.ne.jp</domain>
+    <domain>kni.biglobe.ne.jp</domain>
+    <domain>knight.biglobe.ne.jp</domain>
+    <domain>knight.memail.jp</domain>
+    <domain>koala.biglobe.ne.jp</domain>
+    <domain>koala.memail.jp</domain>
+    <domain>kobe.eeyo.jp</domain>
+    <domain>kochi.eeyo.jp</domain>
+    <domain>kofu.eeyo.jp</domain>
+    <domain>koga.eeyo.jp</domain>
+    <domain>koiwai.eeyo.jp</domain>
+    <domain>konpira.eeyo.jp</domain>
+    <domain>kotohira.eeyo.jp</domain>
+    <domain>kozuke.eeyo.jp</domain>
+    <domain>kpa.biglobe.ne.jp</domain>
+    <domain>kpb.biglobe.ne.jp</domain>
+    <domain>kpd.biglobe.ne.jp</domain>
+    <domain>kpe.biglobe.ne.jp</domain>
+    <domain>kph.biglobe.ne.jp</domain>
+    <domain>kra.biglobe.ne.jp</domain>
+    <domain>krb.biglobe.ne.jp</domain>
+    <domain>krc.biglobe.ne.jp</domain>
+    <domain>krd.biglobe.ne.jp</domain>
+    <domain>krf.biglobe.ne.jp</domain>
+    <domain>ksf.biglobe.ne.jp</domain>
+    <domain>ksh.biglobe.ne.jp</domain>
+    <domain>ksj.biglobe.ne.jp</domain>
+    <domain>ksn.biglobe.ne.jp</domain>
+    <domain>kss.biglobe.ne.jp</domain>
+    <domain>kta.biglobe.ne.jp</domain>
+    <domain>ktb.biglobe.ne.jp</domain>
+    <domain>ktd.biglobe.ne.jp</domain>
+    <domain>ktf.biglobe.ne.jp</domain>
+    <domain>ktj.biglobe.ne.jp</domain>
+    <domain>kub.biglobe.ne.jp</domain>
+    <domain>kuc.biglobe.ne.jp</domain>
+    <domain>kud.biglobe.ne.jp</domain>
+    <domain>kuf.biglobe.ne.jp</domain>
+    <domain>kuh.biglobe.ne.jp</domain>
+    <domain>kuju.eeyo.jp</domain>
+    <domain>kumagaya.eeyo.jp</domain>
+    <domain>kumamoto.eeyo.jp</domain>
+    <domain>kumano.eeyo.jp</domain>
+    <domain>kunisaki.eeyo.jp</domain>
+    <domain>kurama.eeyo.jp</domain>
+    <domain>kurashiki.eeyo.jp</domain>
+    <domain>kurobe.eeyo.jp</domain>
+    <domain>kurume.eeyo.jp</domain>
+    <domain>kusatsu.eeyo.jp</domain>
+    <domain>kushiro.eeyo.jp</domain>
+    <domain>kvd.biglobe.ne.jp</domain>
+    <domain>kve.biglobe.ne.jp</domain>
+    <domain>kvf.biglobe.ne.jp</domain>
+    <domain>kvj.biglobe.ne.jp</domain>
+    <domain>kvp.biglobe.ne.jp</domain>
+    <domain>kxa.biglobe.ne.jp</domain>
+    <domain>kxb.biglobe.ne.jp</domain>
+    <domain>kxd.biglobe.ne.jp</domain>
+    <domain>kxe.biglobe.ne.jp</domain>
+    <domain>kxf.biglobe.ne.jp</domain>
+    <domain>kyf.biglobe.ne.jp</domain>
+    <domain>kyi.biglobe.ne.jp</domain>
+    <domain>kyj.biglobe.ne.jp</domain>
+    <domain>kym.biglobe.ne.jp</domain>
+    <domain>kyoto.eeyo.jp</domain>
+    <domain>kyp.biglobe.ne.jp</domain>
+    <domain>kyushu.eeyo.jp</domain>
+    <domain>kza.biglobe.ne.jp</domain>
+    <domain>kzc.biglobe.ne.jp</domain>
+    <domain>kzd.biglobe.ne.jp</domain>
+    <domain>kzf.biglobe.ne.jp</domain>
+    <domain>kzh.biglobe.ne.jp</domain>
+    <domain>l.biglobe.ne.jp</domain>
+    <domain>l.memail.jp</domain>
+    <domain>lady.biglobe.ne.jp</domain>
+    <domain>lady.memail.jp</domain>
+    <domain>lake.biglobe.ne.jp</domain>
+    <domain>lake.memail.jp</domain>
+    <domain>latin.biglobe.ne.jp</domain>
+    <domain>latin.memail.jp</domain>
+    <domain>lavender.biglobe.ne.jp</domain>
+    <domain>lavender.memail.jp</domain>
+    <domain>lavie.biglobe.ne.jp</domain>
+    <domain>lavie.memail.jp</domain>
+    <domain>leaf.biglobe.ne.jp</domain>
+    <domain>leaf.memail.jp</domain>
+    <domain>left.biglobe.ne.jp</domain>
+    <domain>left.memail.jp</domain>
+    <domain>lefty.biglobe.ne.jp</domain>
+    <domain>lefty.memail.jp</domain>
+    <domain>lemon.biglobe.ne.jp</domain>
+    <domain>lemon.memail.jp</domain>
+    <domain>leo.biglobe.ne.jp</domain>
+    <domain>leo.memail.jp</domain>
+    <domain>libra.biglobe.ne.jp</domain>
+    <domain>libra.memail.jp</domain>
+    <domain>lily.biglobe.ne.jp</domain>
+    <domain>lily.memail.jp</domain>
+    <domain>lime.biglobe.ne.jp</domain>
+    <domain>lime.memail.jp</domain>
+    <domain>lion.biglobe.ne.jp</domain>
+    <domain>lion.memail.jp</domain>
+    <domain>lonely.biglobe.ne.jp</domain>
+    <domain>lonely.memail.jp</domain>
+    <domain>long.biglobe.ne.jp</domain>
+    <domain>long.memail.jp</domain>
+    <domain>love.biglobe.ne.jp</domain>
+    <domain>love.memail.jp</domain>
+    <domain>lovelove.biglobe.ne.jp</domain>
+    <domain>lovelove.memail.jp</domain>
+    <domain>lovely.biglobe.ne.jp</domain>
+    <domain>lovely.memail.jp</domain>
+    <domain>lucky.biglobe.ne.jp</domain>
+    <domain>lucky.memail.jp</domain>
+    <domain>luna.biglobe.ne.jp</domain>
+    <domain>luna.memail.jp</domain>
+    <domain>m.biglobe.ne.jp</domain>
+    <domain>m.memail.jp</domain>
+    <domain>macho.biglobe.ne.jp</domain>
+    <domain>macho.memail.jp</domain>
+    <domain>magic.biglobe.ne.jp</domain>
+    <domain>magic.memail.jp</domain>
+    <domain>mama.biglobe.ne.jp</domain>
+    <domain>mama.memail.jp</domain>
+    <domain>mambo.biglobe.ne.jp</domain>
+    <domain>mambo.memail.jp</domain>
+    <domain>marine.biglobe.ne.jp</domain>
+    <domain>marine.memail.jp</domain>
+    <domain>maroon.biglobe.ne.jp</domain>
+    <domain>maroon.memail.jp</domain>
+    <domain>mars.biglobe.ne.jp</domain>
+    <domain>mars.memail.jp</domain>
+    <domain>matsue.eeyo.jp</domain>
+    <domain>matsumoto.eeyo.jp</domain>
+    <domain>matsusaka.eeyo.jp</domain>
+    <domain>matsushima.eeyo.jp</domain>
+    <domain>melody.biglobe.ne.jp</domain>
+    <domain>melody.memail.jp</domain>
+    <domain>melon.biglobe.ne.jp</domain>
+    <domain>melon.memail.jp</domain>
+    <domain>memoad.jp</domain>
+    <domain>meow.biglobe.ne.jp</domain>
+    <domain>meow.memail.jp</domain>
+    <domain>mercury.biglobe.ne.jp</domain>
+    <domain>mercury.memail.jp</domain>
+    <domain>mermaid.biglobe.ne.jp</domain>
+    <domain>mermaid.memail.jp</domain>
+    <domain>mie.eeyo.jp</domain>
+    <domain>mikawa.eeyo.jp</domain>
+    <domain>milk.biglobe.ne.jp</domain>
+    <domain>milk.memail.jp</domain>
+    <domain>mimasaka.eeyo.jp</domain>
+    <domain>minakami.eeyo.jp</domain>
+    <domain>mino.eeyo.jp</domain>
+    <domain>mint.biglobe.ne.jp</domain>
+    <domain>mint.memail.jp</domain>
+    <domain>miracle.biglobe.ne.jp</domain>
+    <domain>miracle.memail.jp</domain>
+    <domain>mito.eeyo.jp</domain>
+    <domain>miura.eeyo.jp</domain>
+    <domain>miyagi.eeyo.jp</domain>
+    <domain>miyajima.eeyo.jp</domain>
+    <domain>miyako.eeyo.jp</domain>
+    <domain>miyazaki.eeyo.jp</domain>
+    <domain>mocha.biglobe.ne.jp</domain>
+    <domain>mocha.memail.jp</domain>
+    <domain>mogami.eeyo.jp</domain>
+    <domain>momo.biglobe.ne.jp</domain>
+    <domain>momo.memail.jp</domain>
+    <domain>monkey.biglobe.ne.jp</domain>
+    <domain>monkey.memail.jp</domain>
+    <domain>moon.biglobe.ne.jp</domain>
+    <domain>moon.memail.jp</domain>
+    <domain>moonstone.biglobe.ne.jp</domain>
+    <domain>moonstone.memail.jp</domain>
+    <domain>motor.biglobe.ne.jp</domain>
+    <domain>motor.memail.jp</domain>
+    <domain>motto.biglobe.ne.jp</domain>
+    <domain>motto.memail.jp</domain>
+    <domain>mount.biglobe.ne.jp</domain>
+    <domain>mount.memail.jp</domain>
+    <domain>mouse.biglobe.ne.jp</domain>
+    <domain>mouse.memail.jp</domain>
+    <domain>mpd.biglobe.ne.jp</domain>
+    <domain>mqb.biglobe.ne.jp</domain>
+    <domain>mqc.biglobe.ne.jp</domain>
+    <domain>mqd.biglobe.ne.jp</domain>
+    <domain>mqe.biglobe.ne.jp</domain>
+    <domain>mqf.biglobe.ne.jp</domain>
+    <domain>mqg.biglobe.ne.jp</domain>
+    <domain>mqh.biglobe.ne.jp</domain>
+    <domain>mqi.biglobe.ne.jp</domain>
+    <domain>mqj.biglobe.ne.jp</domain>
+    <domain>mra.biglobe.ne.jp</domain>
+    <domain>mrb.biglobe.ne.jp</domain>
+    <domain>mrc.biglobe.ne.jp</domain>
+    <domain>mrd.biglobe.ne.jp</domain>
+    <domain>mre.biglobe.ne.jp</domain>
+    <domain>mrf.biglobe.ne.jp</domain>
+    <domain>mrg.biglobe.ne.jp</domain>
+    <domain>mrh.biglobe.ne.jp</domain>
+    <domain>mri.biglobe.ne.jp</domain>
+    <domain>mrj.biglobe.ne.jp</domain>
+    <domain>msa.biglobe.ne.jp</domain>
+    <domain>msb.biglobe.ne.jp</domain>
+    <domain>msc.biglobe.ne.jp</domain>
+    <domain>msd.biglobe.ne.jp</domain>
+    <domain>mse.biglobe.ne.jp</domain>
+    <domain>msf.biglobe.ne.jp</domain>
+    <domain>msg.biglobe.ne.jp</domain>
+    <domain>msh.biglobe.ne.jp</domain>
+    <domain>msi.biglobe.ne.jp</domain>
+    <domain>msj.biglobe.ne.jp</domain>
+    <domain>mta.biglobe.ne.jp</domain>
+    <domain>mtb.biglobe.ne.jp</domain>
+    <domain>mtc.biglobe.ne.jp</domain>
+    <domain>mtd.biglobe.ne.jp</domain>
+    <domain>mte.biglobe.ne.jp</domain>
+    <domain>mtf.biglobe.ne.jp</domain>
+    <domain>mtg.biglobe.ne.jp</domain>
+    <domain>mth.biglobe.ne.jp</domain>
+    <domain>mti.biglobe.ne.jp</domain>
+    <domain>mtj.biglobe.ne.jp</domain>
+    <domain>mua.biglobe.ne.jp</domain>
+    <domain>mub.biglobe.ne.jp</domain>
+    <domain>muc.biglobe.ne.jp</domain>
+    <domain>mud.biglobe.ne.jp</domain>
+    <domain>mue.biglobe.ne.jp</domain>
+    <domain>muf.biglobe.ne.jp</domain>
+    <domain>mug.biglobe.ne.jp</domain>
+    <domain>muh.biglobe.ne.jp</domain>
+    <domain>mui.biglobe.ne.jp</domain>
+    <domain>muj.biglobe.ne.jp</domain>
+    <domain>muroran.eeyo.jp</domain>
+    <domain>muroto.eeyo.jp</domain>
+    <domain>musashi.eeyo.jp</domain>
+    <domain>muscle.biglobe.ne.jp</domain>
+    <domain>muscle.memail.jp</domain>
+    <domain>mutsu.eeyo.jp</domain>
+    <domain>mva.biglobe.ne.jp</domain>
+    <domain>mvb.biglobe.ne.jp</domain>
+    <domain>mvc.biglobe.ne.jp</domain>
+    <domain>mvd.biglobe.ne.jp</domain>
+    <domain>mve.biglobe.ne.jp</domain>
+    <domain>mvf.biglobe.ne.jp</domain>
+    <domain>mvg.biglobe.ne.jp</domain>
+    <domain>mvh.biglobe.ne.jp</domain>
+    <domain>mvi.biglobe.ne.jp</domain>
+    <domain>mvj.biglobe.ne.jp</domain>
+    <domain>mwa.biglobe.ne.jp</domain>
+    <domain>mwb.biglobe.ne.jp</domain>
+    <domain>mwc.biglobe.ne.jp</domain>
+    <domain>mwd.biglobe.ne.jp</domain>
+    <domain>mwe.biglobe.ne.jp</domain>
+    <domain>myad.jp</domain>
+    <domain>myoko.eeyo.jp</domain>
+    <domain>n.biglobe.ne.jp</domain>
+    <domain>n.memail.jp</domain>
+    <domain>nada.eeyo.jp</domain>
+    <domain>naeba.eeyo.jp</domain>
+    <domain>nagano.eeyo.jp</domain>
+    <domain>nagaoka.eeyo.jp</domain>
+    <domain>nagara.eeyo.jp</domain>
+    <domain>nagasaki.eeyo.jp</domain>
+    <domain>nagato.eeyo.jp</domain>
+    <domain>nagoya.eeyo.jp</domain>
+    <domain>naniwa.eeyo.jp</domain>
+    <domain>nara.eeyo.jp</domain>
+    <domain>narashino.eeyo.jp</domain>
+    <domain>naruto.eeyo.jp</domain>
+    <domain>nasu.eeyo.jp</domain>
+    <domain>neko.biglobe.ne.jp</domain>
+    <domain>neko.memail.jp</domain>
+    <domain>nemuro.eeyo.jp</domain>
+    <domain>neptune.biglobe.ne.jp</domain>
+    <domain>neptune.memail.jp</domain>
+    <domain>nerima.eeyo.jp</domain>
+    <domain>nice.biglobe.ne.jp</domain>
+    <domain>nice.memail.jp</domain>
+    <domain>nigata.eeyo.jp</domain>
+    <domain>nikko.eeyo.jp</domain>
+    <domain>nine.biglobe.ne.jp</domain>
+    <domain>nine.memail.jp</domain>
+    <domain>no1.biglobe.ne.jp</domain>
+    <domain>no1.memail.jp</domain>
+    <domain>noboribetsu.eeyo.jp</domain>
+    <domain>noda.eeyo.jp</domain>
+    <domain>noodle.biglobe.ne.jp</domain>
+    <domain>noodle.memail.jp</domain>
+    <domain>north.biglobe.ne.jp</domain>
+    <domain>north.memail.jp</domain>
+    <domain>note.biglobe.ne.jp</domain>
+    <domain>note.memail.jp</domain>
+    <domain>noto.eeyo.jp</domain>
+    <domain>nozawa.eeyo.jp</domain>
+    <domain>numazu.eeyo.jp</domain>
+    <domain>o.biglobe.ne.jp</domain>
+    <domain>o.memail.jp</domain>
+    <domain>obihiro.eeyo.jp</domain>
+    <domain>octopus.biglobe.ne.jp</domain>
+    <domain>octopus.memail.jp</domain>
+    <domain>oga.eeyo.jp</domain>
+    <domain>ogasawara.eeyo.jp</domain>
+    <domain>ohara.eeyo.jp</domain>
+    <domain>ohu.eeyo.jp</domain>
+    <domain>oita.eeyo.jp</domain>
+    <domain>ok.biglobe.ne.jp</domain>
+    <domain>ok.memail.jp</domain>
+    <domain>okayama.eeyo.jp</domain>
+    <domain>oki.eeyo.jp</domain>
+    <domain>okinawa.eeyo.jp</domain>
+    <domain>ole.biglobe.ne.jp</domain>
+    <domain>ole.memail.jp</domain>
+    <domain>omi.eeyo.jp</domain>
+    <domain>omiya.eeyo.jp</domain>
+    <domain>one.biglobe.ne.jp</domain>
+    <domain>one.memail.jp</domain>
+    <domain>onomichi.eeyo.jp</domain>
+    <domain>opal.biglobe.ne.jp</domain>
+    <domain>opal.memail.jp</domain>
+    <domain>opera.biglobe.ne.jp</domain>
+    <domain>opera.memail.jp</domain>
+    <domain>orange.biglobe.ne.jp</domain>
+    <domain>orange.memail.jp</domain>
+    <domain>osaka.eeyo.jp</domain>
+    <domain>osumi.eeyo.jp</domain>
+    <domain>otaru.eeyo.jp</domain>
+    <domain>owari.eeyo.jp</domain>
+    <domain>owl.biglobe.ne.jp</domain>
+    <domain>owl.memail.jp</domain>
+    <domain>oyaji.biglobe.ne.jp</domain>
+    <domain>oyaji.memail.jp</domain>
+    <domain>oze.eeyo.jp</domain>
+    <domain>p.biglobe.ne.jp</domain>
+    <domain>p.memail.jp</domain>
+    <domain>pan.biglobe.ne.jp</domain>
+    <domain>pan.memail.jp</domain>
+    <domain>panda.biglobe.ne.jp</domain>
+    <domain>panda.memail.jp</domain>
+    <domain>pansy.biglobe.ne.jp</domain>
+    <domain>pansy.memail.jp</domain>
+    <domain>panther.biglobe.ne.jp</domain>
+    <domain>panther.memail.jp</domain>
+    <domain>papa.biglobe.ne.jp</domain>
+    <domain>papa.memail.jp</domain>
+    <domain>parapara.biglobe.ne.jp</domain>
+    <domain>parapara.memail.jp</domain>
+    <domain>passion.biglobe.ne.jp</domain>
+    <domain>passion.memail.jp</domain>
+    <domain>peace.biglobe.ne.jp</domain>
+    <domain>peace.memail.jp</domain>
+    <domain>peach.biglobe.ne.jp</domain>
+    <domain>peach.memail.jp</domain>
+    <domain>pearl.biglobe.ne.jp</domain>
+    <domain>pearl.memail.jp</domain>
+    <domain>pegasus.biglobe.ne.jp</domain>
+    <domain>pegasus.memail.jp</domain>
+    <domain>penguin.biglobe.ne.jp</domain>
+    <domain>penguin.memail.jp</domain>
+    <domain>peridot.biglobe.ne.jp</domain>
+    <domain>peridot.memail.jp</domain>
+    <domain>piano.biglobe.ne.jp</domain>
+    <domain>piano.memail.jp</domain>
+    <domain>pig.biglobe.ne.jp</domain>
+    <domain>pig.memail.jp</domain>
+    <domain>pine.biglobe.ne.jp</domain>
+    <domain>pine.memail.jp</domain>
+    <domain>pink.biglobe.ne.jp</domain>
+    <domain>pink.memail.jp</domain>
+    <domain>pisces.biglobe.ne.jp</domain>
+    <domain>pisces.memail.jp</domain>
+    <domain>piyo.biglobe.ne.jp</domain>
+    <domain>piyo.memail.jp</domain>
+    <domain>plum.biglobe.ne.jp</domain>
+    <domain>plum.memail.jp</domain>
+    <domain>pony.biglobe.ne.jp</domain>
+    <domain>pony.memail.jp</domain>
+    <domain>pops.biglobe.ne.jp</domain>
+    <domain>pops.memail.jp</domain>
+    <domain>potato.biglobe.ne.jp</domain>
+    <domain>potato.memail.jp</domain>
+    <domain>power.biglobe.ne.jp</domain>
+    <domain>power.memail.jp</domain>
+    <domain>pretty.biglobe.ne.jp</domain>
+    <domain>pretty.memail.jp</domain>
+    <domain>pride.biglobe.ne.jp</domain>
+    <domain>pride.memail.jp</domain>
+    <domain>private.biglobe.ne.jp</domain>
+    <domain>private.memail.jp</domain>
+    <domain>punk.biglobe.ne.jp</domain>
+    <domain>punk.memail.jp</domain>
+    <domain>puppy.biglobe.ne.jp</domain>
+    <domain>puppy.memail.jp</domain>
+    <domain>pure.biglobe.ne.jp</domain>
+    <domain>pure.memail.jp</domain>
+    <domain>purin.biglobe.ne.jp</domain>
+    <domain>purin.memail.jp</domain>
+    <domain>puripuri.biglobe.ne.jp</domain>
+    <domain>puripuri.memail.jp</domain>
+    <domain>q.biglobe.ne.jp</domain>
+    <domain>q.memail.jp</domain>
+    <domain>queen.biglobe.ne.jp</domain>
+    <domain>queen.memail.jp</domain>
+    <domain>r.biglobe.ne.jp</domain>
+    <domain>r.memail.jp</domain>
+    <domain>rabbit.biglobe.ne.jp</domain>
+    <domain>rabbit.memail.jp</domain>
+    <domain>raccoondog.biglobe.ne.jp</domain>
+    <domain>raccoondog.memail.jp</domain>
+    <domain>racer.biglobe.ne.jp</domain>
+    <domain>racer.memail.jp</domain>
+    <domain>rain.biglobe.ne.jp</domain>
+    <domain>rain.memail.jp</domain>
+    <domain>rainbow.biglobe.ne.jp</domain>
+    <domain>rainbow.memail.jp</domain>
+    <domain>rap.biglobe.ne.jp</domain>
+    <domain>rap.memail.jp</domain>
+    <domain>red.biglobe.ne.jp</domain>
+    <domain>red.memail.jp</domain>
+    <domain>rhythm.biglobe.ne.jp</domain>
+    <domain>rhythm.memail.jp</domain>
+    <domain>rice.biglobe.ne.jp</domain>
+    <domain>rice.memail.jp</domain>
+    <domain>rider.biglobe.ne.jp</domain>
+    <domain>rider.memail.jp</domain>
+    <domain>right.biglobe.ne.jp</domain>
+    <domain>right.memail.jp</domain>
+    <domain>rikuchu.eeyo.jp</domain>
+    <domain>rikuzen.eeyo.jp</domain>
+    <domain>river.biglobe.ne.jp</domain>
+    <domain>river.memail.jp</domain>
+    <domain>robin.biglobe.ne.jp</domain>
+    <domain>robin.memail.jp</domain>
+    <domain>rock.biglobe.ne.jp</domain>
+    <domain>rock.memail.jp</domain>
+    <domain>rokko.eeyo.jp</domain>
+    <domain>rookie.biglobe.ne.jp</domain>
+    <domain>rookie.memail.jp</domain>
+    <domain>rose.biglobe.ne.jp</domain>
+    <domain>rose.memail.jp</domain>
+    <domain>ruby.biglobe.ne.jp</domain>
+    <domain>ruby.memail.jp</domain>
+    <domain>runrun.biglobe.ne.jp</domain>
+    <domain>runrun.memail.jp</domain>
+    <domain>ryukyu.eeyo.jp</domain>
+    <domain>s.biglobe.ne.jp</domain>
+    <domain>s.memail.jp</domain>
+    <domain>sado.eeyo.jp</domain>
+    <domain>safari.biglobe.ne.jp</domain>
+    <domain>safari.memail.jp</domain>
+    <domain>saga.eeyo.jp</domain>
+    <domain>sagami.eeyo.jp</domain>
+    <domain>sagittarius.biglobe.ne.jp</domain>
+    <domain>sagittarius.memail.jp</domain>
+    <domain>saitama.eeyo.jp</domain>
+    <domain>sakai.eeyo.jp</domain>
+    <domain>sakura.biglobe.ne.jp</domain>
+    <domain>sakura.memail.jp</domain>
+    <domain>salt.biglobe.ne.jp</domain>
+    <domain>salt.memail.jp</domain>
+    <domain>samba.biglobe.ne.jp</domain>
+    <domain>samba.memail.jp</domain>
+    <domain>sanin.eeyo.jp</domain>
+    <domain>sanriku.eeyo.jp</domain>
+    <domain>sanuki.eeyo.jp</domain>
+    <domain>sanyo.eeyo.jp</domain>
+    <domain>sapphire.biglobe.ne.jp</domain>
+    <domain>sapphire.memail.jp</domain>
+    <domain>sapporo.eeyo.jp</domain>
+    <domain>sasebo.eeyo.jp</domain>
+    <domain>sata.eeyo.jp</domain>
+    <domain>satsuma.eeyo.jp</domain>
+    <domain>saturn.biglobe.ne.jp</domain>
+    <domain>saturn.memail.jp</domain>
+    <domain>scorpio.biglobe.ne.jp</domain>
+    <domain>scorpio.memail.jp</domain>
+    <domain>sea.biglobe.ne.jp</domain>
+    <domain>sea.memail.jp</domain>
+    <domain>seabass.biglobe.ne.jp</domain>
+    <domain>seabass.memail.jp</domain>
+    <domain>second.biglobe.ne.jp</domain>
+    <domain>second.memail.jp</domain>
+    <domain>seeya.biglobe.ne.jp</domain>
+    <domain>seeya.memail.jp</domain>
+    <domain>sendai.eeyo.jp</domain>
+    <domain>sepia.biglobe.ne.jp</domain>
+    <domain>sepia.memail.jp</domain>
+    <domain>setagaya.eeyo.jp</domain>
+    <domain>setouchi.eeyo.jp</domain>
+    <domain>settu.eeyo.jp</domain>
+    <domain>seven.biglobe.ne.jp</domain>
+    <domain>seven.memail.jp</domain>
+    <domain>sf.biglobe.ne.jp</domain>
+    <domain>sf.memail.jp</domain>
+    <domain>shake.biglobe.ne.jp</domain>
+    <domain>shake.memail.jp</domain>
+    <domain>shakotan.eeyo.jp</domain>
+    <domain>sheep.biglobe.ne.jp</domain>
+    <domain>sheep.memail.jp</domain>
+    <domain>shibuya.eeyo.jp</domain>
+    <domain>shiga.eeyo.jp</domain>
+    <domain>shikoku.eeyo.jp</domain>
+    <domain>shikotsu.eeyo.jp</domain>
+    <domain>shima.eeyo.jp</domain>
+    <domain>shimane.eeyo.jp</domain>
+    <domain>shimanto.eeyo.jp</domain>
+    <domain>shimizu.eeyo.jp</domain>
+    <domain>shimokita.eeyo.jp</domain>
+    <domain>shimotsuke.eeyo.jp</domain>
+    <domain>shimousa.eeyo.jp</domain>
+    <domain>shinagawa.eeyo.jp</domain>
+    <domain>shinano.eeyo.jp</domain>
+    <domain>shine.biglobe.ne.jp</domain>
+    <domain>shine.memail.jp</domain>
+    <domain>shinjuku.eeyo.jp</domain>
+    <domain>shiobara.eeyo.jp</domain>
+    <domain>shirahama.eeyo.jp</domain>
+    <domain>shirakami.eeyo.jp</domain>
+    <domain>shiretoko.eeyo.jp</domain>
+    <domain>shizuoka.eeyo.jp</domain>
+    <domain>shonai.eeyo.jp</domain>
+    <domain>shonan.eeyo.jp</domain>
+    <domain>shoot.biglobe.ne.jp</domain>
+    <domain>shoot.memail.jp</domain>
+    <domain>short.biglobe.ne.jp</domain>
+    <domain>short.memail.jp</domain>
+    <domain>shout.biglobe.ne.jp</domain>
+    <domain>shout.memail.jp</domain>
+    <domain>shrimp.biglobe.ne.jp</domain>
+    <domain>shrimp.memail.jp</domain>
+    <domain>silver.biglobe.ne.jp</domain>
+    <domain>silver.memail.jp</domain>
+    <domain>simplem.biglobe.ne.jp</domain>
+    <domain>simplem.memail.jp</domain>
+    <domain>six.biglobe.ne.jp</domain>
+    <domain>six.memail.jp</domain>
+    <domain>ski.biglobe.ne.jp</domain>
+    <domain>ski.memail.jp</domain>
+    <domain>sky.biglobe.ne.jp</domain>
+    <domain>sky.memail.jp</domain>
+    <domain>smart.biglobe.ne.jp</domain>
+    <domain>smart.memail.jp</domain>
+    <domain>smash.biglobe.ne.jp</domain>
+    <domain>smash.memail.jp</domain>
+    <domain>smile.biglobe.ne.jp</domain>
+    <domain>smile.memail.jp</domain>
+    <domain>snake.biglobe.ne.jp</domain>
+    <domain>snake.memail.jp</domain>
+    <domain>snowboard.biglobe.ne.jp</domain>
+    <domain>snowboard.memail.jp</domain>
+    <domain>snowy.biglobe.ne.jp</domain>
+    <domain>snowy.memail.jp</domain>
+    <domain>soccer.biglobe.ne.jp</domain>
+    <domain>soccer.memail.jp</domain>
+    <domain>sodegaura.eeyo.jp</domain>
+    <domain>soul.biglobe.ne.jp</domain>
+    <domain>soul.memail.jp</domain>
+    <domain>south.biglobe.ne.jp</domain>
+    <domain>south.memail.jp</domain>
+    <domain>soya.eeyo.jp</domain>
+    <domain>space.biglobe.ne.jp</domain>
+    <domain>space.memail.jp</domain>
+    <domain>spice.biglobe.ne.jp</domain>
+    <domain>spice.memail.jp</domain>
+    <domain>spider.biglobe.ne.jp</domain>
+    <domain>spider.memail.jp</domain>
+    <domain>spring.biglobe.ne.jp</domain>
+    <domain>spring.memail.jp</domain>
+    <domain>star.biglobe.ne.jp</domain>
+    <domain>star.memail.jp</domain>
+    <domain>step.biglobe.ne.jp</domain>
+    <domain>step.memail.jp</domain>
+    <domain>stone.biglobe.ne.jp</domain>
+    <domain>stone.memail.jp</domain>
+    <domain>storm.biglobe.ne.jp</domain>
+    <domain>storm.memail.jp</domain>
+    <domain>strawberry.biglobe.ne.jp</domain>
+    <domain>strawberry.memail.jp</domain>
+    <domain>string.biglobe.ne.jp</domain>
+    <domain>string.memail.jp</domain>
+    <domain>sugar.biglobe.ne.jp</domain>
+    <domain>sugar.memail.jp</domain>
+    <domain>summer.biglobe.ne.jp</domain>
+    <domain>summer.memail.jp</domain>
+    <domain>sunflower.biglobe.ne.jp</domain>
+    <domain>sunflower.memail.jp</domain>
+    <domain>sunshine.biglobe.ne.jp</domain>
+    <domain>sunshine.memail.jp</domain>
+    <domain>suo.eeyo.jp</domain>
+    <domain>super.biglobe.ne.jp</domain>
+    <domain>super.memail.jp</domain>
+    <domain>surfing.biglobe.ne.jp</domain>
+    <domain>surfing.memail.jp</domain>
+    <domain>suruga.eeyo.jp</domain>
+    <domain>suzuka.eeyo.jp</domain>
+    <domain>swallow.biglobe.ne.jp</domain>
+    <domain>swallow.memail.jp</domain>
+    <domain>swan.biglobe.ne.jp</domain>
+    <domain>swan.memail.jp</domain>
+    <domain>sweet.biglobe.ne.jp</domain>
+    <domain>sweet.memail.jp</domain>
+    <domain>swing.biglobe.ne.jp</domain>
+    <domain>swing.memail.jp</domain>
+    <domain>symphony.biglobe.ne.jp</domain>
+    <domain>symphony.memail.jp</domain>
+    <domain>t.biglobe.ne.jp</domain>
+    <domain>t.memail.jp</domain>
+    <domain>tai.biglobe.ne.jp</domain>
+    <domain>tai.memail.jp</domain>
+    <domain>tajima.eeyo.jp</domain>
+    <domain>takachiho.eeyo.jp</domain>
+    <domain>takamatsu.eeyo.jp</domain>
+    <domain>takayama.eeyo.jp</domain>
+    <domain>tama.eeyo.jp</domain>
+    <domain>tanba.eeyo.jp</domain>
+    <domain>tango.biglobe.ne.jp</domain>
+    <domain>tango.eeyo.jp</domain>
+    <domain>tango.memail.jp</domain>
+    <domain>tanzawa.eeyo.jp</domain>
+    <domain>tateshina.eeyo.jp</domain>
+    <domain>tateyama.eeyo.jp</domain>
+    <domain>taurus.biglobe.ne.jp</domain>
+    <domain>taurus.memail.jp</domain>
+    <domain>tazawako.eeyo.jp</domain>
+    <domain>tea.biglobe.ne.jp</domain>
+    <domain>tea.memail.jp</domain>
+    <domain>techno.biglobe.ne.jp</domain>
+    <domain>techno.memail.jp</domain>
+    <domain>ten.biglobe.ne.jp</domain>
+    <domain>ten.memail.jp</domain>
+    <domain>tender.biglobe.ne.jp</domain>
+    <domain>tender.memail.jp</domain>
+    <domain>tennis.biglobe.ne.jp</domain>
+    <domain>tennis.memail.jp</domain>
+    <domain>terra.biglobe.ne.jp</domain>
+    <domain>terra.memail.jp</domain>
+    <domain>test.test.biglobe.ne.jp</domain>
+    <domain>thanks.biglobe.ne.jp</domain>
+    <domain>thanks.memail.jp</domain>
+    <domain>third.biglobe.ne.jp</domain>
+    <domain>third.memail.jp</domain>
+    <domain>three.biglobe.ne.jp</domain>
+    <domain>three.memail.jp</domain>
+    <domain>thunder.biglobe.ne.jp</domain>
+    <domain>thunder.memail.jp</domain>
+    <domain>tiger.biglobe.ne.jp</domain>
+    <domain>tiger.memail.jp</domain>
+    <domain>tiny.biglobe.ne.jp</domain>
+    <domain>tiny.memail.jp</domain>
+    <domain>tochigi.eeyo.jp</domain>
+    <domain>togakushi.eeyo.jp</domain>
+    <domain>tohoku.eeyo.jp</domain>
+    <domain>toi.eeyo.jp</domain>
+    <domain>tokachi.eeyo.jp</domain>
+    <domain>tokai.eeyo.jp</domain>
+    <domain>tokoro.biglobe.ne.jp</domain>
+    <domain>tokorozawa.eeyo.jp</domain>
+    <domain>tokushima.eeyo.jp</domain>
+    <domain>tokyo.eeyo.jp</domain>
+    <domain>tone.eeyo.jp</domain>
+    <domain>tono.eeyo.jp</domain>
+    <domain>topaz.biglobe.ne.jp</domain>
+    <domain>topaz.memail.jp</domain>
+    <domain>tornado.biglobe.ne.jp</domain>
+    <domain>tornado.memail.jp</domain>
+    <domain>tosa.eeyo.jp</domain>
+    <domain>tosu.eeyo.jp</domain>
+    <domain>totoumi.eeyo.jp</domain>
+    <domain>tottori.eeyo.jp</domain>
+    <domain>tough.biglobe.ne.jp</domain>
+    <domain>tough.memail.jp</domain>
+    <domain>tourmaline.biglobe.ne.jp</domain>
+    <domain>tourmaline.memail.jp</domain>
+    <domain>towada.eeyo.jp</domain>
+    <domain>toya.eeyo.jp</domain>
+    <domain>toyama.eeyo.jp</domain>
+    <domain>toyohashi.eeyo.jp</domain>
+    <domain>traveler.biglobe.ne.jp</domain>
+    <domain>traveler.memail.jp</domain>
+    <domain>tree.biglobe.ne.jp</domain>
+    <domain>tree.memail.jp</domain>
+    <domain>tropical.biglobe.ne.jp</domain>
+    <domain>tropical.memail.jp</domain>
+    <domain>tsuchiura.eeyo.jp</domain>
+    <domain>tsugaike.eeyo.jp</domain>
+    <domain>tsugaru.eeyo.jp</domain>
+    <domain>tsukuba.eeyo.jp</domain>
+    <domain>tsumagoi.eeyo.jp</domain>
+    <domain>tsushima.eeyo.jp</domain>
+    <domain>tsuwano.eeyo.jp</domain>
+    <domain>tsuyama.eeyo.jp</domain>
+    <domain>tulip.biglobe.ne.jp</domain>
+    <domain>tulip.memail.jp</domain>
+    <domain>turbo.biglobe.ne.jp</domain>
+    <domain>turbo.memail.jp</domain>
+    <domain>turquoise.biglobe.ne.jp</domain>
+    <domain>turquoise.memail.jp</domain>
+    <domain>twelve.biglobe.ne.jp</domain>
+    <domain>twelve.memail.jp</domain>
+    <domain>twist.biglobe.ne.jp</domain>
+    <domain>twist.memail.jp</domain>
+    <domain>two.biglobe.ne.jp</domain>
+    <domain>two.memail.jp</domain>
+    <domain>typhoon.biglobe.ne.jp</domain>
+    <domain>typhoon.memail.jp</domain>
+    <domain>u.biglobe.ne.jp</domain>
+    <domain>u.memail.jp</domain>
+    <domain>ueno.eeyo.jp</domain>
+    <domain>ugo.eeyo.jp</domain>
+    <domain>uji.eeyo.jp</domain>
+    <domain>ultra.biglobe.ne.jp</domain>
+    <domain>ultra.memail.jp</domain>
+    <domain>ume.biglobe.ne.jp</domain>
+    <domain>ume.memail.jp</domain>
+    <domain>umeda.eeyo.jp</domain>
+    <domain>unicorn.biglobe.ne.jp</domain>
+    <domain>unicorn.memail.jp</domain>
+    <domain>unzen.eeyo.jp</domain>
+    <domain>uonuma.eeyo.jp</domain>
+    <domain>urawa.eeyo.jp</domain>
+    <domain>uwa.eeyo.jp</domain>
+    <domain>uzen.eeyo.jp</domain>
+    <domain>v.biglobe.ne.jp</domain>
+    <domain>v.memail.jp</domain>
+    <domain>valuestar.biglobe.ne.jp</domain>
+    <domain>valuestar.memail.jp</domain>
+    <domain>venus.biglobe.ne.jp</domain>
+    <domain>venus.memail.jp</domain>
+    <domain>violet.biglobe.ne.jp</domain>
+    <domain>violet.memail.jp</domain>
+    <domain>virgo.biglobe.ne.jp</domain>
+    <domain>virgo.memail.jp</domain>
+    <domain>viva.biglobe.ne.jp</domain>
+    <domain>viva.memail.jp</domain>
+    <domain>volleyball.biglobe.ne.jp</domain>
+    <domain>volleyball.memail.jp</domain>
+    <domain>w.biglobe.ne.jp</domain>
+    <domain>w.memail.jp</domain>
+    <domain>wakasa.eeyo.jp</domain>
+    <domain>wakayama.eeyo.jp</domain>
+    <domain>wakkanai.eeyo.jp</domain>
+    <domain>west.biglobe.ne.jp</domain>
+    <domain>west.memail.jp</domain>
+    <domain>whale.biglobe.ne.jp</domain>
+    <domain>whale.memail.jp</domain>
+    <domain>white.biglobe.ne.jp</domain>
+    <domain>white.memail.jp</domain>
+    <domain>wild.biglobe.ne.jp</domain>
+    <domain>wild.memail.jp</domain>
+    <domain>winter.biglobe.ne.jp</domain>
+    <domain>winter.memail.jp</domain>
+    <domain>with.biglobe.ne.jp</domain>
+    <domain>with.memail.jp</domain>
+    <domain>wolf.biglobe.ne.jp</domain>
+    <domain>wolf.memail.jp</domain>
+    <domain>wonder.biglobe.ne.jp</domain>
+    <domain>wonder.memail.jp</domain>
+    <domain>wood.biglobe.ne.jp</domain>
+    <domain>wood.memail.jp</domain>
+    <domain>x.biglobe.ne.jp</domain>
+    <domain>x.memail.jp</domain>
+    <domain>xqb.biglobe.ne.jp</domain>
+    <domain>xqd.biglobe.ne.jp</domain>
+    <domain>xqe.biglobe.ne.jp</domain>
+    <domain>xqg.biglobe.ne.jp</domain>
+    <domain>xqh.biglobe.ne.jp</domain>
+    <domain>xqj.biglobe.ne.jp</domain>
+    <domain>xrh.biglobe.ne.jp</domain>
+    <domain>xrj.biglobe.ne.jp</domain>
+    <domain>xsj.biglobe.ne.jp</domain>
+    <domain>xug.biglobe.ne.jp</domain>
+    <domain>xui.biglobe.ne.jp</domain>
+    <domain>xvb.biglobe.ne.jp</domain>
+    <domain>xvf.biglobe.ne.jp</domain>
+    <domain>xvg.biglobe.ne.jp</domain>
+    <domain>xvh.biglobe.ne.jp</domain>
+    <domain>y.biglobe.ne.jp</domain>
+    <domain>y.memail.jp</domain>
+    <domain>yaeyama.eeyo.jp</domain>
+    <domain>yakushima.eeyo.jp</domain>
+    <domain>yamagata.eeyo.jp</domain>
+    <domain>yamaguchi.eeyo.jp</domain>
+    <domain>yamame.biglobe.ne.jp</domain>
+    <domain>yamame.memail.jp</domain>
+    <domain>yamanashi.eeyo.jp</domain>
+    <domain>yamashiro.eeyo.jp</domain>
+    <domain>yamato.eeyo.jp</domain>
+    <domain>yeah.biglobe.ne.jp</domain>
+    <domain>yeah.memail.jp</domain>
+    <domain>yes.biglobe.ne.jp</domain>
+    <domain>yes.memail.jp</domain>
+    <domain>yodogawa.eeyo.jp</domain>
+    <domain>yokohama.eeyo.jp</domain>
+    <domain>yoron.eeyo.jp</domain>
+    <domain>yoshino.eeyo.jp</domain>
+    <domain>yours.biglobe.ne.jp</domain>
+    <domain>yours.memail.jp</domain>
+    <domain>yufuin.eeyo.jp</domain>
+    <domain>yuzawa.eeyo.jp</domain>
+    <domain>z.biglobe.ne.jp</domain>
+    <domain>z.memail.jp</domain>
+    <domain>zao.eeyo.jp</domain>
+    <domain>zoo.biglobe.ne.jp</domain>
+    <domain>zoo.memail.jp</domain>
+    <domain>zzz.biglobe.ne.jp</domain>
+    <domain>zzz.memail.jp</domain>
+    <displayName>BIGLOBE</displayName>
+    <displayShortName>BIGLOBE</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.biglobe.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.biglobe.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/abc.plala.or.jp b/mail/mail-autoconfig/abc.plala.or.jp
new file mode 100644
index 0000000000..549bed6cb3
--- /dev/null
+++ b/mail/mail-autoconfig/abc.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="abc.plala.or.jp">
+    <domain>abc.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>abc.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>abc.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/agate.plala.or.jp b/mail/mail-autoconfig/agate.plala.or.jp
new file mode 100644
index 0000000000..6195f58519
--- /dev/null
+++ b/mail/mail-autoconfig/agate.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="agate.plala.or.jp">
+    <domain>agate.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>agate.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>agate.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/amail.plala.or.jp b/mail/mail-autoconfig/amail.plala.or.jp
new file mode 100644
index 0000000000..b4bd8af5fc
--- /dev/null
+++ b/mail/mail-autoconfig/amail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="amail.plala.or.jp">
+    <domain>amail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>amail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>amail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/amber.plala.or.jp b/mail/mail-autoconfig/amber.plala.or.jp
new file mode 100644
index 0000000000..ae682933ee
--- /dev/null
+++ b/mail/mail-autoconfig/amber.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="amber.plala.or.jp">
+    <domain>amber.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>amber.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>amber.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/amethyst.broba.cc b/mail/mail-autoconfig/amethyst.broba.cc
new file mode 100644
index 0000000000..86276cc517
--- /dev/null
+++ b/mail/mail-autoconfig/amethyst.broba.cc
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="broba.cc">
+    <domain>garnet.broba.cc</domain>
+    <domain>amethyst.broba.cc</domain>
+    <domain>coral.broba.ccv</domain>
+    <domain>diamond.broba.cc</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.broba.cc</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.broba.cc</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/aol.com b/mail/mail-autoconfig/aol.com
new file mode 100644
index 0000000000..7e16ab5335
--- /dev/null
+++ b/mail/mail-autoconfig/aol.com
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="aol.com">
+      <domain>aol.com</domain>
+      <domain>aim.com</domain>
+
+      <displayName>AOL</displayName>
+      <displayShortName>AOL</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.aol.com</hostname>
+         <port>143</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.aol.com</hostname>
+         <port>587</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/apost.plala.or.jp b/mail/mail-autoconfig/apost.plala.or.jp
new file mode 100644
index 0000000000..c4f936a7c1
--- /dev/null
+++ b/mail/mail-autoconfig/apost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="apost.plala.or.jp">
+    <domain>apost.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>apost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>apost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/aqua.plala.or.jp b/mail/mail-autoconfig/aqua.plala.or.jp
new file mode 100644
index 0000000000..0c78abc615
--- /dev/null
+++ b/mail/mail-autoconfig/aqua.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="aqua.plala.or.jp">
+    <domain>aqua.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>aqua.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>aqua.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/arcor.de b/mail/mail-autoconfig/arcor.de
new file mode 100644
index 0000000000..953f669fd8
--- /dev/null
+++ b/mail/mail-autoconfig/arcor.de
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="arcor.de">
+      <domain>arcor.de</domain>
+
+      <displayName>Arcor</displayName>
+      <displayShortName>Arcor</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.arcor.de</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <!-- also works: <port>143</port> <socketType>STARTTLS</socketType> -->
+         <authentication>plain</authentication>
+         <username>%EMAILLOCALPART%</username>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>mail.arcor.de</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <!-- also works: <port>587</port> <socketType>STARTTLS</socketType> -->
+         <authentication>plain</authentication>
+         <username>%EMAILLOCALPART%</username>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+      <!--
+         http://www.arcor.de/hilfe/neu/index.php?aktion=anzeigen&rubrik=040006001&id=181
+         http://www.arcor.de/hilfe/neu/index.php?aktion=anzeigen&rubrik=006001003&id=1241
+         Sent Folder: SentMail
+         Draft Folder: Drafts
+
+         IMAP-Server is a Courier.
+      -->
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ballade.plala.or.jp b/mail/mail-autoconfig/ballade.plala.or.jp
new file mode 100644
index 0000000000..913390f9ee
--- /dev/null
+++ b/mail/mail-autoconfig/ballade.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ballade.plala.or.jp">
+    <domain>ballade.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ballade.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ballade.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/bay.gunmanet.ne.jp b/mail/mail-autoconfig/bay.gunmanet.ne.jp
new file mode 100644
index 0000000000..930cf3ab09
--- /dev/null
+++ b/mail/mail-autoconfig/bay.gunmanet.ne.jp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bay.wind.ne.jp">
+    <domain>bay.wind.ne.jp</domain>
+    <domain>bay.wind.jp</domain>
+    <domain>bay.wind.co.jp</domain>
+    <domain>bay.gunmanet.or.jp</domain>
+    <domain>bay.gunmanet.ne.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>bay.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>bay.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/bb-niigata.jp b/mail/mail-autoconfig/bb-niigata.jp
new file mode 100644
index 0000000000..174f5cbc74
--- /dev/null
+++ b/mail/mail-autoconfig/bb-niigata.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bb-niigata.jp">
+    <domain>bb-niigata.jp</domain>
+    <displayName>ＢＢにいがた</displayName>
+    <displayShortName>BB-NIIGATA</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.bb-niigata.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>pop.bb-niigata.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/bc.iij4u.or.jp b/mail/mail-autoconfig/bc.iij4u.or.jp
new file mode 100644
index 0000000000..baa1d0e7a0
--- /dev/null
+++ b/mail/mail-autoconfig/bc.iij4u.or.jp
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="dd.iij4u.or.jp">
+    <domain>dd.iij4u.or.jp</domain>
+    <domain>ff.iij4u.or.jp</domain>
+    <domain>hh.iij4u.or.jp</domain>
+    <domain>kk.iij4u.or.jp</domain>
+    <domain>nn.iij4u.or.jp</domain>
+    <domain>pp.iij4u.or.jp</domain>
+    <domain>rr.iij4u.or.jp</domain>
+    <domain>ss.iij4u.or.jp</domain>
+    <domain>bc.iij4u.or.jp</domain>
+    <domain>bk.iij4u.or.jp</domain>
+    <domain>bp.iij4u.or.jp</domain>
+    <domain>bu.iij4u.or.jp</domain>
+    <displayName>IIJ4U</displayName>
+    <displayShortName>IIJ4U</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mbox.iij4u.or.jp</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%.%EMAILDOMAIN%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mbox.iij4u.or.jp</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%.%EMAILDOMAIN%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/beige.plala.or.jp b/mail/mail-autoconfig/beige.plala.or.jp
new file mode 100644
index 0000000000..1da18eb675
--- /dev/null
+++ b/mail/mail-autoconfig/beige.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="beige.plala.or.jp">
+    <domain>beige.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>beige.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>beige.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/blue.plala.or.jp b/mail/mail-autoconfig/blue.plala.or.jp
new file mode 100644
index 0000000000..510042ee9e
--- /dev/null
+++ b/mail/mail-autoconfig/blue.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="blue.plala.or.jp">
+    <domain>blue.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>blue.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>blue.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/bmail.plala.or.jp b/mail/mail-autoconfig/bmail.plala.or.jp
new file mode 100644
index 0000000000..f849e6e4b6
--- /dev/null
+++ b/mail/mail-autoconfig/bmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bmail.plala.or.jp">
+    <domain>bmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>bmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>bmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/bolero.plala.or.jp b/mail/mail-autoconfig/bolero.plala.or.jp
new file mode 100644
index 0000000000..171776a28b
--- /dev/null
+++ b/mail/mail-autoconfig/bolero.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bolero.plala.or.jp">
+    <domain>bolero.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>bolero.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>bolero.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/bpost.plala.or.jp b/mail/mail-autoconfig/bpost.plala.or.jp
new file mode 100644
index 0000000000..24c8ebd843
--- /dev/null
+++ b/mail/mail-autoconfig/bpost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bpost.plala.or.jp">
+    <domain>bpost.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>bpost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>bpost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/brown.plala.or.jp b/mail/mail-autoconfig/brown.plala.or.jp
new file mode 100644
index 0000000000..3bd4be2168
--- /dev/null
+++ b/mail/mail-autoconfig/brown.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="brown.plala.or.jp">
+    <domain>brown.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>brown.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>brown.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/camel.plala.or.jp b/mail/mail-autoconfig/camel.plala.or.jp
new file mode 100644
index 0000000000..c55faa8270
--- /dev/null
+++ b/mail/mail-autoconfig/camel.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="camel.plala.or.jp">
+    <domain>camel.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>camel.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>camel.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/cameo.plala.or.jp b/mail/mail-autoconfig/cameo.plala.or.jp
new file mode 100644
index 0000000000..7376c1fffe
--- /dev/null
+++ b/mail/mail-autoconfig/cameo.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cameo.plala.or.jp">
+    <domain>cameo.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cameo.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cameo.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/cc9.ne.jp b/mail/mail-autoconfig/cc9.ne.jp
new file mode 100644
index 0000000000..28bad2cd01
--- /dev/null
+++ b/mail/mail-autoconfig/cc9.ne.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cc9.ne.jp">
+    <domain>cc9.ne.jp</domain>
+    <displayName>CC9インターネットサービス</displayName>
+    <displayShortName>CC9</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.cc9.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.cc9.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/cek.ne.jp b/mail/mail-autoconfig/cek.ne.jp
new file mode 100644
index 0000000000..0af49bd435
--- /dev/null
+++ b/mail/mail-autoconfig/cek.ne.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cek.ne.jp">
+    <domain>cek.ne.jp</domain>
+    <displayName>エコーシティー・駒ケ岳</displayName>
+    <displayShortName>CEK-Net</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.cek.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.cek.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/clio.ne.jp b/mail/mail-autoconfig/clio.ne.jp
new file mode 100644
index 0000000000..90f1a41ba3
--- /dev/null
+++ b/mail/mail-autoconfig/clio.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="clio.ne.jp">
+    <domain>clio.ne.jp</domain>
+    <displayName>CLIO-Net移管サービス</displayName>
+    <displayShortName>CLIO-Net</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.clio.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.clio.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/cmail.plala.or.jp b/mail/mail-autoconfig/cmail.plala.or.jp
new file mode 100644
index 0000000000..eb2558272b
--- /dev/null
+++ b/mail/mail-autoconfig/cmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cmail.plala.or.jp">
+    <domain>cmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/co1.wind.jp b/mail/mail-autoconfig/co1.wind.jp
new file mode 100644
index 0000000000..e086cd7785
--- /dev/null
+++ b/mail/mail-autoconfig/co1.wind.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="co1.wind.ne.jp">
+    <domain>co1.wind.ne.jp</domain>
+    <domain>co1.wind.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>co1.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>co1.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/co2.wind.jp b/mail/mail-autoconfig/co2.wind.jp
new file mode 100644
index 0000000000..010477274d
--- /dev/null
+++ b/mail/mail-autoconfig/co2.wind.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="co2.wind.ne.jp">
+    <domain>co2.wind.ne.jp</domain>
+    <domain>co2.wind.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>co2.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>co2.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/co3.wind.jp b/mail/mail-autoconfig/co3.wind.jp
new file mode 100644
index 0000000000..498384cb09
--- /dev/null
+++ b/mail/mail-autoconfig/co3.wind.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="co3.wind.ne.jp">
+    <domain>co3.wind.ne.jp</domain>
+    <domain>co3.wind.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>co3.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>co3.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/cocoa.plala.or.jp b/mail/mail-autoconfig/cocoa.plala.or.jp
new file mode 100644
index 0000000000..5387cd368d
--- /dev/null
+++ b/mail/mail-autoconfig/cocoa.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cocoa.plala.or.jp">
+    <domain>cocoa.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cocoa.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cocoa.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/coda.plala.or.jp b/mail/mail-autoconfig/coda.plala.or.jp
new file mode 100644
index 0000000000..f668775d84
--- /dev/null
+++ b/mail/mail-autoconfig/coda.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="coda.plala.or.jp">
+    <domain>coda.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>coda.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>coda.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/comcast.net b/mail/mail-autoconfig/comcast.net
new file mode 100644
index 0000000000..56b1fa92bf
--- /dev/null
+++ b/mail/mail-autoconfig/comcast.net
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="comcast.net">
+      <domain>comcast.net</domain>
+
+      <displayName>Comcast</displayName>
+      <displayShortName>Comcast</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>mail.comcast.net</hostname>
+         <port>110</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>secure</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.comcast.net</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>secure</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/concerto.plala.or.jp b/mail/mail-autoconfig/concerto.plala.or.jp
new file mode 100644
index 0000000000..1c190b5d70
--- /dev/null
+++ b/mail/mail-autoconfig/concerto.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="concerto.plala.or.jp">
+    <domain>concerto.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>concerto.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>concerto.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/coral.plala.or.jp b/mail/mail-autoconfig/coral.plala.or.jp
new file mode 100644
index 0000000000..1c52fcee37
--- /dev/null
+++ b/mail/mail-autoconfig/coral.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="coral.plala.or.jp">
+    <domain>coral.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>coral.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>coral.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/courante.plala.or.jp b/mail/mail-autoconfig/courante.plala.or.jp
new file mode 100644
index 0000000000..05976ef0b3
--- /dev/null
+++ b/mail/mail-autoconfig/courante.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="courante.plala.or.jp">
+    <domain>courante.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>courante.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>courante.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/cpost.plala.or.jp b/mail/mail-autoconfig/cpost.plala.or.jp
new file mode 100644
index 0000000000..613d3774b9
--- /dev/null
+++ b/mail/mail-autoconfig/cpost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cpost.plala.or.jp">
+    <domain>cpost.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cpost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cpost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/cream.plala.or.jp b/mail/mail-autoconfig/cream.plala.or.jp
new file mode 100644
index 0000000000..16e232591b
--- /dev/null
+++ b/mail/mail-autoconfig/cream.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cream.plala.or.jp">
+    <domain>cream.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cream.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cream.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/dan.gunmanet.ne.jp b/mail/mail-autoconfig/dan.gunmanet.ne.jp
new file mode 100644
index 0000000000..b027d98d04
--- /dev/null
+++ b/mail/mail-autoconfig/dan.gunmanet.ne.jp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="dan.wind.ne.jp">
+    <domain>dan.wind.ne.jp</domain>
+    <domain>dan.wind.jp</domain>
+    <domain>dan.wind.co.jp</domain>
+    <domain>dan.gunmanet.or.jp</domain>
+    <domain>dan.gunmanet.ne.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>dan.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>dan.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/dance.plala.or.jp b/mail/mail-autoconfig/dance.plala.or.jp
new file mode 100644
index 0000000000..74f90c8fbc
--- /dev/null
+++ b/mail/mail-autoconfig/dance.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="dance.plala.or.jp">
+    <domain>dance.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>dance.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>dance.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/dmail.plala.or.jp b/mail/mail-autoconfig/dmail.plala.or.jp
new file mode 100644
index 0000000000..f742605b4f
--- /dev/null
+++ b/mail/mail-autoconfig/dmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="dmail.plala.or.jp">
+    <domain>dmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>dmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>dmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/e23.jp b/mail/mail-autoconfig/e23.jp
new file mode 100644
index 0000000000..f1f08b908a
--- /dev/null
+++ b/mail/mail-autoconfig/e23.jp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="iijmio-mail.jp">
+    <domain>iijmio-mail.jp</domain>
+    <domain>miomio.jp</domain>
+    <domain>miobox.jp</domain>
+    <domain>e23.jp</domain>
+    <domain>x-il.jp</domain>
+    <displayName>IIJmio セーフティメール</displayName>
+    <displayShortName>IIJmio</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mbox.iijmio-mail.jp</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%.%EMAILDOMAIN%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mbox.iijmio-mail.jp</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%.%EMAILDOMAIN%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/earthlink.net b/mail/mail-autoconfig/earthlink.net
new file mode 100644
index 0000000000..0f204b2bbd
--- /dev/null
+++ b/mail/mail-autoconfig/earthlink.net
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="earthlink.net">
+      <domain>earthlink.net</domain>
+
+      <displayName>EarthLink</displayName>
+      <displayShortName>EarthLink</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.earthlink.net</hostname>
+         <port>143</port>
+         <socketType>plain</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>secure</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtpauth.earthlink.net</hostname>
+         <port>587</port>
+         <socketType>plain</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ebony.plala.or.jp b/mail/mail-autoconfig/ebony.plala.or.jp
new file mode 100644
index 0000000000..11a275e990
--- /dev/null
+++ b/mail/mail-autoconfig/ebony.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ebony.plala.or.jp">
+    <domain>ebony.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ebony.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ebony.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/email.plala.or.jp b/mail/mail-autoconfig/email.plala.or.jp
new file mode 100644
index 0000000000..45a8e0d500
--- /dev/null
+++ b/mail/mail-autoconfig/email.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="email.plala.or.jp">
+    <domain>email.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>email.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>email.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/fantasy.plala.or.jp b/mail/mail-autoconfig/fantasy.plala.or.jp
new file mode 100644
index 0000000000..5774cc239a
--- /dev/null
+++ b/mail/mail-autoconfig/fantasy.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="fantasy.plala.or.jp">
+    <domain>fantasy.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>fantasy.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>fantasy.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/flamenco.plala.or.jp b/mail/mail-autoconfig/flamenco.plala.or.jp
new file mode 100644
index 0000000000..3a8ade7488
--- /dev/null
+++ b/mail/mail-autoconfig/flamenco.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="flamenco.plala.or.jp">
+    <domain>flamenco.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>flamenco.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>flamenco.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/fmail.plala.or.jp b/mail/mail-autoconfig/fmail.plala.or.jp
new file mode 100644
index 0000000000..c4a4dbc14b
--- /dev/null
+++ b/mail/mail-autoconfig/fmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="fmail.plala.or.jp">
+    <domain>fmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>fmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>fmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/free.fr b/mail/mail-autoconfig/free.fr
new file mode 100644
index 0000000000..f97fe38504
--- /dev/null
+++ b/mail/mail-autoconfig/free.fr
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="free.fr">
+      <domain>free.fr</domain>
+
+      <displayName>Free Telecom</displayName>
+      <displayShortName>free.fr</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.free.fr</hostname>
+         <port>143</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.free.fr</hostname>
+         <port>25</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <!-- IP-based auth: smtp server only allows connection from ISP network :-( -->
+         <useGlobalPreferredServer>true</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/freenet.de b/mail/mail-autoconfig/freenet.de
new file mode 100644
index 0000000000..1144a80c6d
--- /dev/null
+++ b/mail/mail-autoconfig/freenet.de
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="freenet.de">
+      <domain>freenet.de</domain>
+
+      <displayName>Freenet Mail</displayName>
+      <displayShortName>Freenet</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>mx.freenet.de</hostname>
+         <!-- 143 STARTTLS also works -->
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <authentication>secure</authentication>
+         <username>%EMAILADDRESS%</username>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>mx.freenet.de</hostname>
+         <!-- 587 STARTTLS also works -->
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <authentication>secure</authentication>
+         <username>%EMAILADDRESS%</username>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <!-- config pages:
+         http://kundenservice.freenet.de/hilfe/email/programme/config/index.html
+         http://kundenservice.freenet.de/hilfe/email/programme/config/thunderbird/imap-thunderbird/imap/index.html
+
+         STARTTLS and normal SSL on SSL ports both work fine (not mentioned on config pages).
+         CRAM-MD5 works even with SSL, very cool and exemplary, we'll do that.
+       -->
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/fuga.plala.or.jp b/mail/mail-autoconfig/fuga.plala.or.jp
new file mode 100644
index 0000000000..f41116addd
--- /dev/null
+++ b/mail/mail-autoconfig/fuga.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="fuga.plala.or.jp">
+    <domain>fuga.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>fuga.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>fuga.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/gmail.com b/mail/mail-autoconfig/gmail.com
new file mode 100644
index 0000000000..f73f7e0c7f
--- /dev/null
+++ b/mail/mail-autoconfig/gmail.com
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="googlemail.com">
+      <domain>gmail.com</domain>
+      <domain>googlemail.com</domain>
+
+      <displayName>Google Mail</displayName>
+      <displayShortName>GMail</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.googlemail.com</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.googlemail.com</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <enableURL url="https://mail.google.com/mail/?ui=2&amp;shva=1#settings/fwdandpop">You need to enable IMAP access</enableURL>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/gmail.com imap b/mail/mail-autoconfig/gmail.com imap
new file mode 100644
index 0000000000..f73f7e0c7f
--- /dev/null
+++ b/mail/mail-autoconfig/gmail.com imap
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="googlemail.com">
+      <domain>gmail.com</domain>
+      <domain>googlemail.com</domain>
+
+      <displayName>Google Mail</displayName>
+      <displayShortName>GMail</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.googlemail.com</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.googlemail.com</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <enableURL url="https://mail.google.com/mail/?ui=2&amp;shva=1#settings/fwdandpop">You need to enable IMAP access</enableURL>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/gmail.com pop b/mail/mail-autoconfig/gmail.com pop
new file mode 100644
index 0000000000..4b1a577561
--- /dev/null
+++ b/mail/mail-autoconfig/gmail.com pop
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="googlemail.com">
+      <domain>gmail.com</domain>
+      <domain>googlemail.com</domain>
+
+      <displayName>Google Mail</displayName>
+      <displayShortName>GMail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop.googlemail.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <pop3>
+            <leaveMessagesOnServer>true</leaveMessagesOnServer>
+         </pop3>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.googlemail.com</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <enableURL url="https://mail.google.com/mail/?ui=2&amp;shva=1#settings/fwdandpop">You need to enable POP access</enableURL>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/gmail.plala.or.jp b/mail/mail-autoconfig/gmail.plala.or.jp
new file mode 100644
index 0000000000..d369859a43
--- /dev/null
+++ b/mail/mail-autoconfig/gmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="gmail.plala.or.jp">
+    <domain>gmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>gmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>gmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/gmx.com b/mail/mail-autoconfig/gmx.com
new file mode 100644
index 0000000000..06782b48cc
--- /dev/null
+++ b/mail/mail-autoconfig/gmx.com
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="gmx.com">
+    <domain>gmx.com</domain>
+    <displayName>GMX Freemail</displayName>
+    <displayShortName>GMX</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.gmx.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.gmx.com</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/gmx.net b/mail/mail-autoconfig/gmx.net
new file mode 100644
index 0000000000..3a93fb9839
--- /dev/null
+++ b/mail/mail-autoconfig/gmx.net
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="gmx.de">
+      <domain>gmx.de</domain>
+      <domain>gmx.net</domain>
+      <domain>gmx.ch</domain>
+      <domain>gmx.at</domain>
+      <domain>gmx.li</domain>
+      <domain>gmx.fr</domain>
+      <domain>gmx.it</domain>
+      <domain>gmx.co.uk</domain>
+      <!-- siehe auch unten -->
+
+      <displayName>GMX Freemail</displayName>
+      <displayShortName>GMX</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop.gmx.net</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username> <!-- Kundennummer und Email-Adresse sollten beide funktionieren -->
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>mail.gmx.net</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username> <!-- s.o. -->
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
+
+      <!-- Noch ne ganze Menge Vanity-Domains, die wir hier nicht hinzufügen werden:  bist-eine-haelfte-von-mir.de,  bleib-bei-mir.de,  es-ist-liebe.de,  fahr-zur-hoelle.org,  ich-bin-verrueckt-nach-dir.de,  ist-allein.info,  ist-es-liebe.de,  ist-ganz-allein.de,  ist-willig.de,  lass-es-geschehen.de,  liebt-dich.info,  loveyouforever.de,  moechte-mit-dir-aufwachen.de,  schmusemail.de,  schreib-doch-mal-wieder.de,  teilt-mit-dir-alle-geheimnisse.de,  verlass-mich-nicht.de,  vorsicht-scharf.de,  weinenvorglueck.de,  alphafrau.de,  feinripptraeger.de,  fettabernett.de,  ist-einmalig.de,  kaffeeschluerfer.com,  liebt-den-mann-ihrer-chefin.de,  liebt-die-frau-seines-chefs.de,  maennerversteherin.com,  partybombe.de,  partyheld.de,  polizisten-duzer.de,  raubtierbaendiger.de,  saeuferleber.de,  tortenboxer.de,  turboprinz.de,  turboprinzessin.de,  vorsicht-bissig.de,  alpenjodel.de,  das-spiel-hat-90-minuten.de,  der-ball-ist-rund.net,  die-genossen.de,  die-optimisten.net,  email-ausdrucker.de,  fantasymail.de,  freudenkinder.de,  gentlemansclub.de,  gmx-ist-cool.de,  herr-der-mails.de,  ich-habe-fertig.com,  meine-wahrheit-deine-wahrheit.de,  muskelshirt.de,  quantentunnel.de,  sags-per-mail.de,  sonnenkinder.org,  turnbeutel-vergesser.com,  vollbio.de,  volloeko.de,  vorabend-einchecker.de,  weibsvolk.org,  wenns-um-email-geht.de,  wir-sind-cool.org,  wolke7.net,  abwesend.de,  baldmama.de,  baldpapa.de,  betriebsdirektor.de,  buerotiger.de,  habmalnefrage.de,  hab-verschlafen.de,  ich-will-net.de,  kommespaeter.de,  mailueberfall.de,  netterchef.de,  nurfuerspam.de,  streber24.de,  terminverpennt.de,  unterderbruecke.de,  will-hier-weg.de,  wir-haben-nachwuchs.de,  women-at-work.org,  bin-wieder-da.de,  coole-files.de,  die-besten-bilder.de,  digi-dia-freakshow.de,  digital-filestore.de,  digitalfoto-model-award.de,  download-privat.de,  gmx-topmail.de,  meine-dateien.info,  meine-diashow.de,  meine-fotos.info,  meine-urlaubsfotos.de,  neue-dateien.de,  office-dateien.de,  peinliche-fotos.de,  public-files.de,  shared-files.de,  topmail-files.de,  war-im-urlaub.de -->
diff --git a/mail/mail-autoconfig/go.tvm.ne.jp b/mail/mail-autoconfig/go.tvm.ne.jp
new file mode 100644
index 0000000000..ccbb238eae
--- /dev/null
+++ b/mail/mail-autoconfig/go.tvm.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="go.tvm.ne.jp">
+    <domain>go.tvm.ne.jp</domain>
+    <displayName>テレビ松本ケーブルインターネットサービス</displayName>
+    <displayShortName>TVM-Net</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>go.tvm.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>go.tvm.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/goo.jp b/mail/mail-autoconfig/goo.jp
new file mode 100644
index 0000000000..6ddc1eadd4
--- /dev/null
+++ b/mail/mail-autoconfig/goo.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="goo.jp">
+    <domain>goo.jp</domain>
+    <displayName>goo メールアドバンス</displayName>
+    <displayShortName>goo</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.mail.goo.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.goo.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/googlemail.com b/mail/mail-autoconfig/googlemail.com
new file mode 100644
index 0000000000..f73f7e0c7f
--- /dev/null
+++ b/mail/mail-autoconfig/googlemail.com
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="googlemail.com">
+      <domain>gmail.com</domain>
+      <domain>googlemail.com</domain>
+
+      <displayName>Google Mail</displayName>
+      <displayShortName>GMail</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.googlemail.com</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.googlemail.com</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <enableURL url="https://mail.google.com/mail/?ui=2&amp;shva=1#settings/fwdandpop">You need to enable IMAP access</enableURL>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/grape.plala.or.jp b/mail/mail-autoconfig/grape.plala.or.jp
new file mode 100644
index 0000000000..09fb378504
--- /dev/null
+++ b/mail/mail-autoconfig/grape.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="grape.plala.or.jp">
+    <domain>grape.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>grape.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>grape.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/gray.plala.or.jp b/mail/mail-autoconfig/gray.plala.or.jp
new file mode 100644
index 0000000000..efeb3547f0
--- /dev/null
+++ b/mail/mail-autoconfig/gray.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="gray.plala.or.jp">
+    <domain>gray.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>gray.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>gray.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/hal.ne.jp b/mail/mail-autoconfig/hal.ne.jp
new file mode 100644
index 0000000000..ad8e336c03
--- /dev/null
+++ b/mail/mail-autoconfig/hal.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="hal.ne.jp">
+    <domain>hal.ne.jp</domain>
+    <displayName>ハルインターネット</displayName>
+    <displayShortName>HAL</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.hal.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.hal.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/hana.or.jp b/mail/mail-autoconfig/hana.or.jp
new file mode 100644
index 0000000000..b2dc624348
--- /dev/null
+++ b/mail/mail-autoconfig/hana.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="hana.or.jp">
+    <domain>hana.or.jp</domain>
+    <displayName>きたうら花ねっと</displayName>
+    <displayShortName>花ねっと</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.hana.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.hana.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/hotmail.co.jp b/mail/mail-autoconfig/hotmail.co.jp
new file mode 100644
index 0000000000..327130587f
--- /dev/null
+++ b/mail/mail-autoconfig/hotmail.co.jp
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/hotmail.co.uk b/mail/mail-autoconfig/hotmail.co.uk
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/hotmail.co.uk
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/hotmail.com b/mail/mail-autoconfig/hotmail.com
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/hotmail.com
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/hotmail.de b/mail/mail-autoconfig/hotmail.de
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/hotmail.de
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/hotmail.fr b/mail/mail-autoconfig/hotmail.fr
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/hotmail.fr
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/hotmail.it b/mail/mail-autoconfig/hotmail.it
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/hotmail.it
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ic-net.or.jp b/mail/mail-autoconfig/ic-net.or.jp
new file mode 100644
index 0000000000..8a89a3ec01
--- /dev/null
+++ b/mail/mail-autoconfig/ic-net.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ic-net.or.jp">
+    <domain>ic-net.or.jp</domain>
+    <displayName>IC-NET</displayName>
+    <displayShortName>IC-NET</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.ic-net.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.ic-net.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/iiyama-catv.ne.jp b/mail/mail-autoconfig/iiyama-catv.ne.jp
new file mode 100644
index 0000000000..85f1a2725d
--- /dev/null
+++ b/mail/mail-autoconfig/iiyama-catv.ne.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="iiyama-catv.ne.jp">
+    <domain>iiyama-catv.ne.jp</domain>
+    <displayName>ケーブルテレビiネット飯山</displayName>
+    <displayShortName>iネット飯山</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.iiyama-catv.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.iiyama-catv.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/imail.plala.or.jp b/mail/mail-autoconfig/imail.plala.or.jp
new file mode 100644
index 0000000000..d4c8897d22
--- /dev/null
+++ b/mail/mail-autoconfig/imail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="imail.plala.or.jp">
+    <domain>imail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>imail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>imail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/inbox.lt b/mail/mail-autoconfig/inbox.lt
new file mode 100644
index 0000000000..c5f07659d0
--- /dev/null
+++ b/mail/mail-autoconfig/inbox.lt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="inbox.lt">
+    <domain>inbox.lt</domain>
+    <displayName>Inbox.lt</displayName>
+    <displayShortName>Inbox.lt</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.inbox.lt</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <pop3>
+        <leaveMessagesOnServer>true</leaveMessagesOnServer>
+        <daysToLeaveMessagesOnServer>999</daysToLeaveMessagesOnServer>
+      </pop3>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.inbox.lt</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/inbox.lv b/mail/mail-autoconfig/inbox.lv
new file mode 100644
index 0000000000..ac3b317315
--- /dev/null
+++ b/mail/mail-autoconfig/inbox.lv
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="inbox.lv">
+    <domain>inbox.lv</domain>
+    <displayName>Inbox.lv</displayName>
+    <displayShortName>Inbox.lv</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.inbox.lv</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <pop3>
+        <leaveMessagesOnServer>true</leaveMessagesOnServer>
+        <daysToLeaveMessagesOnServer>999</daysToLeaveMessagesOnServer>
+      </pop3>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.inbox.lv</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/indigo.plala.or.jp b/mail/mail-autoconfig/indigo.plala.or.jp
new file mode 100644
index 0000000000..2d21e2d69e
--- /dev/null
+++ b/mail/mail-autoconfig/indigo.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="indigo.plala.or.jp">
+    <domain>indigo.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>indigo.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>indigo.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/inet-shibata.or.jp b/mail/mail-autoconfig/inet-shibata.or.jp
new file mode 100644
index 0000000000..8e09a319c0
--- /dev/null
+++ b/mail/mail-autoconfig/inet-shibata.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="inet-shibata.or.jp">
+    <domain>inet-shibata.or.jp</domain>
+    <displayName>インターネット新発田</displayName>
+    <displayShortName>INET-SHIBATA</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>po.inet-shibata.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>po.inet-shibata.or.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ivory.plala.or.jp b/mail/mail-autoconfig/ivory.plala.or.jp
new file mode 100644
index 0000000000..a3a0b40c79
--- /dev/null
+++ b/mail/mail-autoconfig/ivory.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ivory.plala.or.jp">
+    <domain>ivory.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ivory.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ivory.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/iwafune.ne.jp b/mail/mail-autoconfig/iwafune.ne.jp
new file mode 100644
index 0000000000..d45552f08b
--- /dev/null
+++ b/mail/mail-autoconfig/iwafune.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="iwafune.ne.jp">
+    <domain>iwafune.ne.jp</domain>
+    <displayName>インターネットいわふね</displayName>
+    <displayShortName>IWAFUNE</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>po.iwafune.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>po.iwafune.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/jade.plala.or.jp b/mail/mail-autoconfig/jade.plala.or.jp
new file mode 100644
index 0000000000..998ff0ce43
--- /dev/null
+++ b/mail/mail-autoconfig/jade.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="jade.plala.or.jp">
+    <domain>jade.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>jade.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>jade.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/janis.or.jp b/mail/mail-autoconfig/janis.or.jp
new file mode 100644
index 0000000000..2092e32aaf
--- /dev/null
+++ b/mail/mail-autoconfig/janis.or.jp
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="janis.or.jp">
+    <domain>janis.or.jp</domain>
+    <domain>azm.janis.or.jp</domain>
+    <domain>ckm.janis.or.jp</domain>
+    <domain>dhk.janis.or.jp</domain>
+    <domain>dia.janis.or.jp</domain>
+    <domain>grn.janis.or.jp</domain>
+    <domain>ina.janis.or.jp</domain>
+    <domain>kis.janis.or.jp</domain>
+    <domain>mhl.janis.or.jp</domain>
+    <domain>mid.janis.or.jp</domain>
+    <domain>mis.janis.or.jp</domain>
+    <domain>miy.janis.or.jp</domain>
+    <domain>ngn.janis.or.jp</domain>
+    <domain>nkn.janis.or.jp</domain>
+    <domain>osk.janis.or.jp</domain>
+    <domain>sas.janis.or.jp</domain>
+    <domain>sko.janis.or.jp</domain>
+    <domain>swk.janis.or.jp</domain>
+    <domain>tgk.janis.or.jp</domain>
+    <domain>tyt.janis.or.jp</domain>
+    <domain>ued.janis.or.jp</domain>
+    <domain>ytg.janis.or.jp</domain>
+    <displayName>JANIS</displayName>
+    <displayShortName>JANIS</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.%EMAILDOMAIN%</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.%EMAILDOMAIN%</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/jet.ne.jp b/mail/mail-autoconfig/jet.ne.jp
new file mode 100644
index 0000000000..dc2c794159
--- /dev/null
+++ b/mail/mail-autoconfig/jet.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="jet.ne.jp">
+    <domain>jet.ne.jp</domain>
+    <displayName>JETINTERNET</displayName>
+    <displayShortName>JET</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.jet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.jet.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/jet.ne.jp imap b/mail/mail-autoconfig/jet.ne.jp imap
new file mode 100644
index 0000000000..2a8bdebbda
--- /dev/null
+++ b/mail/mail-autoconfig/jet.ne.jp imap
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="jet.ne.jp">
+    <domain>jet.ne.jp</domain>
+    <displayName>JETINTERNET</displayName>
+    <displayShortName>JET</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.jet.ne.jp</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.jet.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/jet.ne.jp pop b/mail/mail-autoconfig/jet.ne.jp pop
new file mode 100644
index 0000000000..dc2c794159
--- /dev/null
+++ b/mail/mail-autoconfig/jet.ne.jp pop
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="jet.ne.jp">
+    <domain>jet.ne.jp</domain>
+    <displayName>JETINTERNET</displayName>
+    <displayShortName>JET</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.jet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.jet.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ji.jet.ne.jp b/mail/mail-autoconfig/ji.jet.ne.jp
new file mode 100644
index 0000000000..7c2dfa5b6a
--- /dev/null
+++ b/mail/mail-autoconfig/ji.jet.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ji.jet.ne.jp">
+    <domain>jet.ne.jp</domain>
+    <displayName>JETINTERNET</displayName>
+    <displayShortName>JET</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop02.jet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp02.jet.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/jmail.plala.or.jp b/mail/mail-autoconfig/jmail.plala.or.jp
new file mode 100644
index 0000000000..a8c80b2026
--- /dev/null
+++ b/mail/mail-autoconfig/jmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="jmail.plala.or.jp">
+    <domain>jmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>jmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>jmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/k1.wind.jp b/mail/mail-autoconfig/k1.wind.jp
new file mode 100644
index 0000000000..80bd91ee82
--- /dev/null
+++ b/mail/mail-autoconfig/k1.wind.jp
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="kl.wind.ne.jp">
+    <domain>kl.wind.ne.jp</domain>
+    <domain>kl.wind.jp</domain>
+    <domain>kl.wind.co.jp</domain>
+    <domain>kl.gunmanet.or.jp</domain>
+    <domain>kl.gunmanet.ne.jp</domain>
+    <domain>k1.wind.ne.jp</domain>
+    <domain>k1.wind.jp</domain>
+    <domain>k1.gunmanet.or.jp</domain>
+    <domain>k1.gunmanet.ne.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>kl.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>kl.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/khaki.plala.or.jp b/mail/mail-autoconfig/khaki.plala.or.jp
new file mode 100644
index 0000000000..09b562ce68
--- /dev/null
+++ b/mail/mail-autoconfig/khaki.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="khaki.plala.or.jp">
+    <domain>khaki.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>khaki.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>khaki.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/kmail.plala.or.jp b/mail/mail-autoconfig/kmail.plala.or.jp
new file mode 100644
index 0000000000..7e88d5f88d
--- /dev/null
+++ b/mail/mail-autoconfig/kmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="kmail.plala.or.jp">
+    <domain>kmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>kmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>kmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/kokuyou.ne.jp b/mail/mail-autoconfig/kokuyou.ne.jp
new file mode 100644
index 0000000000..1a3e2a6830
--- /dev/null
+++ b/mail/mail-autoconfig/kokuyou.ne.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="kokuyou.ne.jp">
+    <domain>kokuyou.ne.jp</domain>
+    <displayName>長和町黒耀の里ゆいねっと</displayName>
+    <displayShortName>ゆいねっと</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.kokuyou.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.kokuyou.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/lapis.plala.or.jp b/mail/mail-autoconfig/lapis.plala.or.jp
new file mode 100644
index 0000000000..eb54651cb0
--- /dev/null
+++ b/mail/mail-autoconfig/lapis.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="lapis.plala.or.jp">
+    <domain>lapis.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>lapis.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>lapis.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/laposte.net b/mail/mail-autoconfig/laposte.net
new file mode 100644
index 0000000000..e0b1bd45aa
--- /dev/null
+++ b/mail/mail-autoconfig/laposte.net
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="laposte.net">
+      <domain>laposte.net</domain>
+
+      <displayName>LaPoste.net</displayName>
+      <displayShortName>LaPoste</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.laposte.net</hostname>
+         <port>143</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.laposte.net</hostname>
+         <port>25</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/lemon.plala.or.jp b/mail/mail-autoconfig/lemon.plala.or.jp
new file mode 100644
index 0000000000..26846d8f5c
--- /dev/null
+++ b/mail/mail-autoconfig/lemon.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="lemon.plala.or.jp">
+    <domain>lemon.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>lemon.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>lemon.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/lilac.plala.or.jp b/mail/mail-autoconfig/lilac.plala.or.jp
new file mode 100644
index 0000000000..1283c0246e
--- /dev/null
+++ b/mail/mail-autoconfig/lilac.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="lilac.plala.or.jp">
+    <domain>lilac.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>lilac.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>lilac.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/lime.plala.or.jp b/mail/mail-autoconfig/lime.plala.or.jp
new file mode 100644
index 0000000000..94e092548b
--- /dev/null
+++ b/mail/mail-autoconfig/lime.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="lime.plala.or.jp">
+    <domain>lime.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>lime.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>lime.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/live.co.jp b/mail/mail-autoconfig/live.co.jp
new file mode 100644
index 0000000000..327130587f
--- /dev/null
+++ b/mail/mail-autoconfig/live.co.jp
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/live.co.uk b/mail/mail-autoconfig/live.co.uk
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/live.co.uk
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/live.com b/mail/mail-autoconfig/live.com
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/live.com
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/live.de b/mail/mail-autoconfig/live.de
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/live.de
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/live.fr b/mail/mail-autoconfig/live.fr
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/live.fr
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/live.it b/mail/mail-autoconfig/live.it
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/live.it
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ma100.tiki.ne.jp b/mail/mail-autoconfig/ma100.tiki.ne.jp
new file mode 100644
index 0000000000..d87f89eda9
--- /dev/null
+++ b/mail/mail-autoconfig/ma100.tiki.ne.jp
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="mx1.tiki.ne.jp">
+    <domain>mx1.tiki.ne.jp</domain>
+    <domain>mx2.et.tiki.ne.jp</domain>
+    <domain>mx2.tiki.ne.jp</domain>
+    <domain>mx2.wt.tiki.ne.jp</domain>
+    <domain>mx3.et.tiki.ne.jp</domain>
+    <domain>mx3.tiki.ne.jp</domain>
+    <domain>mx4.et.tiki.ne.jp</domain>
+    <domain>mx4.tiki.ne.jp</domain>
+    <domain>mx5.et.tiki.ne.jp</domain>
+    <domain>mx5.tiki.ne.jp</domain>
+    <domain>mx6.et.tiki.ne.jp</domain>
+    <domain>mx6.tiki.ne.jp</domain>
+    <domain>mx7.tiki.ne.jp</domain>
+    <domain>mx8.tiki.ne.jp</domain>
+    <domain>mx9.tiki.ne.jp</domain>
+    <domain>mx21.tiki.ne.jp</domain>
+    <domain>mx22.tiki.ne.jp</domain>
+    <domain>mx31.tiki.ne.jp</domain>
+    <domain>mx32.tiki.ne.jp</domain>
+    <domain>mx35.tiki.ne.jp</domain>
+    <domain>mx36.tiki.ne.jp</domain>
+    <domain>mx41.tiki.ne.jp</domain>
+    <domain>mx51.et.tiki.ne.jp</domain>
+    <domain>mx51.tiki.ne.jp</domain>
+    <domain>mx52.tiki.ne.jp</domain>
+    <domain>mx61.tiki.ne.jp</domain>
+    <domain>mx71.tiki.ne.jp</domain>
+    <domain>mx81.tiki.ne.jp</domain>
+    <domain>mx82.tiki.ne.jp</domain>
+    <domain>mx91.tiki.ne.jp</domain>
+    <domain>ma100.tiki.ne.jp</domain>
+    <displayName>TikiTikiインターネット</displayName>
+    <displayShortName>TikiTiki</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>%EMAILDOMAIN%</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp-auth.tiki.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/mac.com b/mail/mail-autoconfig/mac.com
new file mode 100644
index 0000000000..094425578b
--- /dev/null
+++ b/mail/mail-autoconfig/mac.com
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="me.com">
+      <domain>mac.com</domain>
+      <domain>me.com</domain>
+
+      <displayName>Apple MobileMe</displayName>
+      <displayShortName>Apple</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>mail.me.com</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.me.com</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/mahoroba.ne.jp b/mail/mail-autoconfig/mahoroba.ne.jp
new file mode 100644
index 0000000000..43679c1446
--- /dev/null
+++ b/mail/mail-autoconfig/mahoroba.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="mahoroba.ne.jp">
+    <domain>mahoroba.ne.jp</domain>
+    <displayName>インターネットまほろば</displayName>
+    <displayShortName>まほろば</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.mahoroba.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.mahoroba.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/mail.gunmanet.jp b/mail/mail-autoconfig/mail.gunmanet.jp
new file mode 100644
index 0000000000..90bdf8ecf8
--- /dev/null
+++ b/mail/mail-autoconfig/mail.gunmanet.jp
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="mail.wind.ne.jp">
+    <domain>mail.wind.ne.jp</domain>
+    <domain>mail.wind.jp</domain>
+    <domain>mail.wind.co.jp</domain>
+    <domain>mail.gunmanet.or.jp</domain>
+    <domain>mail.gunmanet.ne.jp</domain>
+    <domain>mail.gunmanet.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/mail.iwafune.ne.jp b/mail/mail-autoconfig/mail.iwafune.ne.jp
new file mode 100644
index 0000000000..c6340450b9
--- /dev/null
+++ b/mail/mail-autoconfig/mail.iwafune.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="mail.iwafune.ne.jp">
+    <domain>mail.iwafune.ne.jp</domain>
+    <displayName>インターネットいわふね</displayName>
+    <displayShortName>IWAFUNE</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.iwafune.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.iwafune.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/maroon.plala.or.jp b/mail/mail-autoconfig/maroon.plala.or.jp
new file mode 100644
index 0000000000..d2e00e2d0d
--- /dev/null
+++ b/mail/mail-autoconfig/maroon.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="maroon.plala.or.jp">
+    <domain>maroon.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>maroon.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>maroon.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/me.com b/mail/mail-autoconfig/me.com
new file mode 100644
index 0000000000..094425578b
--- /dev/null
+++ b/mail/mail-autoconfig/me.com
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="me.com">
+      <domain>mac.com</domain>
+      <domain>me.com</domain>
+
+      <displayName>Apple MobileMe</displayName>
+      <displayShortName>Apple</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>mail.me.com</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.me.com</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/minuet.plala.or.jp b/mail/mail-autoconfig/minuet.plala.or.jp
new file mode 100644
index 0000000000..af72bf2644
--- /dev/null
+++ b/mail/mail-autoconfig/minuet.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="minuet.plala.or.jp">
+    <domain>minuet.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>minuet.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>minuet.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ml.murakami.ne.jp b/mail/mail-autoconfig/ml.murakami.ne.jp
new file mode 100644
index 0000000000..54d20ae5f9
--- /dev/null
+++ b/mail/mail-autoconfig/ml.murakami.ne.jp
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="ml.murakami.ne.jp">
+      <domain>ml.murakami.ne.jp</domain>
+
+      <displayName>インターネットいわふね</displayName>
+      <displayShortName>IWAFUNE</displayShortName>
+
+      <incomingServer type="pop3">
+        <hostname>ml.murakami.ne.jp</hostname>
+        <port>110</port>
+        <socketType>plain</socketType>
+        <username>%EMAILLOCALPART%</username>
+        <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+        <hostname>ml.murakami.ne.jp</hostname>
+        <port>25</port>
+        <socketType>plain</socketType>
+        <username>%EMAILLOCALPART%</username>
+        <authentication>plain</authentication>
+        <addThisServer>true</addThisServer>
+        <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ml.shibata.ne.jp b/mail/mail-autoconfig/ml.shibata.ne.jp
new file mode 100644
index 0000000000..a78346145b
--- /dev/null
+++ b/mail/mail-autoconfig/ml.shibata.ne.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="pop.shibata.ne.jp">
+    <domain>pop.shibata.ne.jp</domain>
+    <domain>ml.shibata.ne.jp</domain>
+    <displayName>インターネット新発田</displayName>
+    <displayShortName>INET-SHIBATA</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>%EMAILDOMAIN%</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>%EMAILDOMAIN%</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/mnet.ne.jp b/mail/mail-autoconfig/mnet.ne.jp
new file mode 100644
index 0000000000..24a19b4795
--- /dev/null
+++ b/mail/mail-autoconfig/mnet.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="mnet.ne.jp">
+    <domain>mnet.ne.jp</domain>
+    <displayName>Mnet メール サービス</displayName>
+    <displayShortName>Mnetメール</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.mnet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.mnet.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/mopera.net b/mail/mail-autoconfig/mopera.net
new file mode 100644
index 0000000000..9f416f21d9
--- /dev/null
+++ b/mail/mail-autoconfig/mopera.net
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="mopera.net">
+    <domain>mopera.net</domain>
+    <displayName>mopera U</displayName>
+    <displayShortName>mopera U</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.mopera.net</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.mopera.net</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/msn.com b/mail/mail-autoconfig/msn.com
new file mode 100644
index 0000000000..e11acdc3bb
--- /dev/null
+++ b/mail/mail-autoconfig/msn.com
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="hotmail.com">
+      <domain>hotmail.com</domain>
+      <domain>hotmail.co.uk</domain>
+      <domain>hotmail.co.jp</domain>
+      <domain>hotmail.de</domain>
+      <domain>hotmail.fr</domain>
+      <domain>hotmail.it</domain>
+      <domain>live.com</domain>
+      <domain>live.co.uk</domain>
+      <domain>live.co.jp</domain>
+      <domain>live.de</domain>
+      <domain>live.fr</domain>
+      <domain>live.it</domain>
+      <domain>msn.com</domain>
+
+      <displayName>Microsoft Live Hotmail</displayName>
+      <displayShortName>Hotmail</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop3.live.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.live.com</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>login</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/navy.plala.or.jp b/mail/mail-autoconfig/navy.plala.or.jp
new file mode 100644
index 0000000000..3935216659
--- /dev/null
+++ b/mail/mail-autoconfig/navy.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="navy.plala.or.jp">
+    <domain>navy.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>navy.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>navy.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/nifty.com b/mail/mail-autoconfig/nifty.com
new file mode 100644
index 0000000000..5b38d6240e
--- /dev/null
+++ b/mail/mail-autoconfig/nifty.com
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="nifty.com">
+    <domain>nifty.com</domain>
+    <displayName>@nifty</displayName>
+    <displayShortName>@nifty</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.nifty.com</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.nifty.com</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/nsat.jp b/mail/mail-autoconfig/nsat.jp
new file mode 100644
index 0000000000..32583b86d2
--- /dev/null
+++ b/mail/mail-autoconfig/nsat.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="nsat.jp">
+    <domain>nsat.jp</domain>
+    <displayName>ＢＢにいがた</displayName>
+    <displayShortName>NSAT</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.nsat.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>secure</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.nsat.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>secure</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/olive.plala.or.jp b/mail/mail-autoconfig/olive.plala.or.jp
new file mode 100644
index 0000000000..f85b0232ea
--- /dev/null
+++ b/mail/mail-autoconfig/olive.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="olive.plala.or.jp">
+    <domain>olive.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>olive.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>olive.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/online.de b/mail/mail-autoconfig/online.de
new file mode 100644
index 0000000000..12c4b1e722
--- /dev/null
+++ b/mail/mail-autoconfig/online.de
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="1und1.de">
+      <domain>online.de</domain>
+      <domain>onlinehome.de</domain>
+      <domain>sofortstart.de</domain>
+      <domain>sofort-start.de</domain>
+      <domain>sofortsurf.de</domain>
+      <domain>sofort-surf.de</domain>
+      <domain>go4more.de</domain>
+
+      <displayName>1&amp;1</displayName>
+      <displayShortName>1&amp;1</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.1und1.de</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <!-- also works: <port>143</port> <socketType>STARTTLS</socketType> -->
+         <authentication>plain</authentication>
+         <username>%EMAILADDRESS%</username>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.1und1.de</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <authentication>plain</authentication>
+         <username>%EMAILADDRESS%</username>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+      <!--
+      http://hilfe-center.1und1.de/access/search/go.php?t=e698123
+      Kundenservice: +49-721-9600
+      Presse: +49-2602-961276 <presse@1und1.de>
+
+      Failed: SMTP server doesn't answer me, apparently works only within the ISP network
+      -->
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/opal.plala.or.jp b/mail/mail-autoconfig/opal.plala.or.jp
new file mode 100644
index 0000000000..168f59fd01
--- /dev/null
+++ b/mail/mail-autoconfig/opal.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="opal.plala.or.jp">
+    <domain>opal.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>opal.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>opal.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/orange.fr b/mail/mail-autoconfig/orange.fr
new file mode 100644
index 0000000000..c40c39e1ce
--- /dev/null
+++ b/mail/mail-autoconfig/orange.fr
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="francetelecom.fr">
+      <domain>wanadoo.fr</domain>
+      <domain>orange.fr</domain>
+
+      <displayName>France Telecom / Orange</displayName>
+      <displayShortName>Orange</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop.orange.fr</hostname>
+         <port>110</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.orange.fr</hostname>
+         <port>25</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/orange.plala.or.jp b/mail/mail-autoconfig/orange.plala.or.jp
new file mode 100644
index 0000000000..7baa803144
--- /dev/null
+++ b/mail/mail-autoconfig/orange.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="orange.plala.or.jp">
+    <domain>orange.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>orange.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>orange.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/orchid.plala.or.jp b/mail/mail-autoconfig/orchid.plala.or.jp
new file mode 100644
index 0000000000..b5c8bc2130
--- /dev/null
+++ b/mail/mail-autoconfig/orchid.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="orchid.plala.or.jp">
+    <domain>orchid.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>orchid.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>orchid.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/pal.kijimadaira.jp b/mail/mail-autoconfig/pal.kijimadaira.jp
new file mode 100644
index 0000000000..1b91b71189
--- /dev/null
+++ b/mail/mail-autoconfig/pal.kijimadaira.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="pal.kijimadaira.jp">
+    <domain>pal.kijimadaira.jp</domain>
+    <displayName>木島平村FTTH</displayName>
+    <displayShortName>木島平村FTTH</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.pal.kijimadaira.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.pal.kijimadaira.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/palette.plala.or.jp b/mail/mail-autoconfig/palette.plala.or.jp
new file mode 100644
index 0000000000..1a64ad6643
--- /dev/null
+++ b/mail/mail-autoconfig/palette.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="palette.plala.or.jp">
+    <domain>palette.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>palette.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>palette.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/parabox.or.jp b/mail/mail-autoconfig/parabox.or.jp
new file mode 100644
index 0000000000..0c99974741
--- /dev/null
+++ b/mail/mail-autoconfig/parabox.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="parabox.or.jp">
+    <domain>parabox.or.jp</domain>
+    <displayName>パラボックス</displayName>
+    <displayShortName>PARABOX</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.parabox.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.parabox.or.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/peach.plala.or.jp b/mail/mail-autoconfig/peach.plala.or.jp
new file mode 100644
index 0000000000..34c7a3df41
--- /dev/null
+++ b/mail/mail-autoconfig/peach.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="peach.plala.or.jp">
+    <domain>peach.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>peach.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>peach.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/peoplepc.com b/mail/mail-autoconfig/peoplepc.com
new file mode 100644
index 0000000000..b9ec01d797
--- /dev/null
+++ b/mail/mail-autoconfig/peoplepc.com
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="peoplepc.com">
+      <domain>peoplepc.com</domain>
+
+      <displayName>PeoplePC</displayName>
+      <displayShortName>PeoplePC</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.peoplepc.com</hostname>
+         <port>143</port>
+         <socketType>plain</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>secure</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtpauth.peoplepc.com</hostname>
+         <port>587</port>
+         <socketType>plain</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/plum.plala.or.jp b/mail/mail-autoconfig/plum.plala.or.jp
new file mode 100644
index 0000000000..5696afd5ba
--- /dev/null
+++ b/mail/mail-autoconfig/plum.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="plum.plala.or.jp">
+    <domain>plum.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>plum.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>plum.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/po.dcn.ne.jp b/mail/mail-autoconfig/po.dcn.ne.jp
new file mode 100644
index 0000000000..e91d2affc7
--- /dev/null
+++ b/mail/mail-autoconfig/po.dcn.ne.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="po.dcn.ne.jp">
+    <domain>po.dcn.ne.jp</domain>
+    <displayName>DCNインターネットサービス</displayName>
+    <displayShortName>DCN</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>po.dcn.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>po.dcn.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/po.wind.jp b/mail/mail-autoconfig/po.wind.jp
new file mode 100644
index 0000000000..96b2d0f81b
--- /dev/null
+++ b/mail/mail-autoconfig/po.wind.jp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="po.wind.ne.jp">
+    <domain>po.wind.ne.jp</domain>
+    <domain>po.wind.jp</domain>
+    <domain>po.wind.co.jp</domain>
+    <domain>po.gunmanet.or.jp</domain>
+    <domain>po.gunmanet.ne.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>po.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>po.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/polka.plala.or.jp b/mail/mail-autoconfig/polka.plala.or.jp
new file mode 100644
index 0000000000..087065eb7f
--- /dev/null
+++ b/mail/mail-autoconfig/polka.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="polka.plala.or.jp">
+    <domain>polka.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>polka.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>polka.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/pop.shibata.ne.jp b/mail/mail-autoconfig/pop.shibata.ne.jp
new file mode 100644
index 0000000000..a78346145b
--- /dev/null
+++ b/mail/mail-autoconfig/pop.shibata.ne.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="pop.shibata.ne.jp">
+    <domain>pop.shibata.ne.jp</domain>
+    <domain>ml.shibata.ne.jp</domain>
+    <displayName>インターネット新発田</displayName>
+    <displayShortName>INET-SHIBATA</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>%EMAILDOMAIN%</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>%EMAILDOMAIN%</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/purple.plala.or.jp b/mail/mail-autoconfig/purple.plala.or.jp
new file mode 100644
index 0000000000..393d2ac841
--- /dev/null
+++ b/mail/mail-autoconfig/purple.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="purple.plala.or.jp">
+    <domain>purple.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>purple.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>purple.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/rainbow.plala.or.jp b/mail/mail-autoconfig/rainbow.plala.or.jp
new file mode 100644
index 0000000000..3718ed4868
--- /dev/null
+++ b/mail/mail-autoconfig/rainbow.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rainbow.plala.or.jp">
+    <domain>rainbow.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rainbow.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rainbow.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/red.plala.or.jp b/mail/mail-autoconfig/red.plala.or.jp
new file mode 100644
index 0000000000..a42e8893ff
--- /dev/null
+++ b/mail/mail-autoconfig/red.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="red.plala.or.jp">
+    <domain>red.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>red.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>red.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/rmail.plala.or.jp b/mail/mail-autoconfig/rmail.plala.or.jp
new file mode 100644
index 0000000000..7ecc703e01
--- /dev/null
+++ b/mail/mail-autoconfig/rmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rmail.plala.or.jp">
+    <domain>rmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/rondo.plala.or.jp b/mail/mail-autoconfig/rondo.plala.or.jp
new file mode 100644
index 0000000000..13616d3e41
--- /dev/null
+++ b/mail/mail-autoconfig/rondo.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rondo.plala.or.jp">
+    <domain>rondo.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rondo.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rondo.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/rose.plala.or.jp b/mail/mail-autoconfig/rose.plala.or.jp
new file mode 100644
index 0000000000..034f32cab4
--- /dev/null
+++ b/mail/mail-autoconfig/rose.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rose.plala.or.jp">
+    <domain>rose.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rose.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rose.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/rouge.plala.or.jp b/mail/mail-autoconfig/rouge.plala.or.jp
new file mode 100644
index 0000000000..cbbb43ce4d
--- /dev/null
+++ b/mail/mail-autoconfig/rouge.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rouge.plala.or.jp">
+    <domain>rouge.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rouge.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rouge.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ruby.plala.or.jp b/mail/mail-autoconfig/ruby.plala.or.jp
new file mode 100644
index 0000000000..427be4b3cf
--- /dev/null
+++ b/mail/mail-autoconfig/ruby.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ruby.plala.or.jp">
+    <domain>ruby.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ruby.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ruby.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/sakunet.ne.jp b/mail/mail-autoconfig/sakunet.ne.jp
new file mode 100644
index 0000000000..695b7c70c2
--- /dev/null
+++ b/mail/mail-autoconfig/sakunet.ne.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sakunet.ne.jp">
+    <domain>sakunet.ne.jp</domain>
+    <displayName>佐久ケーブルテレビ</displayName>
+    <displayShortName>Saku-Net</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.sakunet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.sakunet.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/sea.plala.or.jp b/mail/mail-autoconfig/sea.plala.or.jp
new file mode 100644
index 0000000000..ddde2c1767
--- /dev/null
+++ b/mail/mail-autoconfig/sea.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sea.plala.or.jp">
+    <domain>sea.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>sea.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>sea.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/sepia.plala.or.jp b/mail/mail-autoconfig/sepia.plala.or.jp
new file mode 100644
index 0000000000..1dce9e1cf4
--- /dev/null
+++ b/mail/mail-autoconfig/sepia.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sepia.plala.or.jp">
+    <domain>sepia.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>sepia.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>sepia.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/serenade.plala.or.jp b/mail/mail-autoconfig/serenade.plala.or.jp
new file mode 100644
index 0000000000..83bf35b7ba
--- /dev/null
+++ b/mail/mail-autoconfig/serenade.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="serenade.plala.or.jp">
+    <domain>serenade.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>serenade.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>serenade.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/silk.plala.or.jp b/mail/mail-autoconfig/silk.plala.or.jp
new file mode 100644
index 0000000000..1aa4b81964
--- /dev/null
+++ b/mail/mail-autoconfig/silk.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="silk.plala.or.jp">
+    <domain>silk.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>silk.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>silk.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/silver.plala.or.jp b/mail/mail-autoconfig/silver.plala.or.jp
new file mode 100644
index 0000000000..8ff9fd9ec8
--- /dev/null
+++ b/mail/mail-autoconfig/silver.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="silver.plala.or.jp">
+    <domain>silver.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>silver.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>silver.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/sky.plala.or.jp b/mail/mail-autoconfig/sky.plala.or.jp
new file mode 100644
index 0000000000..9da6383b8c
--- /dev/null
+++ b/mail/mail-autoconfig/sky.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sky.plala.or.jp">
+    <domain>sky.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>sky.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>sky.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/smail.plala.or.jp b/mail/mail-autoconfig/smail.plala.or.jp
new file mode 100644
index 0000000000..1768bfd9bc
--- /dev/null
+++ b/mail/mail-autoconfig/smail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="smail.plala.or.jp">
+    <domain>smail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>smail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/snow.plala.or.jp b/mail/mail-autoconfig/snow.plala.or.jp
new file mode 100644
index 0000000000..44267b99b1
--- /dev/null
+++ b/mail/mail-autoconfig/snow.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="snow.plala.or.jp">
+    <domain>snow.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>snow.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>snow.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/so.wind.ne.jp b/mail/mail-autoconfig/so.wind.ne.jp
new file mode 100644
index 0000000000..50fd47ef1c
--- /dev/null
+++ b/mail/mail-autoconfig/so.wind.ne.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="so.wind.ne.jp">
+    <domain>so.wind.ne.jp</domain>
+    <domain>so.wind.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="imap">
+      <hostname>so.wind.ne.jp</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>so.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/sonata.plala.or.jp b/mail/mail-autoconfig/sonata.plala.or.jp
new file mode 100644
index 0000000000..3834428fbd
--- /dev/null
+++ b/mail/mail-autoconfig/sonata.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sonata.plala.or.jp">
+    <domain>sonata.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>sonata.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>sonata.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/suite.plala.or.jp b/mail/mail-autoconfig/suite.plala.or.jp
new file mode 100644
index 0000000000..c8beac6b9c
--- /dev/null
+++ b/mail/mail-autoconfig/suite.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="suite.plala.or.jp">
+    <domain>suite.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>suite.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>suite.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/symphony.plala.or.jp b/mail/mail-autoconfig/symphony.plala.or.jp
new file mode 100644
index 0000000000..311aa184ac
--- /dev/null
+++ b/mail/mail-autoconfig/symphony.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="symphony.plala.or.jp">
+    <domain>symphony.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>symphony.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>symphony.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/t-online.de b/mail/mail-autoconfig/t-online.de
new file mode 100644
index 0000000000..a80ac4c316
--- /dev/null
+++ b/mail/mail-autoconfig/t-online.de
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="t-online.de">
+      <domain>t-online.de</domain>
+
+      <displayName>T-Online email Paket</displayName>
+      <displayShortName>T-Online</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>popmail.t-online.de</hostname>
+         <port>110</port>
+         <socketType>plain</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>secure</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtpmail.t-online.de</hostname>
+         <port>25</port>
+         <socketType>plain</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <!--<enableURL url="http://service.t-online.de/c/12/72/65/02/12726502.html">You need to enable POP access</enableURL>-->
+      <!--<enableURL url="http://hilfe.telekom.de/hsp/cms/content/HSP/de/3378/theme-45858870/theme-45858718/theme-45858716/theme-45858715/faq-45855229">Richten Sie Ihre Email-Adresse ein</enableURL>-->
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/t-online.de free b/mail/mail-autoconfig/t-online.de free
new file mode 100644
index 0000000000..a80ac4c316
--- /dev/null
+++ b/mail/mail-autoconfig/t-online.de free
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="t-online.de">
+      <domain>t-online.de</domain>
+
+      <displayName>T-Online email Paket</displayName>
+      <displayShortName>T-Online</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>popmail.t-online.de</hostname>
+         <port>110</port>
+         <socketType>plain</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>secure</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtpmail.t-online.de</hostname>
+         <port>25</port>
+         <socketType>plain</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <!--<enableURL url="http://service.t-online.de/c/12/72/65/02/12726502.html">You need to enable POP access</enableURL>-->
+      <!--<enableURL url="http://hilfe.telekom.de/hsp/cms/content/HSP/de/3378/theme-45858870/theme-45858718/theme-45858716/theme-45858715/faq-45855229">Richten Sie Ihre Email-Adresse ein</enableURL>-->
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/t-online.de imap ssl b/mail/mail-autoconfig/t-online.de imap ssl
new file mode 100644
index 0000000000..e2e5fb1a76
--- /dev/null
+++ b/mail/mail-autoconfig/t-online.de imap ssl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="t-online.de">
+      <domain>t-online.de</domain>
+
+      <displayName>T-Online email Paket</displayName>
+      <displayShortName>T-Online</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>secure-imap.t-online.de</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>secure</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>securesmtp.googlemail.com</hostname>
+         <port>25</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>secure</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <enableURL url="http://service.t-online.de/c/12/72/65/02/12726502.html">You need to enable POP access</enableURL>
+      <!--<enableURL url="http://hilfe.telekom.de/hsp/cms/content/HSP/de/3378/theme-45858870/theme-45858718/theme-45858716/theme-45858715/faq-45855229">Richten Sie Ihre Email-Adresse ein</enableURL>-->
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/t-online.de pop ssl b/mail/mail-autoconfig/t-online.de pop ssl
new file mode 100644
index 0000000000..264ad0582c
--- /dev/null
+++ b/mail/mail-autoconfig/t-online.de pop ssl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="t-online.de">
+      <domain>t-online.de</domain>
+
+      <displayName>T-Online email Paket</displayName>
+      <displayShortName>T-Online</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>securepop.t-online.de</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>securesmtp.t-online.de</hostname>
+         <port>25</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+      <!--<enableURL url="http://service.t-online.de/c/12/72/65/02/12726502.html">You need to enable POP access</enableURL>-->
+      <!--<enableURL url="http://hilfe.telekom.de/hsp/cms/content/HSP/de/3378/theme-45858870/theme-45858718/theme-45858716/theme-45858715/faq-45855229">Richten Sie Ihre Email-Adresse ein</enableURL>-->
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/taupe.plala.or.jp b/mail/mail-autoconfig/taupe.plala.or.jp
new file mode 100644
index 0000000000..cec35b2df5
--- /dev/null
+++ b/mail/mail-autoconfig/taupe.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="taupe.plala.or.jp">
+    <domain>taupe.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>taupe.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>taupe.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/tiki.ne.jp b/mail/mail-autoconfig/tiki.ne.jp
new file mode 100644
index 0000000000..9e54488ead
--- /dev/null
+++ b/mail/mail-autoconfig/tiki.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="tiki.ne.jp">
+    <domain>tiki.ne.jp</domain>
+    <displayName>TikiTikiインターネット</displayName>
+    <displayShortName>TikiTiki</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mx.tiki.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp-auth.tiki.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/tmail.plala.or.jp b/mail/mail-autoconfig/tmail.plala.or.jp
new file mode 100644
index 0000000000..d138304dc9
--- /dev/null
+++ b/mail/mail-autoconfig/tmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="tmail.plala.or.jp">
+    <domain>tmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>tmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>tmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/toccata.plala.or.jp b/mail/mail-autoconfig/toccata.plala.or.jp
new file mode 100644
index 0000000000..41281a7d6c
--- /dev/null
+++ b/mail/mail-autoconfig/toccata.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="toccata.plala.or.jp">
+    <domain>toccata.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>toccata.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>toccata.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/topaz.plala.or.jp b/mail/mail-autoconfig/topaz.plala.or.jp
new file mode 100644
index 0000000000..185f1796de
--- /dev/null
+++ b/mail/mail-autoconfig/topaz.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="topaz.plala.or.jp">
+    <domain>topaz.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>topaz.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>topaz.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/trio.plala.or.jp b/mail/mail-autoconfig/trio.plala.or.jp
new file mode 100644
index 0000000000..6d15fc17b4
--- /dev/null
+++ b/mail/mail-autoconfig/trio.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="trio.plala.or.jp">
+    <domain>trio.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>trio.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>trio.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/umail.plala.or.jp b/mail/mail-autoconfig/umail.plala.or.jp
new file mode 100644
index 0000000000..2b4a0694a0
--- /dev/null
+++ b/mail/mail-autoconfig/umail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="umail.plala.or.jp">
+    <domain>umail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>umail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>umail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/verizon.net b/mail/mail-autoconfig/verizon.net
new file mode 100644
index 0000000000..0c41d38243
--- /dev/null
+++ b/mail/mail-autoconfig/verizon.net
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="verizon.net">
+      <domain>verizon.net</domain>
+
+      <displayName>Verizon Online</displayName>
+      <displayShortName>Verizon</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>incoming.verizon.com</hostname>
+         <port>110</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>outgoing.verizon.net</hostname>
+         <port>587</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/violet.plala.or.jp b/mail/mail-autoconfig/violet.plala.or.jp
new file mode 100644
index 0000000000..a1ce58b326
--- /dev/null
+++ b/mail/mail-autoconfig/violet.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="violet.plala.or.jp">
+    <domain>violet.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>violet.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>violet.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/vm.aikis.or.jp b/mail/mail-autoconfig/vm.aikis.or.jp
new file mode 100644
index 0000000000..9c3caa70ec
--- /dev/null
+++ b/mail/mail-autoconfig/vm.aikis.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="vm.aikis.or.jp">
+    <domain>vm.aikis.or.jp</domain>
+    <displayName>aikis</displayName>
+    <displayShortName>aikis</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.aikis.or.jp</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.aikis.or.jp</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/vmail.plala.or.jp b/mail/mail-autoconfig/vmail.plala.or.jp
new file mode 100644
index 0000000000..66358ef6a8
--- /dev/null
+++ b/mail/mail-autoconfig/vmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="vmail.plala.or.jp">
+    <domain>vmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>vmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>vmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/vp.tiki.ne.jp b/mail/mail-autoconfig/vp.tiki.ne.jp
new file mode 100644
index 0000000000..378a9d3b24
--- /dev/null
+++ b/mail/mail-autoconfig/vp.tiki.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="vp.tiki.ne.jp">
+    <domain>vp.tiki.ne.jp</domain>
+    <displayName>TikiTikiインターネット</displayName>
+    <displayShortName>TikiTiki</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>vp.tiki.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>vs.tiki.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/waltz.plala.or.jp b/mail/mail-autoconfig/waltz.plala.or.jp
new file mode 100644
index 0000000000..e7814cd235
--- /dev/null
+++ b/mail/mail-autoconfig/waltz.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="waltz.plala.or.jp">
+    <domain>waltz.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>waltz.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>waltz.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/wanadoo.fr b/mail/mail-autoconfig/wanadoo.fr
new file mode 100644
index 0000000000..c40c39e1ce
--- /dev/null
+++ b/mail/mail-autoconfig/wanadoo.fr
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="francetelecom.fr">
+      <domain>wanadoo.fr</domain>
+      <domain>orange.fr</domain>
+
+      <displayName>France Telecom / Orange</displayName>
+      <displayShortName>Orange</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop.orange.fr</hostname>
+         <port>110</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.orange.fr</hostname>
+         <port>25</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/wanadoo.fr imap b/mail/mail-autoconfig/wanadoo.fr imap
new file mode 100644
index 0000000000..5b138e48ce
--- /dev/null
+++ b/mail/mail-autoconfig/wanadoo.fr imap
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="francetelecom.fr">
+      <domain>wanadoo.fr</domain>
+      <domain>orange.fr</domain>
+
+      <displayName>France Telecom / Orange</displayName>
+      <displayShortName>Orange</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.orange.fr</hostname>
+         <port>143</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.orange.fr</hostname>
+         <port>25</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/wanadoo.fr pop b/mail/mail-autoconfig/wanadoo.fr pop
new file mode 100644
index 0000000000..c40c39e1ce
--- /dev/null
+++ b/mail/mail-autoconfig/wanadoo.fr pop
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="francetelecom.fr">
+      <domain>wanadoo.fr</domain>
+      <domain>orange.fr</domain>
+
+      <displayName>France Telecom / Orange</displayName>
+      <displayShortName>Orange</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop.orange.fr</hostname>
+         <port>110</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.orange.fr</hostname>
+         <port>25</port>
+         <socketType>plain</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/wave.plala.or.jp b/mail/mail-autoconfig/wave.plala.or.jp
new file mode 100644
index 0000000000..611ab2a6b8
--- /dev/null
+++ b/mail/mail-autoconfig/wave.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="wave.plala.or.jp">
+    <domain>wave.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>wave.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>wave.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/web.de b/mail/mail-autoconfig/web.de
new file mode 100644
index 0000000000..d3b357f16d
--- /dev/null
+++ b/mail/mail-autoconfig/web.de
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="web.de">
+      <domain>web.de</domain>
+
+      <displayName>WEB.DE Freemail</displayName>
+      <displayShortName>Web.de</displayShortName>
+
+      <incomingServer type="imap">
+         <hostname>imap.web.de</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.web.de</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/white.plala.or.jp b/mail/mail-autoconfig/white.plala.or.jp
new file mode 100644
index 0000000000..34f9a8af3f
--- /dev/null
+++ b/mail/mail-autoconfig/white.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="white.plala.or.jp">
+    <domain>white.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>white.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>white.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/wine.plala.or.jp b/mail/mail-autoconfig/wine.plala.or.jp
new file mode 100644
index 0000000000..62f66db872
--- /dev/null
+++ b/mail/mail-autoconfig/wine.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="wine.plala.or.jp">
+    <domain>wine.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>wine.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>wine.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/wmail.plala.or.jp b/mail/mail-autoconfig/wmail.plala.or.jp
new file mode 100644
index 0000000000..375c3010eb
--- /dev/null
+++ b/mail/mail-autoconfig/wmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="wmail.plala.or.jp">
+    <domain>wmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>wmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>wmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/xmail.plala.or.jp b/mail/mail-autoconfig/xmail.plala.or.jp
new file mode 100644
index 0000000000..b8d7187ff5
--- /dev/null
+++ b/mail/mail-autoconfig/xmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="xmail.plala.or.jp">
+    <domain>xmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>xmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>xmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/xp.wind.jp b/mail/mail-autoconfig/xp.wind.jp
new file mode 100644
index 0000000000..bed7569308
--- /dev/null
+++ b/mail/mail-autoconfig/xp.wind.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="xp.wind.jp">
+    <domain>xp.wind.jp</domain>
+    <displayName>群馬インターネット</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>xp.wind.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>xp.wind.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/xpost.plala.or.jp b/mail/mail-autoconfig/xpost.plala.or.jp
new file mode 100644
index 0000000000..7d175fd750
--- /dev/null
+++ b/mail/mail-autoconfig/xpost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="xpost.plala.or.jp">
+    <domain>xpost.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>xpost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>xpost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/xs4all.nl b/mail/mail-autoconfig/xs4all.nl
new file mode 100644
index 0000000000..b5c4289322
--- /dev/null
+++ b/mail/mail-autoconfig/xs4all.nl
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="xs4all.nl">
+      <domain>xs4all.nl</domain>
+
+      <displayName>XS4All</displayName>
+      <displayShortName>XS4All</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pops.xs4all.nl</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtps.xs4all.nl</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/yahoo.com b/mail/mail-autoconfig/yahoo.com
new file mode 100644
index 0000000000..92e6d7a70a
--- /dev/null
+++ b/mail/mail-autoconfig/yahoo.com
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig>
+    <emailProvider id="yahoo.com">
+      <domain>yahoo.com</domain>
+      <domain>yahoo.de</domain>
+      <domain>yahoo.it</domain>
+      <domain>yahoo.fr</domain>
+      <domain>yahoo.co.uk</domain>
+      <domain>yahoo.com.br</domain>
+      <domain>ymail.com</domain>
+      <domain>rocketmail.com</domain>
+
+      <displayName>Yahoo! Mail</displayName>
+      <displayShortName>Yahoo</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pop.mail.yahoo.com</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtp.mail.yahoo.com</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILLOCALPART%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+
+    </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ybb.ne.jp b/mail/mail-autoconfig/ybb.ne.jp
new file mode 100644
index 0000000000..935a59ba95
--- /dev/null
+++ b/mail/mail-autoconfig/ybb.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ybb.ne.jp">
+    <domain>ybb.ne.jp</domain>
+    <displayName>Yahoo! BB</displayName>
+    <displayShortName>Yahoo! BB</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ybbpop.mail.yahoo.co.jp</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ybbsmtp.mail.yahoo.co.jp</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/yellow.plala.or.jp b/mail/mail-autoconfig/yellow.plala.or.jp
new file mode 100644
index 0000000000..4b71b37f72
--- /dev/null
+++ b/mail/mail-autoconfig/yellow.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="yellow.plala.or.jp">
+    <domain>yellow.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>yellow.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>yellow.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ymail.plala.or.jp b/mail/mail-autoconfig/ymail.plala.or.jp
new file mode 100644
index 0000000000..0f367d6b4e
--- /dev/null
+++ b/mail/mail-autoconfig/ymail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ymail.plala.or.jp">
+    <domain>ymail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ymail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ymail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/ypost.plala.or.jp b/mail/mail-autoconfig/ypost.plala.or.jp
new file mode 100644
index 0000000000..9149c8d496
--- /dev/null
+++ b/mail/mail-autoconfig/ypost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ypost.plala.or.jp">
+    <domain>ypost.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ypost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ypost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-autoconfig/zmail.plala.or.jp b/mail/mail-autoconfig/zmail.plala.or.jp
new file mode 100644
index 0000000000..02e73a9842
--- /dev/null
+++ b/mail/mail-autoconfig/zmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="zmail.plala.or.jp">
+    <domain>zmail.plala.or.jp</domain>
+    <displayName>ぷらら</displayName>
+    <displayShortName>ぷらら</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>zmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>zmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 5a1ab0d8ad..02bf640a3a 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -5866,4 +5866,288 @@ For example: "Work" or "Personal"</property>
       <widget name="lblForwardStyle"/>
     </widgets>
   </object>
+  <object class="GtkVBox" id="vboxReviewBorder">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkTable" id="personal-details-table">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="n_rows">3</property>
+        <property name="n_columns">2</property>
+        <property name="row_spacing">4</property>
+        <property name="column_spacing">8</property>
+        <child>
+          <object class="GtkLabel" id="personal-details-label">
+            <property name="visible">True</property>
+           <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Personal Details:</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+           </attributes>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="personal-name-label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Name:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="personal-name-entry">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="personal-email-label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Email address:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="personal-email-entry">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkTable" id="server-details-table">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="n_rows">5</property>
+        <property name="n_columns">3</property>
+        <property name="row_spacing">4</property>
+        <property name="column_spacing">8</property>
+        <child>
+          <object class="GtkLabel" id="details-label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Details:</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="details-label-receiving">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Receiving</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="details-label-sending">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Sending</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="details-server-type">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Server type:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="details-server-address">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Server address:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="details-user-name">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Username:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="details-encryption">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Encryption:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="receive_server_type">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">none</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="send_server_type">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">none</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="receive_server_address">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">none</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="send_server_address">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">none</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="receive_username">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="send_username">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="receive_encryption">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="send_encryption">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">label</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">4</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+  </object>
 </interface>
diff --git a/mail/mail-guess-servers.c b/mail/mail-guess-servers.c
new file mode 100644
index 0000000000..8ab9670e8c
--- /dev/null
+++ b/mail/mail-guess-servers.c
@@ -0,0 +1,370 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Srinivasa Ragavan <srini@linux.intel.com>
+ *
+ * Copyright (C) 2009 Intel Corporation (www.intel.com)
+ *
+ */
+
+/* Template of the code is taken from libsoup tests/ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <libsoup/soup.h>
+
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlmemory.h>
+
+#include <libedataserver/e-proxy.h>
+
+#include <shell/e-shell.h>
+#include <e-util/e-util-private.h>
+
+#include "mail-guess-servers.h"
+
+static gchar *
+xml_to_gchar (xmlChar *xml,
+              EmailProvider *provider)
+{
+	gchar *gxml = NULL;
+	gchar *tmp;
+	gchar *repl = NULL;
+	const gchar *sec_part;
+
+	tmp = xml ? strstr((gchar *) xml, "\%EMAIL") : NULL;
+
+	if (!tmp) {
+		gxml = xml ? g_strdup ((gchar *) xml) : NULL;
+	} else {
+	decodepart:
+		*tmp = 0;
+		tmp+=6;
+		if (*tmp == 'A')
+			repl = provider->email;
+		else if (*tmp == 'L')
+			repl = provider->username;
+		else if (*tmp == 'D')
+			repl = provider->domain;
+		sec_part = strstr(tmp, "\%");
+		sec_part++;
+		if (!*sec_part)
+			sec_part = "";
+
+		gxml = g_strdup_printf("%s%s%s", gxml ? gxml : (gchar *)xml, repl, sec_part);
+		tmp = strstr (gxml, "\%EMAIL");
+		if (tmp) {
+			goto decodepart;
+		}
+	}
+
+	xmlFree (xml);
+
+	return gxml;
+}
+
+static SoupMessage *
+get_url (SoupSession *session,
+         const gchar *url)
+{
+	SoupMessage *msg;
+	const gchar *header;
+
+	msg = soup_message_new (SOUP_METHOD_GET, url);
+	soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT);
+
+	soup_session_send_message (session, msg);
+
+	if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) {
+		header = soup_message_headers_get_one (msg->response_headers,
+						       "Location");
+		if (header) {
+			return get_url (session, header);
+		}
+	} else if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
+		return msg;
+	}
+
+	return NULL;
+}
+
+static void
+handle_incoming (xmlNodePtr head,
+                 EmailProvider *provider)
+{
+	xmlNodePtr node = head->children;
+
+	provider->recv_type = xml_to_gchar (
+		xmlGetProp (head, (xmlChar *) "type"), provider);
+
+	while (node != NULL) {
+		if (strcmp ((gchar *)node->name, "hostname") == 0) {
+			provider->recv_hostname = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		} else if (strcmp ((gchar *)node->name, "port") == 0) {
+			provider->recv_port = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		} else if (strcmp ((gchar *)node->name, "socketType") == 0) {
+			provider->recv_socket_type = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		} else if (strcmp ((gchar *)node->name, "username") == 0) {
+			provider->recv_username = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		} else if (strcmp ((gchar *)node->name, "authentication") == 0) {
+			provider->recv_auth = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		}
+
+		node = node->next;
+	}
+}
+
+static void
+handle_outgoing (xmlNodePtr head,
+                 EmailProvider *provider)
+{
+	xmlNodePtr node = head->children;
+
+	provider->send_type = xml_to_gchar (
+		xmlGetProp (head, (xmlChar *) "type"), provider);
+
+	while (node != NULL) {
+		if (strcmp ((gchar *)node->name, "hostname") == 0) {
+			provider->send_hostname = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		} else if (strcmp ((gchar *)node->name, "port") == 0) {
+			provider->send_port = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		} else if (strcmp ((gchar *)node->name, "socketType") == 0) {
+			provider->send_socket_type = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		} else if (strcmp ((gchar *)node->name, "username") == 0) {
+			provider->send_username = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		} else if (strcmp ((gchar *)node->name, "authentication") == 0) {
+			provider->send_auth = xml_to_gchar (
+				xmlNodeGetContent (node), provider);
+		}
+
+		node = node->next;
+	}
+}
+
+static gboolean
+parse_message (const gchar *msg,
+               gint length,
+               EmailProvider *provider)
+{
+	xmlDocPtr doc;
+	xmlNodePtr node;
+
+	doc = xmlReadMemory (msg, length, "file.xml", NULL, 0);
+
+	node = doc->children;
+	while (node) {
+		if (strcmp ((gchar *)node->name, "clientConfig") == 0) {
+			break;
+		}
+		node = node->next;
+	}
+
+	if (!node) {
+		g_warning ("Incorrect data: ClientConfig not found ... Quitting\n");
+		return FALSE;
+	}
+
+	node = node->children;
+	while (node) {
+		if (strcmp ((gchar *)node->name, "emailProvider") == 0) {
+			break;
+		}
+		node = node->next;
+	}
+
+	if (!node) {
+		g_warning ("Incorrect data: ClientConfig not found ... Quitting\n");
+		return FALSE;
+	}
+
+	node = node->children;
+	while (node) {
+		if (strcmp ((gchar *)node->name, "incomingServer") == 0) {
+			/* Handle Incoming */
+			handle_incoming (node, provider);
+		} else if (strcmp ((gchar *)node->name, "outgoingServer") == 0) {
+			/* Handle Outgoing */
+			handle_outgoing (node, provider);
+		}
+
+		node = node->next;
+	}
+
+	xmlFreeDoc (doc);
+
+	return TRUE;
+}
+
+static gboolean
+parse_soup_message (SoupMessage *msg,
+                    EmailProvider *provider)
+{
+	return parse_message (
+		msg->response_body->data,
+		msg->response_body->length, provider);
+}
+
+static gboolean
+is_online (void)
+{
+	EShell *shell;
+
+	/* FIXME Pass this in. */
+	shell = e_shell_get_default ();
+
+	return e_shell_get_online (shell);
+}
+
+static gboolean
+guess_when_online (EmailProvider *provider)
+{
+	const gchar *cafile = NULL;
+	gchar *url;
+	EProxy *proxy;
+	SoupURI *parsed;
+	SoupMessage *msg;
+	SoupSession *session;
+
+	proxy = e_proxy_new ();
+	e_proxy_setup_proxy (proxy);
+
+	url = g_strdup_printf (
+		"%s/%s", "http://api.gnome.org/evolution/autoconfig",
+		provider->domain);
+	parsed = soup_uri_new (url);
+	soup_uri_free (parsed);
+
+	session = soup_session_sync_new_with_options (
+		SOUP_SESSION_SSL_CA_FILE, cafile,
+		SOUP_SESSION_USER_AGENT, "get ",
+		NULL);
+
+	if (e_proxy_require_proxy_for_uri (proxy, url)) {
+		SoupURI *proxy_uri = e_proxy_peek_uri_for (proxy, url);
+/*		fprintf (stderr, "URL '%s' requires a proxy: '%s'\n",
+			 url, soup_uri_to_string (proxy_uri, FALSE)); */
+		g_object_set (session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL);
+	}
+
+	msg = get_url (session, url);
+	if (!msg)
+		return FALSE;
+
+	parse_soup_message (msg, provider);
+
+	g_object_unref (proxy);
+	g_object_unref (msg);
+	g_object_unref (session);
+	g_free (url);
+
+	return TRUE;
+
+}
+
+static gchar *
+get_filename_for_offline_autoconfig (const gchar *domain)
+{
+	return g_build_filename (EVOLUTION_PRIVDATADIR, "mail-autoconfig", domain, NULL);
+}
+
+static gboolean
+guess_when_offline (EmailProvider *provider)
+{
+	gchar *filename;
+	gchar *contents;
+	gsize length;
+	gboolean success;
+
+	if (!provider->domain || provider->domain[0] == 0)
+		return FALSE;
+
+	success = FALSE;
+
+	filename = get_filename_for_offline_autoconfig (provider->domain);
+	if (!g_file_get_contents (filename, &contents, &length, NULL)) /* NULL-GError */
+		goto out;
+
+	success = parse_message (contents, (gint) length, provider);
+
+out:
+	g_free (filename);
+	g_free (contents);
+
+	return success;
+}
+
+gboolean
+mail_guess_servers (EmailProvider *provider)
+{
+	if (is_online () && guess_when_online (provider))
+		return TRUE;
+	else
+		return guess_when_offline (provider);
+}
+
+#ifdef TEST
+gint
+main (gint argc,
+      gchar **argv)
+{
+	EmailProvider *provider;
+
+	g_type_init ();
+
+	provider = g_new0 (EmailProvider, 1);
+
+	provider->email = "sragavan@iijmio-mail.jp";
+	provider->domain = "iijmio-mail.jp";
+	provider->username = "sragavan";
+
+	mail_guess_servers (provider);
+
+	printf (
+		"Recv: %s\n%s(%s), %s by %s \n "
+		"Send: %s\n%s(%s), %s by %s\n via %s to %s\n",
+		provider->recv_type, provider->recv_hostname,
+		provider->recv_port, provider->recv_username,
+		provider->recv_auth,
+		provider->send_type, provider->send_hostname,
+		provider->send_port, provider->send_username,
+		provider->send_auth,
+		provider->recv_socket_type,
+		provider->send_socket_type);
+	return 0;
+}
+#endif
diff --git a/mail/mail-guess-servers.h b/mail/mail-guess-servers.h
new file mode 100644
index 0000000000..84f6090ebe
--- /dev/null
+++ b/mail/mail-guess-servers.h
@@ -0,0 +1,51 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Srinivasa Ragavan <srini@linux.intel.com>
+ *
+ * Copyright (C) 2009 Intel Corporation (www.intel.com)
+ *
+ */
+
+#ifndef _MAIL_GUESS_SERVERS_
+#define _MAIL_GUESS_SERVERS_
+
+typedef struct _EmailProvider {
+	/* Input */
+	gchar *domain;
+	gchar *email;
+	gchar *username;
+
+	/* Receiving server*/
+	gchar *recv_type;
+	gchar *recv_hostname;
+	gchar *recv_port;
+	gchar *recv_socket_type;
+	gchar *recv_username;
+	gchar *recv_auth;
+
+	/* Sending server */
+	gchar *send_type;
+	gchar *send_hostname;
+	gchar *send_port;
+	gchar *send_socket_type;
+	gchar *send_username;
+	gchar *send_auth;
+} EmailProvider;
+
+gboolean mail_guess_servers (EmailProvider *provider);
+
+#endif
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 8bdb329f36..24a494ddac 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1410,7 +1410,26 @@ expunge_pop3_stores (CamelFolder *expunging,
 		    account->source && account->source->url &&
 		    g_str_has_prefix (account->source->url, "pop://")) {
 			CamelFolder *folder;
-			gboolean any_found = FALSE;
+			CamelService *service;
+			CamelSettings *settings;
+			gboolean any_found = FALSE, delete_expunged = FALSE, keep_on_server = FALSE;
+
+			service = camel_session_get_service (CAMEL_SESSION (session), account->uid);
+			if (!CAMEL_IS_STORE (service))
+				continue;
+
+			settings = camel_service_get_settings (service);
+			if (!settings)
+				continue;
+
+			g_object_get (
+				settings,
+				"delete-expunged", &delete_expunged,
+				"keep-on-server", &keep_on_server,
+				NULL);
+
+			if (!keep_on_server || !delete_expunged)
+				continue;
 
 			folder = e_mail_session_get_inbox_sync (
 				session, account->uid, cancellable, error);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 5fe6c09d04..80d6f1ec0c 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -346,64 +346,6 @@ mv_find_folder (GQueue *queue,
 	return link;
 }
 
-static gint
-uri_is_ignore (EMailBackend *backend,
-               const gchar *uri)
-{
-	EMailSession *session;
-	CamelSession *camel_session;
-	EAccountList *accounts;
-	EAccount *account;
-	EIterator *iter;
-	const gchar *local_drafts_uri;
-	const gchar *local_outbox_uri;
-	const gchar *local_sent_uri;
-	gint found = FALSE;
-
-	local_drafts_uri =
-		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS);
-	local_outbox_uri =
-		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_OUTBOX);
-	local_sent_uri =
-		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_SENT);
-
-	session = e_mail_backend_get_session (backend);
-	camel_session = CAMEL_SESSION (session);
-
-	if (e_mail_folder_uri_equal (camel_session, local_outbox_uri, uri))
-		return TRUE;
-
-	if (e_mail_folder_uri_equal (camel_session, local_sent_uri, uri))
-		return TRUE;
-
-	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));
-
-	while (!found && e_iterator_is_valid (iter)) {
-		/* XXX EIterator misuses const. */
-		account = (EAccount *) e_iterator_get (iter);
-
-		if (!found && account->sent_folder_uri != NULL)
-			found = e_mail_folder_uri_equal (
-				camel_session, uri,
-				account->sent_folder_uri);
-
-		if (!found && account->drafts_folder_uri != NULL)
-			found = e_mail_folder_uri_equal (
-				camel_session, uri,
-				account->drafts_folder_uri);
-
-		e_iterator_next (iter);
-	}
-
-	g_object_unref (iter);
-
-	return found;
-}
-
 /* so special we never use it */
 static gint
 folder_is_spethal (CamelStore *store,
@@ -455,7 +397,7 @@ mail_vfolder_add_folder (EMailBackend *backend,
 	GList *folders = NULL, *link;
 	GQueue *queue;
 	gint remote;
-	gint is_ignore;
+	gint is_ignore = FALSE;
 	gchar *uri;
 
 	session = e_mail_backend_get_session (backend);
@@ -471,8 +413,6 @@ mail_vfolder_add_folder (EMailBackend *backend,
 
 	uri = e_mail_folder_uri_build (store, folder_name);
 
-	is_ignore = uri_is_ignore (backend, uri);
-
 	G_LOCK (vfolder);
 
 	/* maintain the source folders lists for changed rules later on */
author	Rodrigo Moya <rodrigo@gnome-db.org>	2011-11-14 20:08:57 +0800
committer	Rodrigo Moya <rodrigo@gnome-db.org>	2011-11-14 20:08:57 +0800
commit	7ab5ae3fc72516cceeb09a48bc5a39f7b57933de (patch)
tree	f1d1afbfa9d8c97dc691a2d241c9ec368fdf67d3 /mail
parent	cda52538315c481bc3b11ff2db40f7165113d1ab (diff)
parent	c4308051159a37f16521b881f59259861998f4ae (diff)
download	gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.gz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.bz2 gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.lz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.xz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.zst gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.zip