Index: mail/em-composer-prefs.c
===================================================================
--- mail/em-composer-prefs.c	(revision 33603)
+++ mail/em-composer-prefs.c	(working copy)
@@ -38,7 +38,8 @@
 
 #include <bonobo/bonobo-generic-factory.h>
 
-#include <libedataserver/e-iconv.h>
+#include <camel/camel-iconv.h>
+
 #include <misc/e-gui-utils.h>
 
 #include <gdk/gdkkeysyms.h>
@@ -555,7 +556,7 @@ spell_set_ui (EMComposerPrefs *prefs)
 	if (!(lang = gconf_client_get_string (prefs->gconf, GNOME_SPELL_GCONF_DIR "/language", &err)) || err) {
 		g_free (lang);
 		g_clear_error (&err);
-		lang = g_strdup (e_iconv_locale_language ());
+		lang = g_strdup (camel_iconv_locale_language ());
 	}
 	
 	present = g_hash_table_new (g_str_hash, g_str_equal);
@@ -766,7 +767,7 @@ charset_activate (GtkWidget *item, EMCom
 	
 	menu = gtk_option_menu_get_menu (prefs->charset);
 	if (!(string = e_charset_picker_get_charset (menu)))
-		string = g_strdup (e_iconv_locale_charset ());
+		string = g_strdup (camel_iconv_locale_charset ());
 	
 	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/composer/charset", string, NULL);
 	g_free (string);
@@ -930,7 +931,7 @@ em_composer_prefs_construct (EMComposerP
 	
 	prefs->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset"));
 	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/composer/charset", NULL);
-	menu = e_charset_picker_new (buf && *buf ? buf : e_iconv_locale_charset ());
+	menu = e_charset_picker_new (buf && *buf ? buf : camel_iconv_locale_charset ());
 	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
 	option_menu_connect (prefs, prefs->charset, G_CALLBACK (charset_activate),
 			     "/apps/evolution/mail/composer/charset");
Index: mail/em-format-quote.c
===================================================================
--- mail/em-format-quote.c	(revision 33603)
+++ mail/em-format-quote.c	(working copy)
@@ -26,6 +26,7 @@
 
 #include <string.h>
 
+#include <camel/camel-iconv.h>
 #include <camel/camel-stream.h>
 #include <camel/camel-stream-filter.h>
 #include <camel/camel-mime-filter-tohtml.h>
@@ -34,7 +35,6 @@
 #include <camel/camel-mime-message.h>
 #include <camel/camel-url.h>
 
-#include <libedataserver/e-iconv.h>
 #include <glib/gi18n.h>
 
 #include "em-stripsig-filter.h"
@@ -353,7 +353,7 @@ emfq_format_headers (EMFormatQuote *emfq
 	
 	ct = camel_mime_part_get_content_type ((CamelMimePart *) part);
 	charset = camel_content_type_param (ct, "charset");
-	charset = e_iconv_charset_name (charset);	
+	charset = camel_iconv_charset_name (charset);	
 	
 	/* dump selected headers */
 	h = (EMFormatHeader *) emf->header_list.head;
Index: mail/em-migrate.c
===================================================================
--- mail/em-migrate.c	(revision 33603)
+++ mail/em-migrate.c	(working copy)
@@ -58,7 +58,6 @@
 
 #include <e-util/e-util.h>
 #include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-iconv.h>
 #include <e-util/e-xml-utils.h>
 
 #include "e-util/e-bconf-map.h"
Index: mail/em-format-html.c
===================================================================
--- mail/em-format-html.c	(revision 33603)
+++ mail/em-format-html.c	(working copy)
@@ -41,7 +41,6 @@
 #undef interface
 #endif
 
-#include <libedataserver/e-iconv.h>
 #include <libedataserver/e-data-server-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
 #include <libedataserver/e-time-utils.h>
 #include "e-util/e-icon-factory.h"
@@ -53,6 +52,7 @@
 
 #include <glib/gi18n.h>
 
+#include <camel/camel-iconv.h>
 #include <camel/camel-mime-message.h>
 #include <camel/camel-stream.h>
 #include <camel/camel-stream-filter.h>
@@ -1751,7 +1751,7 @@ efh_format_headers(EMFormatHTML *efh, Ca
 			
 	ct = camel_mime_part_get_content_type((CamelMimePart *)part);
 	charset = camel_content_type_param (ct, "charset");
-	charset = e_iconv_charset_name(charset);	
+	charset = camel_iconv_charset_name(charset);	
 
 	if (!efh->simple_headers)
 		camel_stream_printf(stream,
Index: mail/em-mailer-prefs.c
===================================================================
--- mail/em-mailer-prefs.c	(revision 33603)
+++ mail/em-mailer-prefs.c	(working copy)
@@ -29,7 +29,7 @@
 #include "em-mailer-prefs.h"
 #include "em-format.h"
 
-#include <libedataserver/e-iconv.h>
+#include <camel/camel-iconv.h>
 #include <gtkhtml/gtkhtml-properties.h>
 #include <libxml/tree.h>
 #include "misc/e-charset-picker.h"
@@ -565,7 +565,7 @@ charset_activate (GtkWidget *item, EMMai
 	
 	menu = gtk_option_menu_get_menu (prefs->charset);
 	if (!(string = e_charset_picker_get_charset (menu)))
-		string = g_strdup (e_iconv_locale_charset ());
+		string = g_strdup (camel_iconv_locale_charset ());
 	
 	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/charset", string, NULL);
 	g_free (string);
@@ -579,7 +579,7 @@ charset_menu_init (EMMailerPrefs *prefs)
 	char *buf;
 	
 	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/charset", NULL);
-	menu = e_charset_picker_new (buf && *buf ? buf : e_iconv_locale_charset ());
+	menu = e_charset_picker_new (buf && *buf ? buf : camel_iconv_locale_charset ());
 	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
 	g_free (buf);
 	
Index: composer/e-msg-composer-attachment-bar.c
===================================================================
--- composer/e-msg-composer-attachment-bar.c	(revision 33603)
+++ composer/e-msg-composer-attachment-bar.c	(working copy)
@@ -39,9 +39,8 @@
 #include "e-msg-composer-attachment.h"
 #include "e-msg-composer-attachment-bar.h"
 
-#include <libedataserver/e-iconv.h>
-
 #include <camel/camel-data-wrapper.h>
+#include <camel/camel-iconv.h>
 #include <camel/camel-stream-fs.h>
 #include <camel/camel-stream-null.h>
 #include <camel/camel-stream-mem.h>
@@ -763,7 +762,7 @@ get_default_charset (void)
 	
 	g_object_unref (gconf);
 	
-	if (!charset && (locale = e_iconv_locale_charset ()))
+	if (!charset && (locale = camel_iconv_locale_charset ()))
 		charset = g_strdup (locale);
 	
 	return charset ? charset : g_strdup ("us-ascii");
Index: composer/e-msg-composer.c
===================================================================
--- composer/e-msg-composer.c	(revision 33603)
+++ composer/e-msg-composer.c	(working copy)
@@ -77,7 +77,6 @@
 
 #include <glade/glade.h>
 
-#include <libedataserver/e-iconv.h>
 #include <text/e-entry.h>
 
 #include "e-util/e-dialog-utils.h"
@@ -90,6 +89,7 @@
 
 #include <camel/camel-session.h>
 #include <camel/camel-charset-map.h>
+#include <camel/camel-iconv.h>
 #include <camel/camel-stream-filter.h>
 #include <camel/camel-mime-filter-charset.h>
 #include <camel/camel-stream-mem.h>
@@ -368,7 +368,7 @@ best_encoding (GByteArray *buf, const ch
 	if (!charset)
 		return -1;
 	
-	cd = e_iconv_open (charset, "utf-8");
+	cd = camel_iconv_open (charset, "utf-8");
 	if (cd == (iconv_t) -1)
 		return -1;
 	
@@ -377,13 +377,13 @@ best_encoding (GByteArray *buf, const ch
 	do {
 		out = outbuf;
 		outlen = sizeof (outbuf);
-		status = e_iconv (cd, (const char **) &in, &inlen, &out, &outlen);
+		status = camel_iconv (cd, (const char **) &in, &inlen, &out, &outlen);
 		for (ch = out - 1; ch >= outbuf; ch--) {
 			if ((unsigned char)*ch > 127)
 				count++;
 		}
 	} while (status == (size_t) -1 && errno == E2BIG);
-	e_iconv_close (cd);
+	camel_iconv_close (cd);
 	
 	if (status == (size_t) -1 || status > 0)
 		return -1;
@@ -417,7 +417,7 @@ composer_get_default_charset_setting (vo
 	
 	g_object_unref (gconf);
 	
-	if (!charset && (locale = e_iconv_locale_charset ()))
+	if (!charset && (locale = camel_iconv_locale_charset ()))
 		charset = g_strdup (locale);
 	
 	return charset ? charset : g_strdup ("us-ascii");
@@ -590,7 +590,7 @@ build_message (EMsgComposer *composer, g
 		type = camel_content_type_new ("text", "plain");
 		if ((charset = best_charset (data, p->charset, &plain_encoding))) {
 			camel_content_type_set_param (type, "charset", charset);
-			iconv_charset = e_iconv_charset_name (charset);
+			iconv_charset = camel_iconv_charset_name (charset);
 			g_free (charset);
 		}
 	}
Index: widgets/misc/e-unicode.c
===================================================================
--- widgets/misc/e-unicode.c	(revision 33603)
+++ widgets/misc/e-unicode.c	(working copy)
@@ -40,7 +40,7 @@
 #include <gtk/gtk.h>
 #include <libxml/xmlmemory.h>
 
-#include <libedataserver/e-iconv.h>
+#include <camel/camel-iconv.h>
 
 #include <glib/gi18n.h>
 #include "e-unicode.h"
@@ -262,7 +262,7 @@ e_utf8_from_iconv_string_sized (iconv_t 
 	obl = ibl * 6;
 
 	while (ibl > 0) {
-		e_iconv (ic, &ib, &ibl, &ob, &obl);
+		camel_iconv (ic, &ib, &ibl, &ob, &obl);
 		if (ibl > 0) {
 			gint len;
 			if ((*ib & 0x80) == 0x00) len = 1;
@@ -325,7 +325,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic
 	obl = ibl * 4;
 	
 	while (ibl > 0) {
-		e_iconv (ic, &ib, &ibl, &ob, &obl);
+		camel_iconv (ic, &ib, &ibl, &ob, &obl);
 		if (ibl > 0) {
 			gint len;
 			if ((*ib & 0x80) == 0x00) len = 1;
@@ -367,9 +367,9 @@ e_utf8_from_charset_string_sized (const 
 
 	if (!string) return NULL;
 
-	ic = e_iconv_open("utf-8", charset);
+	ic = camel_iconv_open("utf-8", charset);
 	ret = e_utf8_from_iconv_string_sized (ic, string, bytes);
-	e_iconv_close(ic);
+	camel_iconv_close(ic);
 
 	return ret;
 }
@@ -389,9 +389,9 @@ e_utf8_to_charset_string_sized (const gc
 
 	if (!string) return NULL;
 
-	ic = e_iconv_open(charset, "utf-8");
+	ic = camel_iconv_open(charset, "utf-8");
 	ret = e_utf8_to_iconv_string_sized (ic, string, bytes);
-	e_iconv_close(ic);
+	camel_iconv_close(ic);
 
 	return ret;
 }
@@ -411,9 +411,9 @@ e_utf8_from_locale_string_sized (const g
 
 	if (!string) return NULL;
 
-	ic = e_iconv_open("utf-8", e_iconv_locale_charset());
+	ic = camel_iconv_open("utf-8", camel_iconv_locale_charset());
 	ret = e_utf8_from_iconv_string_sized (ic, string, bytes);
-	e_iconv_close(ic);
+	camel_iconv_close(ic);
 
 	return ret;
 }
@@ -433,9 +433,9 @@ e_utf8_to_locale_string_sized (const gch
 
 	if (!string) return NULL;
 
-	ic = e_iconv_open(e_iconv_locale_charset(), "utf-8");
+	ic = camel_iconv_open(camel_iconv_locale_charset(), "utf-8");
 	ret = e_utf8_to_iconv_string_sized (ic, string, bytes);
-	e_iconv_close(ic);
+	camel_iconv_close(ic);
 
 	return ret;
 }
Index: widgets/misc/e-attachment-bar.c
===================================================================
--- widgets/misc/e-attachment-bar.c	(revision 33603)
+++ widgets/misc/e-attachment-bar.c	(working copy)
@@ -39,10 +39,10 @@
 #include "e-attachment.h"
 #include "e-attachment-bar.h"
 
-#include <libedataserver/e-iconv.h>
 #include <libedataserver/e-data-server-util.h>
 
 #include <camel/camel-data-wrapper.h>
+#include <camel/camel-iconv.h>
 #include <camel/camel-mime-message.h>
 #include <camel/camel-stream-fs.h>
 #include <camel/camel-stream-null.h>
@@ -1047,7 +1047,7 @@ get_default_charset (void)
 	
 	g_object_unref (gconf);
 	
-	if (!charset && (locale = e_iconv_locale_charset ()))
+	if (!charset && (locale = camel_iconv_locale_charset ()))
 		charset = g_strdup (locale);
 	
 	return charset ? charset : g_strdup ("us-ascii");
