Bug #636214 get configuration details from server part2

Deleting files from capplet/settings
author: Punit Jain <jpunit@novell.com> 2011-11-09 23:43:43 +0800
committer: Punit Jain <jpunit@novell.com> 2011-11-09 23:43:43 +0800
commit: e13266896bbd6f1ae809479d09029b076c368135 (patch)
tree: e8379635deb861219f3f94fca9a70cfbd6f4cbc6 /capplet
parent: 77b3cb632a78eed7755b343dbbcf05ed7a3a0bc2 (diff)
download: gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar
gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.gz
gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.bz2
gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.lz
gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.xz
gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.zst
gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.zip
192 files changed, 0 insertions, 7089 deletions
diff --git a/capplet/settings/mail-autoconfig/Makefile.am b/capplet/settings/mail-autoconfig/Makefile.am
deleted file mode 100644
index 451101d364..0000000000
--- a/capplet/settings/mail-autoconfig/Makefile.am
+++ /dev/null
@@ -1,186 +0,0 @@
-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/capplet/settings/mail-autoconfig/README b/capplet/settings/mail-autoconfig/README
deleted file mode 100644
index ec68d405b4..0000000000
--- a/capplet/settings/mail-autoconfig/README
+++ /dev/null
@@ -1,22 +0,0 @@
-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/capplet/settings/mail-autoconfig/a.memail.jp b/capplet/settings/mail-autoconfig/a.memail.jp
deleted file mode 100644
index 61eb90d86d..0000000000
--- a/capplet/settings/mail-autoconfig/a.memail.jp
+++ /dev/null
@@ -1,1423 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/abc.plala.or.jp b/capplet/settings/mail-autoconfig/abc.plala.or.jp
deleted file mode 100644
index 549bed6cb3..0000000000
--- a/capplet/settings/mail-autoconfig/abc.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/agate.plala.or.jp b/capplet/settings/mail-autoconfig/agate.plala.or.jp
deleted file mode 100644
index 6195f58519..0000000000
--- a/capplet/settings/mail-autoconfig/agate.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/amail.plala.or.jp b/capplet/settings/mail-autoconfig/amail.plala.or.jp
deleted file mode 100644
index b4bd8af5fc..0000000000
--- a/capplet/settings/mail-autoconfig/amail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/amber.plala.or.jp b/capplet/settings/mail-autoconfig/amber.plala.or.jp
deleted file mode 100644
index ae682933ee..0000000000
--- a/capplet/settings/mail-autoconfig/amber.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/amethyst.broba.cc b/capplet/settings/mail-autoconfig/amethyst.broba.cc
deleted file mode 100644
index 86276cc517..0000000000
--- a/capplet/settings/mail-autoconfig/amethyst.broba.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/aol.com b/capplet/settings/mail-autoconfig/aol.com
deleted file mode 100644
index 7e16ab5335..0000000000
--- a/capplet/settings/mail-autoconfig/aol.com
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/apost.plala.or.jp b/capplet/settings/mail-autoconfig/apost.plala.or.jp
deleted file mode 100644
index c4f936a7c1..0000000000
--- a/capplet/settings/mail-autoconfig/apost.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/aqua.plala.or.jp b/capplet/settings/mail-autoconfig/aqua.plala.or.jp
deleted file mode 100644
index 0c78abc615..0000000000
--- a/capplet/settings/mail-autoconfig/aqua.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/arcor.de b/capplet/settings/mail-autoconfig/arcor.de
deleted file mode 100644
index 953f669fd8..0000000000
--- a/capplet/settings/mail-autoconfig/arcor.de
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ballade.plala.or.jp b/capplet/settings/mail-autoconfig/ballade.plala.or.jp
deleted file mode 100644
index 913390f9ee..0000000000
--- a/capplet/settings/mail-autoconfig/ballade.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp b/capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp
deleted file mode 100644
index 930cf3ab09..0000000000
--- a/capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/bb-niigata.jp b/capplet/settings/mail-autoconfig/bb-niigata.jp
deleted file mode 100644
index 174f5cbc74..0000000000
--- a/capplet/settings/mail-autoconfig/bb-niigata.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/bc.iij4u.or.jp b/capplet/settings/mail-autoconfig/bc.iij4u.or.jp
deleted file mode 100644
index baa1d0e7a0..0000000000
--- a/capplet/settings/mail-autoconfig/bc.iij4u.or.jp
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/beige.plala.or.jp b/capplet/settings/mail-autoconfig/beige.plala.or.jp
deleted file mode 100644
index 1da18eb675..0000000000
--- a/capplet/settings/mail-autoconfig/beige.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/blue.plala.or.jp b/capplet/settings/mail-autoconfig/blue.plala.or.jp
deleted file mode 100644
index 510042ee9e..0000000000
--- a/capplet/settings/mail-autoconfig/blue.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/bmail.plala.or.jp b/capplet/settings/mail-autoconfig/bmail.plala.or.jp
deleted file mode 100644
index f849e6e4b6..0000000000
--- a/capplet/settings/mail-autoconfig/bmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/bolero.plala.or.jp b/capplet/settings/mail-autoconfig/bolero.plala.or.jp
deleted file mode 100644
index 171776a28b..0000000000
--- a/capplet/settings/mail-autoconfig/bolero.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/bpost.plala.or.jp b/capplet/settings/mail-autoconfig/bpost.plala.or.jp
deleted file mode 100644
index 24c8ebd843..0000000000
--- a/capplet/settings/mail-autoconfig/bpost.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/brown.plala.or.jp b/capplet/settings/mail-autoconfig/brown.plala.or.jp
deleted file mode 100644
index 3bd4be2168..0000000000
--- a/capplet/settings/mail-autoconfig/brown.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/camel.plala.or.jp b/capplet/settings/mail-autoconfig/camel.plala.or.jp
deleted file mode 100644
index c55faa8270..0000000000
--- a/capplet/settings/mail-autoconfig/camel.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/cameo.plala.or.jp b/capplet/settings/mail-autoconfig/cameo.plala.or.jp
deleted file mode 100644
index 7376c1fffe..0000000000
--- a/capplet/settings/mail-autoconfig/cameo.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/cc9.ne.jp b/capplet/settings/mail-autoconfig/cc9.ne.jp
deleted file mode 100644
index 28bad2cd01..0000000000
--- a/capplet/settings/mail-autoconfig/cc9.ne.jp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/cek.ne.jp b/capplet/settings/mail-autoconfig/cek.ne.jp
deleted file mode 100644
index 0af49bd435..0000000000
--- a/capplet/settings/mail-autoconfig/cek.ne.jp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/clio.ne.jp b/capplet/settings/mail-autoconfig/clio.ne.jp
deleted file mode 100644
index 90f1a41ba3..0000000000
--- a/capplet/settings/mail-autoconfig/clio.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/cmail.plala.or.jp b/capplet/settings/mail-autoconfig/cmail.plala.or.jp
deleted file mode 100644
index eb2558272b..0000000000
--- a/capplet/settings/mail-autoconfig/cmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/co1.wind.jp b/capplet/settings/mail-autoconfig/co1.wind.jp
deleted file mode 100644
index e086cd7785..0000000000
--- a/capplet/settings/mail-autoconfig/co1.wind.jp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/co2.wind.jp b/capplet/settings/mail-autoconfig/co2.wind.jp
deleted file mode 100644
index 010477274d..0000000000
--- a/capplet/settings/mail-autoconfig/co2.wind.jp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/co3.wind.jp b/capplet/settings/mail-autoconfig/co3.wind.jp
deleted file mode 100644
index 498384cb09..0000000000
--- a/capplet/settings/mail-autoconfig/co3.wind.jp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/cocoa.plala.or.jp b/capplet/settings/mail-autoconfig/cocoa.plala.or.jp
deleted file mode 100644
index 5387cd368d..0000000000
--- a/capplet/settings/mail-autoconfig/cocoa.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/coda.plala.or.jp b/capplet/settings/mail-autoconfig/coda.plala.or.jp
deleted file mode 100644
index f668775d84..0000000000
--- a/capplet/settings/mail-autoconfig/coda.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/comcast.net b/capplet/settings/mail-autoconfig/comcast.net
deleted file mode 100644
index 56b1fa92bf..0000000000
--- a/capplet/settings/mail-autoconfig/comcast.net
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/concerto.plala.or.jp b/capplet/settings/mail-autoconfig/concerto.plala.or.jp
deleted file mode 100644
index 1c190b5d70..0000000000
--- a/capplet/settings/mail-autoconfig/concerto.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/coral.plala.or.jp b/capplet/settings/mail-autoconfig/coral.plala.or.jp
deleted file mode 100644
index 1c52fcee37..0000000000
--- a/capplet/settings/mail-autoconfig/coral.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/courante.plala.or.jp b/capplet/settings/mail-autoconfig/courante.plala.or.jp
deleted file mode 100644
index 05976ef0b3..0000000000
--- a/capplet/settings/mail-autoconfig/courante.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/cpost.plala.or.jp b/capplet/settings/mail-autoconfig/cpost.plala.or.jp
deleted file mode 100644
index 613d3774b9..0000000000
--- a/capplet/settings/mail-autoconfig/cpost.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/cream.plala.or.jp b/capplet/settings/mail-autoconfig/cream.plala.or.jp
deleted file mode 100644
index 16e232591b..0000000000
--- a/capplet/settings/mail-autoconfig/cream.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp b/capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp
deleted file mode 100644
index b027d98d04..0000000000
--- a/capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/dance.plala.or.jp b/capplet/settings/mail-autoconfig/dance.plala.or.jp
deleted file mode 100644
index 74f90c8fbc..0000000000
--- a/capplet/settings/mail-autoconfig/dance.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/dmail.plala.or.jp b/capplet/settings/mail-autoconfig/dmail.plala.or.jp
deleted file mode 100644
index f742605b4f..0000000000
--- a/capplet/settings/mail-autoconfig/dmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/e23.jp b/capplet/settings/mail-autoconfig/e23.jp
deleted file mode 100644
index f1f08b908a..0000000000
--- a/capplet/settings/mail-autoconfig/e23.jp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/earthlink.net b/capplet/settings/mail-autoconfig/earthlink.net
deleted file mode 100644
index 0f204b2bbd..0000000000
--- a/capplet/settings/mail-autoconfig/earthlink.net
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ebony.plala.or.jp b/capplet/settings/mail-autoconfig/ebony.plala.or.jp
deleted file mode 100644
index 11a275e990..0000000000
--- a/capplet/settings/mail-autoconfig/ebony.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/email.plala.or.jp b/capplet/settings/mail-autoconfig/email.plala.or.jp
deleted file mode 100644
index 45a8e0d500..0000000000
--- a/capplet/settings/mail-autoconfig/email.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/fantasy.plala.or.jp b/capplet/settings/mail-autoconfig/fantasy.plala.or.jp
deleted file mode 100644
index 5774cc239a..0000000000
--- a/capplet/settings/mail-autoconfig/fantasy.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/flamenco.plala.or.jp b/capplet/settings/mail-autoconfig/flamenco.plala.or.jp
deleted file mode 100644
index 3a8ade7488..0000000000
--- a/capplet/settings/mail-autoconfig/flamenco.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/fmail.plala.or.jp b/capplet/settings/mail-autoconfig/fmail.plala.or.jp
deleted file mode 100644
index c4a4dbc14b..0000000000
--- a/capplet/settings/mail-autoconfig/fmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/free.fr b/capplet/settings/mail-autoconfig/free.fr
deleted file mode 100644
index f97fe38504..0000000000
--- a/capplet/settings/mail-autoconfig/free.fr
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/freenet.de b/capplet/settings/mail-autoconfig/freenet.de
deleted file mode 100644
index 1144a80c6d..0000000000
--- a/capplet/settings/mail-autoconfig/freenet.de
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/fuga.plala.or.jp b/capplet/settings/mail-autoconfig/fuga.plala.or.jp
deleted file mode 100644
index f41116addd..0000000000
--- a/capplet/settings/mail-autoconfig/fuga.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/gmail.com b/capplet/settings/mail-autoconfig/gmail.com
deleted file mode 100644
index f73f7e0c7f..0000000000
--- a/capplet/settings/mail-autoconfig/gmail.com
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/gmail.com imap b/capplet/settings/mail-autoconfig/gmail.com imap
deleted file mode 100644
index f73f7e0c7f..0000000000
--- a/capplet/settings/mail-autoconfig/gmail.com imap
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/gmail.com pop b/capplet/settings/mail-autoconfig/gmail.com pop
deleted file mode 100644
index 4b1a577561..0000000000
--- a/capplet/settings/mail-autoconfig/gmail.com pop
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/gmail.plala.or.jp b/capplet/settings/mail-autoconfig/gmail.plala.or.jp
deleted file mode 100644
index d369859a43..0000000000
--- a/capplet/settings/mail-autoconfig/gmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/gmx.com b/capplet/settings/mail-autoconfig/gmx.com
deleted file mode 100644
index 06782b48cc..0000000000
--- a/capplet/settings/mail-autoconfig/gmx.com
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/gmx.net b/capplet/settings/mail-autoconfig/gmx.net
deleted file mode 100644
index 3a93fb9839..0000000000
--- a/capplet/settings/mail-autoconfig/gmx.net
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/go.tvm.ne.jp b/capplet/settings/mail-autoconfig/go.tvm.ne.jp
deleted file mode 100644
index ccbb238eae..0000000000
--- a/capplet/settings/mail-autoconfig/go.tvm.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/goo.jp b/capplet/settings/mail-autoconfig/goo.jp
deleted file mode 100644
index 6ddc1eadd4..0000000000
--- a/capplet/settings/mail-autoconfig/goo.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/googlemail.com b/capplet/settings/mail-autoconfig/googlemail.com
deleted file mode 100644
index f73f7e0c7f..0000000000
--- a/capplet/settings/mail-autoconfig/googlemail.com
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/grape.plala.or.jp b/capplet/settings/mail-autoconfig/grape.plala.or.jp
deleted file mode 100644
index 09fb378504..0000000000
--- a/capplet/settings/mail-autoconfig/grape.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/gray.plala.or.jp b/capplet/settings/mail-autoconfig/gray.plala.or.jp
deleted file mode 100644
index efeb3547f0..0000000000
--- a/capplet/settings/mail-autoconfig/gray.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/hal.ne.jp b/capplet/settings/mail-autoconfig/hal.ne.jp
deleted file mode 100644
index ad8e336c03..0000000000
--- a/capplet/settings/mail-autoconfig/hal.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/hana.or.jp b/capplet/settings/mail-autoconfig/hana.or.jp
deleted file mode 100644
index b2dc624348..0000000000
--- a/capplet/settings/mail-autoconfig/hana.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/hotmail.co.jp b/capplet/settings/mail-autoconfig/hotmail.co.jp
deleted file mode 100644
index 327130587f..0000000000
--- a/capplet/settings/mail-autoconfig/hotmail.co.jp
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/hotmail.co.uk b/capplet/settings/mail-autoconfig/hotmail.co.uk
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/hotmail.co.uk
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/hotmail.com b/capplet/settings/mail-autoconfig/hotmail.com
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/hotmail.com
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/hotmail.de b/capplet/settings/mail-autoconfig/hotmail.de
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/hotmail.de
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/hotmail.fr b/capplet/settings/mail-autoconfig/hotmail.fr
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/hotmail.fr
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/hotmail.it b/capplet/settings/mail-autoconfig/hotmail.it
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/hotmail.it
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ic-net.or.jp b/capplet/settings/mail-autoconfig/ic-net.or.jp
deleted file mode 100644
index 8a89a3ec01..0000000000
--- a/capplet/settings/mail-autoconfig/ic-net.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/iiyama-catv.ne.jp b/capplet/settings/mail-autoconfig/iiyama-catv.ne.jp
deleted file mode 100644
index 85f1a2725d..0000000000
--- a/capplet/settings/mail-autoconfig/iiyama-catv.ne.jp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/imail.plala.or.jp b/capplet/settings/mail-autoconfig/imail.plala.or.jp
deleted file mode 100644
index d4c8897d22..0000000000
--- a/capplet/settings/mail-autoconfig/imail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/inbox.lt b/capplet/settings/mail-autoconfig/inbox.lt
deleted file mode 100644
index c5f07659d0..0000000000
--- a/capplet/settings/mail-autoconfig/inbox.lt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/inbox.lv b/capplet/settings/mail-autoconfig/inbox.lv
deleted file mode 100644
index ac3b317315..0000000000
--- a/capplet/settings/mail-autoconfig/inbox.lv
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/indigo.plala.or.jp b/capplet/settings/mail-autoconfig/indigo.plala.or.jp
deleted file mode 100644
index 2d21e2d69e..0000000000
--- a/capplet/settings/mail-autoconfig/indigo.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/inet-shibata.or.jp b/capplet/settings/mail-autoconfig/inet-shibata.or.jp
deleted file mode 100644
index 8e09a319c0..0000000000
--- a/capplet/settings/mail-autoconfig/inet-shibata.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ivory.plala.or.jp b/capplet/settings/mail-autoconfig/ivory.plala.or.jp
deleted file mode 100644
index a3a0b40c79..0000000000
--- a/capplet/settings/mail-autoconfig/ivory.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/iwafune.ne.jp b/capplet/settings/mail-autoconfig/iwafune.ne.jp
deleted file mode 100644
index d45552f08b..0000000000
--- a/capplet/settings/mail-autoconfig/iwafune.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/jade.plala.or.jp b/capplet/settings/mail-autoconfig/jade.plala.or.jp
deleted file mode 100644
index 998ff0ce43..0000000000
--- a/capplet/settings/mail-autoconfig/jade.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/janis.or.jp b/capplet/settings/mail-autoconfig/janis.or.jp
deleted file mode 100644
index 2092e32aaf..0000000000
--- a/capplet/settings/mail-autoconfig/janis.or.jp
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/jet.ne.jp b/capplet/settings/mail-autoconfig/jet.ne.jp
deleted file mode 100644
index dc2c794159..0000000000
--- a/capplet/settings/mail-autoconfig/jet.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/jet.ne.jp imap b/capplet/settings/mail-autoconfig/jet.ne.jp imap
deleted file mode 100644
index 2a8bdebbda..0000000000
--- a/capplet/settings/mail-autoconfig/jet.ne.jp imap
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/jet.ne.jp pop b/capplet/settings/mail-autoconfig/jet.ne.jp pop
deleted file mode 100644
index dc2c794159..0000000000
--- a/capplet/settings/mail-autoconfig/jet.ne.jp pop
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ji.jet.ne.jp b/capplet/settings/mail-autoconfig/ji.jet.ne.jp
deleted file mode 100644
index 7c2dfa5b6a..0000000000
--- a/capplet/settings/mail-autoconfig/ji.jet.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/jmail.plala.or.jp b/capplet/settings/mail-autoconfig/jmail.plala.or.jp
deleted file mode 100644
index a8c80b2026..0000000000
--- a/capplet/settings/mail-autoconfig/jmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/k1.wind.jp b/capplet/settings/mail-autoconfig/k1.wind.jp
deleted file mode 100644
index 80bd91ee82..0000000000
--- a/capplet/settings/mail-autoconfig/k1.wind.jp
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/khaki.plala.or.jp b/capplet/settings/mail-autoconfig/khaki.plala.or.jp
deleted file mode 100644
index 09b562ce68..0000000000
--- a/capplet/settings/mail-autoconfig/khaki.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/kmail.plala.or.jp b/capplet/settings/mail-autoconfig/kmail.plala.or.jp
deleted file mode 100644
index 7e88d5f88d..0000000000
--- a/capplet/settings/mail-autoconfig/kmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/kokuyou.ne.jp b/capplet/settings/mail-autoconfig/kokuyou.ne.jp
deleted file mode 100644
index 1a3e2a6830..0000000000
--- a/capplet/settings/mail-autoconfig/kokuyou.ne.jp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/lapis.plala.or.jp b/capplet/settings/mail-autoconfig/lapis.plala.or.jp
deleted file mode 100644
index eb54651cb0..0000000000
--- a/capplet/settings/mail-autoconfig/lapis.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/laposte.net b/capplet/settings/mail-autoconfig/laposte.net
deleted file mode 100644
index e0b1bd45aa..0000000000
--- a/capplet/settings/mail-autoconfig/laposte.net
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/lemon.plala.or.jp b/capplet/settings/mail-autoconfig/lemon.plala.or.jp
deleted file mode 100644
index 26846d8f5c..0000000000
--- a/capplet/settings/mail-autoconfig/lemon.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/lilac.plala.or.jp b/capplet/settings/mail-autoconfig/lilac.plala.or.jp
deleted file mode 100644
index 1283c0246e..0000000000
--- a/capplet/settings/mail-autoconfig/lilac.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/lime.plala.or.jp b/capplet/settings/mail-autoconfig/lime.plala.or.jp
deleted file mode 100644
index 94e092548b..0000000000
--- a/capplet/settings/mail-autoconfig/lime.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/live.co.jp b/capplet/settings/mail-autoconfig/live.co.jp
deleted file mode 100644
index 327130587f..0000000000
--- a/capplet/settings/mail-autoconfig/live.co.jp
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/live.co.uk b/capplet/settings/mail-autoconfig/live.co.uk
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/live.co.uk
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/live.com b/capplet/settings/mail-autoconfig/live.com
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/live.com
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/live.de b/capplet/settings/mail-autoconfig/live.de
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/live.de
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/live.fr b/capplet/settings/mail-autoconfig/live.fr
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/live.fr
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/live.it b/capplet/settings/mail-autoconfig/live.it
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/live.it
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ma100.tiki.ne.jp b/capplet/settings/mail-autoconfig/ma100.tiki.ne.jp
deleted file mode 100644
index d87f89eda9..0000000000
--- a/capplet/settings/mail-autoconfig/ma100.tiki.ne.jp
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/mac.com b/capplet/settings/mail-autoconfig/mac.com
deleted file mode 100644
index 094425578b..0000000000
--- a/capplet/settings/mail-autoconfig/mac.com
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/mahoroba.ne.jp b/capplet/settings/mail-autoconfig/mahoroba.ne.jp
deleted file mode 100644
index 43679c1446..0000000000
--- a/capplet/settings/mail-autoconfig/mahoroba.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/mail.gunmanet.jp b/capplet/settings/mail-autoconfig/mail.gunmanet.jp
deleted file mode 100644
index 90bdf8ecf8..0000000000
--- a/capplet/settings/mail-autoconfig/mail.gunmanet.jp
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/mail.iwafune.ne.jp b/capplet/settings/mail-autoconfig/mail.iwafune.ne.jp
deleted file mode 100644
index c6340450b9..0000000000
--- a/capplet/settings/mail-autoconfig/mail.iwafune.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/maroon.plala.or.jp b/capplet/settings/mail-autoconfig/maroon.plala.or.jp
deleted file mode 100644
index d2e00e2d0d..0000000000
--- a/capplet/settings/mail-autoconfig/maroon.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/me.com b/capplet/settings/mail-autoconfig/me.com
deleted file mode 100644
index 094425578b..0000000000
--- a/capplet/settings/mail-autoconfig/me.com
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/minuet.plala.or.jp b/capplet/settings/mail-autoconfig/minuet.plala.or.jp
deleted file mode 100644
index af72bf2644..0000000000
--- a/capplet/settings/mail-autoconfig/minuet.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ml.murakami.ne.jp b/capplet/settings/mail-autoconfig/ml.murakami.ne.jp
deleted file mode 100644
index 54d20ae5f9..0000000000
--- a/capplet/settings/mail-autoconfig/ml.murakami.ne.jp
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ml.shibata.ne.jp b/capplet/settings/mail-autoconfig/ml.shibata.ne.jp
deleted file mode 100644
index a78346145b..0000000000
--- a/capplet/settings/mail-autoconfig/ml.shibata.ne.jp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/mnet.ne.jp b/capplet/settings/mail-autoconfig/mnet.ne.jp
deleted file mode 100644
index 24a19b4795..0000000000
--- a/capplet/settings/mail-autoconfig/mnet.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/mopera.net b/capplet/settings/mail-autoconfig/mopera.net
deleted file mode 100644
index 9f416f21d9..0000000000
--- a/capplet/settings/mail-autoconfig/mopera.net
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/msn.com b/capplet/settings/mail-autoconfig/msn.com
deleted file mode 100644
index e11acdc3bb..0000000000
--- a/capplet/settings/mail-autoconfig/msn.com
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/navy.plala.or.jp b/capplet/settings/mail-autoconfig/navy.plala.or.jp
deleted file mode 100644
index 3935216659..0000000000
--- a/capplet/settings/mail-autoconfig/navy.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/nifty.com b/capplet/settings/mail-autoconfig/nifty.com
deleted file mode 100644
index 5b38d6240e..0000000000
--- a/capplet/settings/mail-autoconfig/nifty.com
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/nsat.jp b/capplet/settings/mail-autoconfig/nsat.jp
deleted file mode 100644
index 32583b86d2..0000000000
--- a/capplet/settings/mail-autoconfig/nsat.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/olive.plala.or.jp b/capplet/settings/mail-autoconfig/olive.plala.or.jp
deleted file mode 100644
index f85b0232ea..0000000000
--- a/capplet/settings/mail-autoconfig/olive.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/online.de b/capplet/settings/mail-autoconfig/online.de
deleted file mode 100644
index 12c4b1e722..0000000000
--- a/capplet/settings/mail-autoconfig/online.de
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/opal.plala.or.jp b/capplet/settings/mail-autoconfig/opal.plala.or.jp
deleted file mode 100644
index 168f59fd01..0000000000
--- a/capplet/settings/mail-autoconfig/opal.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/orange.fr b/capplet/settings/mail-autoconfig/orange.fr
deleted file mode 100644
index c40c39e1ce..0000000000
--- a/capplet/settings/mail-autoconfig/orange.fr
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/orange.plala.or.jp b/capplet/settings/mail-autoconfig/orange.plala.or.jp
deleted file mode 100644
index 7baa803144..0000000000
--- a/capplet/settings/mail-autoconfig/orange.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/orchid.plala.or.jp b/capplet/settings/mail-autoconfig/orchid.plala.or.jp
deleted file mode 100644
index b5c8bc2130..0000000000
--- a/capplet/settings/mail-autoconfig/orchid.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/pal.kijimadaira.jp b/capplet/settings/mail-autoconfig/pal.kijimadaira.jp
deleted file mode 100644
index 1b91b71189..0000000000
--- a/capplet/settings/mail-autoconfig/pal.kijimadaira.jp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/palette.plala.or.jp b/capplet/settings/mail-autoconfig/palette.plala.or.jp
deleted file mode 100644
index 1a64ad6643..0000000000
--- a/capplet/settings/mail-autoconfig/palette.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/parabox.or.jp b/capplet/settings/mail-autoconfig/parabox.or.jp
deleted file mode 100644
index 0c99974741..0000000000
--- a/capplet/settings/mail-autoconfig/parabox.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/peach.plala.or.jp b/capplet/settings/mail-autoconfig/peach.plala.or.jp
deleted file mode 100644
index 34c7a3df41..0000000000
--- a/capplet/settings/mail-autoconfig/peach.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/peoplepc.com b/capplet/settings/mail-autoconfig/peoplepc.com
deleted file mode 100644
index b9ec01d797..0000000000
--- a/capplet/settings/mail-autoconfig/peoplepc.com
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/plum.plala.or.jp b/capplet/settings/mail-autoconfig/plum.plala.or.jp
deleted file mode 100644
index 5696afd5ba..0000000000
--- a/capplet/settings/mail-autoconfig/plum.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/po.dcn.ne.jp b/capplet/settings/mail-autoconfig/po.dcn.ne.jp
deleted file mode 100644
index e91d2affc7..0000000000
--- a/capplet/settings/mail-autoconfig/po.dcn.ne.jp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/po.wind.jp b/capplet/settings/mail-autoconfig/po.wind.jp
deleted file mode 100644
index 96b2d0f81b..0000000000
--- a/capplet/settings/mail-autoconfig/po.wind.jp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/polka.plala.or.jp b/capplet/settings/mail-autoconfig/polka.plala.or.jp
deleted file mode 100644
index 087065eb7f..0000000000
--- a/capplet/settings/mail-autoconfig/polka.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/pop.shibata.ne.jp b/capplet/settings/mail-autoconfig/pop.shibata.ne.jp
deleted file mode 100644
index a78346145b..0000000000
--- a/capplet/settings/mail-autoconfig/pop.shibata.ne.jp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/purple.plala.or.jp b/capplet/settings/mail-autoconfig/purple.plala.or.jp
deleted file mode 100644
index 393d2ac841..0000000000
--- a/capplet/settings/mail-autoconfig/purple.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/rainbow.plala.or.jp b/capplet/settings/mail-autoconfig/rainbow.plala.or.jp
deleted file mode 100644
index 3718ed4868..0000000000
--- a/capplet/settings/mail-autoconfig/rainbow.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/red.plala.or.jp b/capplet/settings/mail-autoconfig/red.plala.or.jp
deleted file mode 100644
index a42e8893ff..0000000000
--- a/capplet/settings/mail-autoconfig/red.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/rmail.plala.or.jp b/capplet/settings/mail-autoconfig/rmail.plala.or.jp
deleted file mode 100644
index 7ecc703e01..0000000000
--- a/capplet/settings/mail-autoconfig/rmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/rondo.plala.or.jp b/capplet/settings/mail-autoconfig/rondo.plala.or.jp
deleted file mode 100644
index 13616d3e41..0000000000
--- a/capplet/settings/mail-autoconfig/rondo.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/rose.plala.or.jp b/capplet/settings/mail-autoconfig/rose.plala.or.jp
deleted file mode 100644
index 034f32cab4..0000000000
--- a/capplet/settings/mail-autoconfig/rose.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/rouge.plala.or.jp b/capplet/settings/mail-autoconfig/rouge.plala.or.jp
deleted file mode 100644
index cbbb43ce4d..0000000000
--- a/capplet/settings/mail-autoconfig/rouge.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ruby.plala.or.jp b/capplet/settings/mail-autoconfig/ruby.plala.or.jp
deleted file mode 100644
index 427be4b3cf..0000000000
--- a/capplet/settings/mail-autoconfig/ruby.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/sakunet.ne.jp b/capplet/settings/mail-autoconfig/sakunet.ne.jp
deleted file mode 100644
index 695b7c70c2..0000000000
--- a/capplet/settings/mail-autoconfig/sakunet.ne.jp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/sea.plala.or.jp b/capplet/settings/mail-autoconfig/sea.plala.or.jp
deleted file mode 100644
index ddde2c1767..0000000000
--- a/capplet/settings/mail-autoconfig/sea.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/sepia.plala.or.jp b/capplet/settings/mail-autoconfig/sepia.plala.or.jp
deleted file mode 100644
index 1dce9e1cf4..0000000000
--- a/capplet/settings/mail-autoconfig/sepia.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/serenade.plala.or.jp b/capplet/settings/mail-autoconfig/serenade.plala.or.jp
deleted file mode 100644
index 83bf35b7ba..0000000000
--- a/capplet/settings/mail-autoconfig/serenade.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/silk.plala.or.jp b/capplet/settings/mail-autoconfig/silk.plala.or.jp
deleted file mode 100644
index 1aa4b81964..0000000000
--- a/capplet/settings/mail-autoconfig/silk.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/silver.plala.or.jp b/capplet/settings/mail-autoconfig/silver.plala.or.jp
deleted file mode 100644
index 8ff9fd9ec8..0000000000
--- a/capplet/settings/mail-autoconfig/silver.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/sky.plala.or.jp b/capplet/settings/mail-autoconfig/sky.plala.or.jp
deleted file mode 100644
index 9da6383b8c..0000000000
--- a/capplet/settings/mail-autoconfig/sky.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/smail.plala.or.jp b/capplet/settings/mail-autoconfig/smail.plala.or.jp
deleted file mode 100644
index 1768bfd9bc..0000000000
--- a/capplet/settings/mail-autoconfig/smail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/snow.plala.or.jp b/capplet/settings/mail-autoconfig/snow.plala.or.jp
deleted file mode 100644
index 44267b99b1..0000000000
--- a/capplet/settings/mail-autoconfig/snow.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/so.wind.ne.jp b/capplet/settings/mail-autoconfig/so.wind.ne.jp
deleted file mode 100644
index 50fd47ef1c..0000000000
--- a/capplet/settings/mail-autoconfig/so.wind.ne.jp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/sonata.plala.or.jp b/capplet/settings/mail-autoconfig/sonata.plala.or.jp
deleted file mode 100644
index 3834428fbd..0000000000
--- a/capplet/settings/mail-autoconfig/sonata.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/suite.plala.or.jp b/capplet/settings/mail-autoconfig/suite.plala.or.jp
deleted file mode 100644
index c8beac6b9c..0000000000
--- a/capplet/settings/mail-autoconfig/suite.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/symphony.plala.or.jp b/capplet/settings/mail-autoconfig/symphony.plala.or.jp
deleted file mode 100644
index 311aa184ac..0000000000
--- a/capplet/settings/mail-autoconfig/symphony.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/t-online.de b/capplet/settings/mail-autoconfig/t-online.de
deleted file mode 100644
index a80ac4c316..0000000000
--- a/capplet/settings/mail-autoconfig/t-online.de
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/t-online.de free b/capplet/settings/mail-autoconfig/t-online.de free
deleted file mode 100644
index a80ac4c316..0000000000
--- a/capplet/settings/mail-autoconfig/t-online.de free
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/t-online.de imap ssl b/capplet/settings/mail-autoconfig/t-online.de imap ssl
deleted file mode 100644
index e2e5fb1a76..0000000000
--- a/capplet/settings/mail-autoconfig/t-online.de imap ssl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/t-online.de pop ssl b/capplet/settings/mail-autoconfig/t-online.de pop ssl
deleted file mode 100644
index 264ad0582c..0000000000
--- a/capplet/settings/mail-autoconfig/t-online.de pop ssl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/taupe.plala.or.jp b/capplet/settings/mail-autoconfig/taupe.plala.or.jp
deleted file mode 100644
index cec35b2df5..0000000000
--- a/capplet/settings/mail-autoconfig/taupe.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/tiki.ne.jp b/capplet/settings/mail-autoconfig/tiki.ne.jp
deleted file mode 100644
index 9e54488ead..0000000000
--- a/capplet/settings/mail-autoconfig/tiki.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/tmail.plala.or.jp b/capplet/settings/mail-autoconfig/tmail.plala.or.jp
deleted file mode 100644
index d138304dc9..0000000000
--- a/capplet/settings/mail-autoconfig/tmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/toccata.plala.or.jp b/capplet/settings/mail-autoconfig/toccata.plala.or.jp
deleted file mode 100644
index 41281a7d6c..0000000000
--- a/capplet/settings/mail-autoconfig/toccata.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/topaz.plala.or.jp b/capplet/settings/mail-autoconfig/topaz.plala.or.jp
deleted file mode 100644
index 185f1796de..0000000000
--- a/capplet/settings/mail-autoconfig/topaz.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/trio.plala.or.jp b/capplet/settings/mail-autoconfig/trio.plala.or.jp
deleted file mode 100644
index 6d15fc17b4..0000000000
--- a/capplet/settings/mail-autoconfig/trio.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/umail.plala.or.jp b/capplet/settings/mail-autoconfig/umail.plala.or.jp
deleted file mode 100644
index 2b4a0694a0..0000000000
--- a/capplet/settings/mail-autoconfig/umail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/verizon.net b/capplet/settings/mail-autoconfig/verizon.net
deleted file mode 100644
index 0c41d38243..0000000000
--- a/capplet/settings/mail-autoconfig/verizon.net
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/violet.plala.or.jp b/capplet/settings/mail-autoconfig/violet.plala.or.jp
deleted file mode 100644
index a1ce58b326..0000000000
--- a/capplet/settings/mail-autoconfig/violet.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/vm.aikis.or.jp b/capplet/settings/mail-autoconfig/vm.aikis.or.jp
deleted file mode 100644
index 9c3caa70ec..0000000000
--- a/capplet/settings/mail-autoconfig/vm.aikis.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/vmail.plala.or.jp b/capplet/settings/mail-autoconfig/vmail.plala.or.jp
deleted file mode 100644
index 66358ef6a8..0000000000
--- a/capplet/settings/mail-autoconfig/vmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/vp.tiki.ne.jp b/capplet/settings/mail-autoconfig/vp.tiki.ne.jp
deleted file mode 100644
index 378a9d3b24..0000000000
--- a/capplet/settings/mail-autoconfig/vp.tiki.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/waltz.plala.or.jp b/capplet/settings/mail-autoconfig/waltz.plala.or.jp
deleted file mode 100644
index e7814cd235..0000000000
--- a/capplet/settings/mail-autoconfig/waltz.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/wanadoo.fr b/capplet/settings/mail-autoconfig/wanadoo.fr
deleted file mode 100644
index c40c39e1ce..0000000000
--- a/capplet/settings/mail-autoconfig/wanadoo.fr
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/wanadoo.fr imap b/capplet/settings/mail-autoconfig/wanadoo.fr imap
deleted file mode 100644
index 5b138e48ce..0000000000
--- a/capplet/settings/mail-autoconfig/wanadoo.fr imap
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/wanadoo.fr pop b/capplet/settings/mail-autoconfig/wanadoo.fr pop
deleted file mode 100644
index c40c39e1ce..0000000000
--- a/capplet/settings/mail-autoconfig/wanadoo.fr pop
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/wave.plala.or.jp b/capplet/settings/mail-autoconfig/wave.plala.or.jp
deleted file mode 100644
index 611ab2a6b8..0000000000
--- a/capplet/settings/mail-autoconfig/wave.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/web.de b/capplet/settings/mail-autoconfig/web.de
deleted file mode 100644
index d3b357f16d..0000000000
--- a/capplet/settings/mail-autoconfig/web.de
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/white.plala.or.jp b/capplet/settings/mail-autoconfig/white.plala.or.jp
deleted file mode 100644
index 34f9a8af3f..0000000000
--- a/capplet/settings/mail-autoconfig/white.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/wine.plala.or.jp b/capplet/settings/mail-autoconfig/wine.plala.or.jp
deleted file mode 100644
index 62f66db872..0000000000
--- a/capplet/settings/mail-autoconfig/wine.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/wmail.plala.or.jp b/capplet/settings/mail-autoconfig/wmail.plala.or.jp
deleted file mode 100644
index 375c3010eb..0000000000
--- a/capplet/settings/mail-autoconfig/wmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/xmail.plala.or.jp b/capplet/settings/mail-autoconfig/xmail.plala.or.jp
deleted file mode 100644
index b8d7187ff5..0000000000
--- a/capplet/settings/mail-autoconfig/xmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/xp.wind.jp b/capplet/settings/mail-autoconfig/xp.wind.jp
deleted file mode 100644
index bed7569308..0000000000
--- a/capplet/settings/mail-autoconfig/xp.wind.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/xpost.plala.or.jp b/capplet/settings/mail-autoconfig/xpost.plala.or.jp
deleted file mode 100644
index 7d175fd750..0000000000
--- a/capplet/settings/mail-autoconfig/xpost.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/xs4all.nl b/capplet/settings/mail-autoconfig/xs4all.nl
deleted file mode 100644
index b5c4289322..0000000000
--- a/capplet/settings/mail-autoconfig/xs4all.nl
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/yahoo.com b/capplet/settings/mail-autoconfig/yahoo.com
deleted file mode 100644
index 92e6d7a70a..0000000000
--- a/capplet/settings/mail-autoconfig/yahoo.com
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ybb.ne.jp b/capplet/settings/mail-autoconfig/ybb.ne.jp
deleted file mode 100644
index 935a59ba95..0000000000
--- a/capplet/settings/mail-autoconfig/ybb.ne.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/yellow.plala.or.jp b/capplet/settings/mail-autoconfig/yellow.plala.or.jp
deleted file mode 100644
index 4b71b37f72..0000000000
--- a/capplet/settings/mail-autoconfig/yellow.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ymail.plala.or.jp b/capplet/settings/mail-autoconfig/ymail.plala.or.jp
deleted file mode 100644
index 0f367d6b4e..0000000000
--- a/capplet/settings/mail-autoconfig/ymail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/ypost.plala.or.jp b/capplet/settings/mail-autoconfig/ypost.plala.or.jp
deleted file mode 100644
index 9149c8d496..0000000000
--- a/capplet/settings/mail-autoconfig/ypost.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-autoconfig/zmail.plala.or.jp b/capplet/settings/mail-autoconfig/zmail.plala.or.jp
deleted file mode 100644
index 02e73a9842..0000000000
--- a/capplet/settings/mail-autoconfig/zmail.plala.or.jp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
deleted file mode 100644
index 8ab9670e8c..0000000000
--- a/capplet/settings/mail-guess-servers.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/* -*- 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/capplet/settings/mail-guess-servers.h b/capplet/settings/mail-guess-servers.h
deleted file mode 100644
index 84f6090ebe..0000000000
--- a/capplet/settings/mail-guess-servers.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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
author	Punit Jain <jpunit@novell.com>	2011-11-09 23:43:43 +0800
committer	Punit Jain <jpunit@novell.com>	2011-11-09 23:43:43 +0800
commit	e13266896bbd6f1ae809479d09029b076c368135 (patch)
tree	e8379635deb861219f3f94fca9a70cfbd6f4cbc6 /capplet
parent	77b3cb632a78eed7755b343dbbcf05ed7a3a0bc2 (diff)
download	gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.gz gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.bz2 gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.lz gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.xz gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.tar.zst gsoc2013-evolution-e13266896bbd6f1ae809479d09029b076c368135.zip