Index: mail/em-composer-prefs.c
===================================================================
--- mail/em-composer-prefs.c	(revision 35324)
+++ mail/em-composer-prefs.c	(working copy)
@@ -39,7 +39,8 @@
 
 #include <bonobo/bonobo-generic-factory.h>
 
-#include <libedataserver/e-iconv.h>
+#include <camel/camel-iconv.h>
+
 #include <misc/e-gui-utils.h>
 
 #include <glib/gstdio.h>
@@ -760,7 +761,7 @@ charset_activate (GtkWidget *item,
 	string = e_charset_picker_get_charset (menu);
 
 	if (string == NULL)
-		string = g_strdup (e_iconv_locale_charset ());
+		string = g_strdup (camel_iconv_locale_charset ());
 
 	gconf_client_set_string (
 		client, "/apps/evolution/mail/composer/charset",
@@ -949,7 +950,7 @@ em_composer_prefs_construct (EMComposerP
 	buf = gconf_client_get_string (
 		client, "/apps/evolution/mail/composer/charset", NULL);
 	menu = e_charset_picker_new (
-		buf && *buf ? buf : e_iconv_locale_charset ());
+		buf && *buf ? buf : camel_iconv_locale_charset ());
 	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
 	option_menu_connect (
 		prefs, prefs->charset,
Index: mail/em-format-quote.c
===================================================================
--- mail/em-format-quote.c	(revision 35324)
+++ 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 <gconf/gconf-client.h>
 
@@ -379,7 +379,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-subscribe-editor.c
===================================================================
--- mail/em-subscribe-editor.c	(revision 35324)
+++ mail/em-subscribe-editor.c	(working copy)
@@ -37,6 +37,7 @@
 #include "camel/camel-store.h"
 #include "camel/camel-session.h"
 #include "libedataserver/e-account-list.h"
+#include "libedataserver/e-msgport.h"
 #include "e-util/e-util-private.h"
 
 #include "em-subscribe-editor.h"
Index: mail/em-migrate.c
===================================================================
--- mail/em-migrate.c	(revision 35324)
+++ 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/mail-folder-cache.c
===================================================================
--- mail/mail-folder-cache.c	(revision 35324)
+++ mail/mail-folder-cache.c	(working copy)
@@ -47,6 +47,7 @@
 #include <camel/camel-disco-store.h>
 
 #include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-msgport.h>
 #include "e-util/e-util.h"
 
 #include "mail-mt.h"
Index: mail/em-format-html.c
===================================================================
--- mail/em-format-html.c	(revision 35324)
+++ 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"
@@ -54,6 +53,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>
@@ -1838,7 +1838,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 35324)
+++ 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"
@@ -902,7 +902,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);
@@ -916,7 +916,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-composer-private.c
===================================================================
--- composer/e-composer-private.c	(revision 35324)
+++ composer/e-composer-private.c	(working copy)
@@ -280,7 +280,7 @@ e_composer_get_default_charset (void)
 	g_object_unref (client);
 
 	if (charset == NULL)
-		charset = g_strdup (e_iconv_locale_charset ());
+		charset = g_strdup (camel_iconv_locale_charset ());
 
 	if (charset == NULL)
 		charset = g_strdup ("us-ascii");
Index: composer/e-composer-private.h
===================================================================
--- composer/e-composer-private.h	(revision 35324)
+++ composer/e-composer-private.h	(working copy)
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 #include "gconf-bridge.h"
 
-#include <libedataserver/e-iconv.h>
+#include <camel/camel-iconv.h>
 
 #include "e-attachment-bar.h"
 #include "e-composer-actions.h"
Index: composer/e-msg-composer.c
===================================================================
--- composer/e-msg-composer.c	(revision 35324)
+++ composer/e-msg-composer.c	(working copy)
@@ -77,6 +77,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>
@@ -256,7 +257,7 @@ best_encoding (GByteArray *buf, const gc
 	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;
 
@@ -265,13 +266,13 @@ best_encoding (GByteArray *buf, const gc
 	do {
 		out = outbuf;
 		outlen = sizeof (outbuf);
-		status = e_iconv (cd, (const gchar **) &in, &inlen, &out, &outlen);
+		status = camel_iconv (cd, (const gchar **) &in, &inlen, &out, &outlen);
 		for (ch = out - 1; ch >= outbuf; ch--) {
 			if ((guchar) *ch > 127)
 				count++;
 		}
 	} while (status == (gsize) -1 && errno == E2BIG);
-	e_iconv_close (cd);
+	camel_iconv_close (cd);
 
 	if (status == (gsize) -1 || status > 0)
 		return -1;
@@ -620,7 +621,7 @@ build_message (EMsgComposer *composer,
 		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 35324)
+++ 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"
@@ -260,7 +260,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;
@@ -323,7 +323,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;
@@ -365,9 +365,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;
 }
@@ -387,9 +387,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;
 }
@@ -409,9 +409,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;
 }
@@ -431,9 +431,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 35324)
+++ 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>
@@ -1056,7 +1056,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");
