Collect mail enum types in e-mail-enums.h.

And generate GTypes for each of them in e-mail-enumtypes.[ch].

Also, the glib-gen.mak script forced me to add a <mail/e-mail.h>
top-level header, which really isn't a bad idea anyway.

TODO: We should do this for calendar and addressbook too.

24 files changed, 220 insertions, 139 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index 6b1615ec91..eb7ef84ecb 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -4,6 +4,13 @@ privsolib_LTLIBRARIES = libevolution-mail.la
 
 mailincludedir = $(privincludedir)/mail
 
+include $(top_srcdir)/glib-gen.mak
+glib_enum_headers=e-mail-enums.h
+glib_enum_define=E_MAIL
+glib_enum_prefix=e_mail
+
+ENUM_GENERATED = e-mail-enumtypes.h e-mail-enumtypes.c
+
 libevolution_mail_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)/widgets				\
@@ -36,6 +43,7 @@ libevolution_mail_la_CPPFLAGS =				\
 	-DG_LOG_DOMAIN=\"evolution-mail\"
 
 mailinclude_HEADERS =					\
+	e-mail.h					\
 	e-mail-view.h					\
 	e-mail-folder-pane.h				\
 	e-mail-message-pane.h				\
@@ -45,6 +53,8 @@ mailinclude_HEADERS =					\
 	e-mail-backend.h				\
 	e-mail-browser.h				\
 	e-mail-display.h				\
+	e-mail-enums.h					\
+	e-mail-enumtypes.h				\
 	e-mail-folder-utils.h				\
 	e-mail-label-action.h				\
 	e-mail-label-dialog.h				\
@@ -116,6 +126,7 @@ libevolution_mail_la_SOURCES =				\
 	e-mail-backend.c				\
 	e-mail-browser.c				\
 	e-mail-display.c				\
+	e-mail-enumtypes.c				\
 	e-mail-folder-utils.c				\
 	e-mail-label-action.c				\
 	e-mail-label-dialog.c				\
@@ -289,7 +300,7 @@ endif
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-BUILT_SOURCES = $(error_DATA)
+BUILT_SOURCES = $(error_DATA) $(ENUM_GENERATED)
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 0ecae4856c..ce227f8c27 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -42,6 +42,7 @@
 #include "mail/em-folder-tree-model.h"
 #include "mail/em-utils.h"
 #include "mail/mail-autofilter.h"
+#include "mail/mail-config.h"
 #include "mail/mail-folder-cache.h"
 #include "mail/mail-ops.h"
 #include "mail/mail-vfolder.h"
@@ -300,7 +301,7 @@ mail_backend_quit_requested_cb (EShell *shell,
 
 	/* Check Outbox for any unsent messages. */
 
-	folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+	folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 	if (folder == NULL)
 		return;
 
diff --git a/mail/e-mail-enums.h b/mail/e-mail-enums.h
new file mode 100644
index 0000000000..6dd985e1ad
--- /dev/null
+++ b/mail/e-mail-enums.h
@@ -0,0 +1,66 @@
+/*
+ * e-mail-enums.h
+ *
+ * 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/>
+ *
+ */
+
+#ifndef E_MAIL_ENUMS_H
+#define E_MAIL_ENUMS_H
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef enum {
+	E_MAIL_DISPLAY_STYLE_NORMAL,
+	E_MAIL_DISPLAY_STYLE_FULL_HEADERS,
+	E_MAIL_DISPLAY_STYLE_SOURCE
+} EMailDisplayStyle;
+
+typedef enum {
+	E_MAIL_FORWARD_STYLE_ATTACHED,
+	E_MAIL_FORWARD_STYLE_INLINE,
+	E_MAIL_FORWARD_STYLE_QUOTED
+} EMailForwardStyle;
+
+typedef enum {
+	E_MAIL_IMAGE_LOADING_POLICY_NEVER,
+	E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES,
+	E_MAIL_IMAGE_LOADING_POLICY_ALWAYS
+} EMailImageLoadingPolicy;
+
+/* XXX E_MAIL_FOLDER_TEMPLATES is a prime example of why templates
+ *     should be a core feature: the mailer now has to know about
+ *     this specific plugin, which defeats the purpose of plugins. */
+typedef enum {
+	E_MAIL_LOCAL_FOLDER_INBOX,
+	E_MAIL_LOCAL_FOLDER_DRAFTS,
+	E_MAIL_LOCAL_FOLDER_OUTBOX,
+	E_MAIL_LOCAL_FOLDER_SENT,
+	E_MAIL_LOCAL_FOLDER_TEMPLATES,
+	E_MAIL_LOCAL_FOLDER_LOCAL_INBOX,
+	E_MAIL_NUM_LOCAL_FOLDERS
+} EMailLocalFolder;
+
+typedef enum {
+	E_MAIL_REPLY_STYLE_QUOTED,
+	E_MAIL_REPLY_STYLE_DO_NOT_QUOTE,
+	E_MAIL_REPLY_STYLE_ATTACH,
+	E_MAIL_REPLY_STYLE_OUTLOOK
+} EMailReplyStyle;
+
+G_END_DECLS
+
+#endif /* E_MAIL_ENUMS_H */
diff --git a/mail/e-mail-local.h b/mail/e-mail-local.h
index 125c6451af..bd0442618d 100644
--- a/mail/e-mail-local.h
+++ b/mail/e-mail-local.h
@@ -24,23 +24,11 @@
 
 #include <glib.h>
 #include <camel/camel.h>
+#include <mail/e-mail-enums.h>
 #include <mail/e-mail-session.h>
 
 G_BEGIN_DECLS
 
-/* XXX E_MAIL_FOLDER_TEMPLATES is a prime example of why templates
- *     should be a core feature: the mailer now has to know about
- *     this specific plugin, which defeats the purpose of plugins. */
-typedef enum {
-	E_MAIL_FOLDER_INBOX,
-	E_MAIL_FOLDER_DRAFTS,
-	E_MAIL_FOLDER_OUTBOX,
-	E_MAIL_FOLDER_SENT,
-	E_MAIL_FOLDER_TEMPLATES,
-	E_MAIL_FOLDER_LOCAL_INBOX,
-	E_MAIL_NUM_LOCAL_FOLDERS
-} EMailLocalFolder;
-
 void		e_mail_local_init		(EMailSession *session,
 						 const gchar *data_dir);
 CamelFolder *	e_mail_local_get_folder		(EMailLocalFolder type);
diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c
index e9cdd83914..b436243c10 100644
--- a/mail/e-mail-session-utils.c
+++ b/mail/e-mail-session-utils.c
@@ -487,7 +487,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
 
 	/* Append the sent message to a Sent folder. */
 
-	local_sent_folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
+	local_sent_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_SENT);
 
 	/* Try to extract a CamelFolder from the Sent folder URI. */
 	if (context->sent_folder_uri != NULL) {
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 481dca8a53..23076807b3 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -909,7 +909,7 @@ mail_session_forward_to (CamelSession *session,
 
 	/* and send it */
 	info = camel_message_info_new (NULL);
-	out_folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+	out_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 	camel_message_info_set_flags (
 		info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
 	mail_append_mail (
diff --git a/mail/e-mail.h b/mail/e-mail.h
new file mode 100644
index 0000000000..4e40ac370b
--- /dev/null
+++ b/mail/e-mail.h
@@ -0,0 +1,50 @@
+/*
+ * e-mail.h
+ *
+ * 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/>
+ *
+ */
+
+#ifndef E_MAIL_H
+#define E_MAIL_H
+
+#include <mail/e-mail-attachment-bar.h>
+#include <mail/e-mail-backend.h>
+#include <mail/e-mail-browser.h>
+#include <mail/e-mail-display.h>
+#include <mail/e-mail-enums.h>
+#include <mail/e-mail-enumtypes.h>
+#include <mail/e-mail-folder-pane.h>
+#include <mail/e-mail-folder-utils.h>
+#include <mail/e-mail-label-action.h>
+#include <mail/e-mail-label-dialog.h>
+#include <mail/e-mail-label-list-store.h>
+#include <mail/e-mail-label-manager.h>
+#include <mail/e-mail-label-tree-view.h>
+#include <mail/e-mail-local.h>
+#include <mail/e-mail-message-pane.h>
+#include <mail/e-mail-migrate.h>
+#include <mail/e-mail-notebook-view.h>
+#include <mail/e-mail-paned-view.h>
+#include <mail/e-mail-pane.h>
+#include <mail/e-mail-reader.h>
+#include <mail/e-mail-reader-utils.h>
+#include <mail/e-mail-session.h>
+#include <mail/e-mail-session-utils.h>
+#include <mail/e-mail-sidebar.h>
+#include <mail/e-mail-store.h>
+#include <mail/e-mail-tag-editor.h>
+#include <mail/e-mail-view.h>
+
+#endif /* E_MAIL_H */
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 0cec4159a8..13468e87ac 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -251,11 +251,11 @@ emae_set_original_account (EMAccountEditor *emae,
 
 		e_account_set_string (
 			modified_account, E_ACCOUNT_DRAFTS_FOLDER_URI,
-			e_mail_local_get_folder_uri (E_MAIL_FOLDER_DRAFTS));
+			e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS));
 
 		e_account_set_string (
 			modified_account, E_ACCOUNT_SENT_FOLDER_URI,
-			e_mail_local_get_folder_uri (E_MAIL_FOLDER_SENT));
+			e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_SENT));
 
 		/* encrypt to self by default */
 		e_account_set_bool (modified_account, E_ACCOUNT_PGP_ENCRYPT_TO_SELF, TRUE);
@@ -617,11 +617,11 @@ default_folders_clicked (GtkButton *button, gpointer user_data)
 	EMAccountEditor *emae = user_data;
 	const gchar *uri;
 
-	uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_DRAFTS);
+	uri = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS);
 	em_folder_selection_button_set_selection ((EMFolderSelectionButton *)emae->priv->drafts_folder_button, uri);
 	emae_account_folder_changed ((EMFolderSelectionButton *)emae->priv->drafts_folder_button, emae);
 
-	uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_SENT);
+	uri = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_SENT);
 	em_folder_selection_button_set_selection ((EMFolderSelectionButton *)emae->priv->sent_folder_button, uri);
 	emae_account_folder_changed ((EMFolderSelectionButton *)emae->priv->sent_folder_button, emae);
 
@@ -2955,14 +2955,14 @@ emae_defaults_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	button = emae_account_folder (
 		emae, "drafts_button",
 		E_ACCOUNT_DRAFTS_FOLDER_URI,
-		E_MAIL_FOLDER_DRAFTS, builder);
+		E_MAIL_LOCAL_FOLDER_DRAFTS, builder);
 	em_folder_selection_button_set_session (button, session);
 	priv->drafts_folder_button = GTK_BUTTON (button);
 
 	button = emae_account_folder (
 		emae, "sent_button",
 		E_ACCOUNT_SENT_FOLDER_URI,
-		E_MAIL_FOLDER_SENT, builder);
+		E_MAIL_LOCAL_FOLDER_SENT, builder);
 	em_folder_selection_button_set_session (button, session);
 	priv->sent_folder_button = GTK_BUTTON (button);
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 9f6e107af4..ff977bd66e 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -559,7 +559,7 @@ em_utils_composer_send_cb (EMsgComposer *composer,
 	context->activity = g_object_ref (activity);
 
 	cancellable = e_activity_get_cancellable (activity);
-	outbox_folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+	outbox_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 
 	info = camel_message_info_new (NULL);
 	camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0);
@@ -671,7 +671,7 @@ composer_save_draft_append_mail (AsyncContext *context,
 	CamelMessageInfo *info;
 
 	local_drafts_folder =
-		e_mail_local_get_folder (E_MAIL_FOLDER_DRAFTS);
+		e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_DRAFTS);
 
 	if (drafts_folder == NULL)
 		drafts_folder = g_object_ref (local_drafts_folder);
@@ -756,7 +756,7 @@ em_utils_composer_save_draft_cb (EMsgComposer *composer,
 	session = e_msg_composer_get_session (composer);
 
 	local_drafts_folder_uri =
-		e_mail_local_get_folder_uri (E_MAIL_FOLDER_DRAFTS);
+		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS);
 
 	table = e_msg_composer_get_header_table (composer);
 	account = e_composer_header_table_get_account (table);
@@ -1337,7 +1337,7 @@ forward_non_attached (EShell *shell,
                       CamelFolder *folder,
                       GPtrArray *uids,
                       GPtrArray *messages,
-                      gint style,
+                      EMailForwardStyle style,
                       const gchar *from_uri)
 {
 	CamelMimeMessage *message;
@@ -1353,7 +1353,7 @@ forward_non_attached (EShell *shell,
 	folder_uri = camel_folder_get_uri (folder);
 
 	flags = EM_FORMAT_QUOTE_HEADERS | EM_FORMAT_QUOTE_KEEP_SIG;
-	if (style == MAIL_CONFIG_FORWARD_QUOTED)
+	if (style == E_MAIL_FORWARD_STYLE_QUOTED)
 		flags |= EM_FORMAT_QUOTE_CITE;
 
 	for (i = 0; i < messages->len; i++) {
@@ -1408,7 +1408,7 @@ forward_inline_cb (CamelFolder *folder,
 
 	forward_non_attached (
 		data->shell, folder, uids, messages,
-		MAIL_CONFIG_FORWARD_INLINE, data->from_uri);
+		E_MAIL_FORWARD_STYLE_INLINE, data->from_uri);
 
 	g_free (data->from_uri);
 	g_object_unref (data->shell);
@@ -1453,7 +1453,7 @@ forward_quoted_cb (CamelFolder *folder,
 
 	forward_non_attached (
 		data->shell, folder, uids, messages,
-		MAIL_CONFIG_FORWARD_QUOTED, data->from_uri);
+		E_MAIL_FORWARD_STYLE_QUOTED, data->from_uri);
 
 	g_free (data->from_uri);
 	g_object_unref (data->shell);
@@ -1507,7 +1507,7 @@ em_utils_forward_message (EShell *shell,
 	GConfClient *client;
 	const gchar *key;
 	gchar *subject;
-	gint mode;
+	EMailForwardStyle style;
 	EMsgComposer *composer = NULL;
 
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
@@ -1517,11 +1517,11 @@ em_utils_forward_message (EShell *shell,
 
 	client = gconf_client_get_default ();
 	key = "/apps/evolution/mail/format/forward_style";
-	mode = gconf_client_get_int (client, key, NULL);
+	style = gconf_client_get_int (client, key, NULL);
 	g_object_unref (client);
 
-	switch (mode) {
-		case MAIL_CONFIG_FORWARD_ATTACHED:
+	switch (style) {
+		case E_MAIL_FORWARD_STYLE_ATTACHED:
 		default:
 			part = mail_tool_make_message_attachment (message);
 			subject = mail_tool_generate_forward_subject (message);
@@ -1534,16 +1534,16 @@ em_utils_forward_message (EShell *shell,
 			g_free (subject);
 			break;
 
-		case MAIL_CONFIG_FORWARD_INLINE:
+		case E_MAIL_FORWARD_STYLE_INLINE:
 			composer = forward_non_attached (
 				shell, NULL, NULL, messages,
-				MAIL_CONFIG_FORWARD_INLINE, from_uri);
+				E_MAIL_FORWARD_STYLE_INLINE, from_uri);
 			break;
 
-		case MAIL_CONFIG_FORWARD_QUOTED:
+		case E_MAIL_FORWARD_STYLE_QUOTED:
 			composer = forward_non_attached (
 				shell, NULL, NULL, messages,
-				MAIL_CONFIG_FORWARD_QUOTED, from_uri);
+				E_MAIL_FORWARD_STYLE_QUOTED, from_uri);
 			break;
 	}
 
@@ -1569,24 +1569,24 @@ em_utils_forward_messages (EShell *shell,
 {
 	GConfClient *client;
 	const gchar *key;
-	gint mode;
+	EMailForwardStyle style;
 
 	g_return_if_fail (E_IS_SHELL (shell));
 
 	client = gconf_client_get_default ();
 	key = "/apps/evolution/mail/format/forward_style";
-	mode = gconf_client_get_int (client, key, NULL);
+	style = gconf_client_get_int (client, key, NULL);
 	g_object_unref (client);
 
-	switch (mode) {
-		case MAIL_CONFIG_FORWARD_ATTACHED:
+	switch (style) {
+		case E_MAIL_FORWARD_STYLE_ATTACHED:
 		default:
 			em_utils_forward_attached (shell, folder, uids, from_uri);
 			break;
-		case MAIL_CONFIG_FORWARD_INLINE:
+		case E_MAIL_FORWARD_STYLE_INLINE:
 			em_utils_forward_inline (shell, folder, uids, from_uri);
 			break;
-		case MAIL_CONFIG_FORWARD_QUOTED:
+		case E_MAIL_FORWARD_STYLE_QUOTED:
 			em_utils_forward_quoted (shell, folder, uids, from_uri);
 			break;
 	}
@@ -1891,7 +1891,7 @@ em_utils_send_receipt (EMailSession *session,
 
 	/* Send the receipt */
 	info = camel_message_info_new (NULL);
-	out_folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+	out_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 	camel_message_info_set_flags (
 		info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
 	mail_append_mail (
@@ -2460,7 +2460,7 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat *
 	gboolean start_bottom;
 	guint32 validity_found = 0;
 	const gchar *key;
-	MailConfigReplyStyle style;
+	EMailReplyStyle style;
 
 	client = gconf_client_get_default ();
 
@@ -2471,23 +2471,23 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat *
 	style = gconf_client_get_int (client, key, NULL);
 
 	switch (style) {
-	case MAIL_CONFIG_REPLY_DO_NOT_QUOTE:
+	case E_MAIL_REPLY_STYLE_DO_NOT_QUOTE:
 		/* do nothing */
 		break;
-	case MAIL_CONFIG_REPLY_ATTACH:
+	case E_MAIL_REPLY_STYLE_ATTACH:
 		/* attach the original message as an attachment */
 		part = mail_tool_make_message_attachment (message);
 		e_msg_composer_attach (composer, part);
 		g_object_unref (part);
 		break;
-	case MAIL_CONFIG_REPLY_OUTLOOK:
+	case E_MAIL_REPLY_STYLE_OUTLOOK:
 		text = em_utils_message_to_html (message, _("-----Original Message-----"), EM_FORMAT_QUOTE_HEADERS, &len, source, start_bottom ? "<BR>" : NULL, &validity_found);
 		e_msg_composer_set_body_text (composer, text, len);
 		g_free (text);
 		emu_update_composers_security (composer, validity_found);
 		break;
 
-	case MAIL_CONFIG_REPLY_QUOTED:
+	case E_MAIL_REPLY_STYLE_QUOTED:
 	default:
 		/* do what any sane user would want when replying... */
 		credits = attribution_format (ATTRIBUTION, message);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 2e9bad7273..5f3cca3f91 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -57,12 +57,12 @@
 
 #include <glib/gi18n.h>
 
-#include "mail-config.h"
-#include "mail-mt.h"
-
+#include "e-mail-enumtypes.h"
 #include "em-format-html.h"
 #include "em-html-stream.h"
 #include "em-utils.h"
+#include "mail-config.h"
+#include "mail-mt.h"
 
 #define d(x)
 
@@ -94,7 +94,7 @@ struct _EMFormatHTMLPrivate {
 	GMutex *lock;
 
 	GdkColor colors[EM_FORMAT_HTML_NUM_COLOR_TYPES];
-	MailConfigHTTPMode image_loading_policy;
+	EMailImageLoadingPolicy image_loading_policy;
 
 	guint load_images_now	: 1;
 	guint only_local_photos	: 1;
@@ -853,13 +853,12 @@ efh_class_init (EMFormatHTMLClass *class)
 	g_object_class_install_property (
 		object_class,
 		PROP_IMAGE_LOADING_POLICY,
-		g_param_spec_int (
+		g_param_spec_enum (
 			"image-loading-policy",
 			"Image Loading Policy",
 			NULL,
-			0,
-			G_MAXINT,
-			MAIL_CONFIG_HTTP_ALWAYS,
+			E_TYPE_MAIL_IMAGE_LOADING_POLICY,
+			E_MAIL_IMAGE_LOADING_POLICY_ALWAYS,
 			G_PARAM_READWRITE));
 
 	g_object_class_install_property (
@@ -1047,7 +1046,7 @@ em_format_html_load_images (EMFormatHTML *efh)
 {
 	g_return_if_fail (EM_IS_FORMAT_HTML (efh));
 
-	if (efh->priv->image_loading_policy == MAIL_CONFIG_HTTP_ALWAYS)
+	if (efh->priv->image_loading_policy == E_MAIL_IMAGE_LOADING_POLICY_ALWAYS)
 		return;
 
 	/* This will remain set while we're still
@@ -1121,7 +1120,7 @@ em_format_html_set_color (EMFormatHTML *efh,
 	g_object_notify (G_OBJECT (efh), property_name);
 }
 
-MailConfigHTTPMode
+EMailImageLoadingPolicy
 em_format_html_get_image_loading_policy (EMFormatHTML *efh)
 {
 	g_return_val_if_fail (EM_IS_FORMAT_HTML (efh), 0);
@@ -1131,7 +1130,7 @@ em_format_html_get_image_loading_policy (EMFormatHTML *efh)
 
 void
 em_format_html_set_image_loading_policy (EMFormatHTML *efh,
-                                         MailConfigHTTPMode policy)
+                                         EMailImageLoadingPolicy policy)
 {
 	g_return_if_fail (EM_IS_FORMAT_HTML (efh));
 
@@ -1420,14 +1419,14 @@ emfh_gethttp (struct _EMFormatHTMLJob *job,
 		instream = cistream = camel_data_cache_get (emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
 
 	if (instream == NULL) {
-		MailConfigHTTPMode policy;
+		EMailImageLoadingPolicy policy;
 		gchar *proxy;
 
 		policy = em_format_html_get_image_loading_policy (job->format);
 
 		if (!(job->format->priv->load_images_now
-		      || policy == MAIL_CONFIG_HTTP_ALWAYS
-		      || (policy == MAIL_CONFIG_HTTP_SOMETIMES
+		      || policy == E_MAIL_IMAGE_LOADING_POLICY_ALWAYS
+		      || (policy == E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES
 			  && em_utils_in_addressbook ((CamelInternetAddress *)camel_mime_message_get_from (job->format->parent.message), FALSE)))) {
 			/* TODO: Ideally we would put the http requests into another queue and only send them out
 			   if the user selects 'load images', when they do.  The problem is how to maintain this
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index bdfa62dfb9..01d7b02435 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -29,7 +29,7 @@
 #define EM_FORMAT_HTML_H
 
 #include <em-format/em-format.h>
-#include <mail/mail-config.h>
+#include <mail/e-mail-enums.h>
 #include <misc/e-web-view.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 
@@ -223,12 +223,12 @@ void		em_format_html_get_color	(EMFormatHTML *efh,
 void		em_format_html_set_color	(EMFormatHTML *efh,
 						 EMFormatHTMLColorType type,
 						 const GdkColor *color);
-MailConfigHTTPMode
+EMailImageLoadingPolicy
 		em_format_html_get_image_loading_policy
 						(EMFormatHTML *efh);
 void		em_format_html_set_image_loading_policy
 						(EMFormatHTML *efh,
-						 MailConfigHTTPMode policy);
+						 EMailImageLoadingPolicy policy);
 gboolean	em_format_html_get_mark_citations
 						(EMFormatHTML *efh);
 void		em_format_html_set_mark_citations
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 9e96abbec4..e9cdead6cf 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -985,7 +985,7 @@ em_utils_folder_is_templates (CamelFolder *folder, const gchar *uri)
 	gchar *templates_uri;
 
 	local_templates_folder =
-		e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES);
+		e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_TEMPLATES);
 
 	if (folder == local_templates_folder)
 		return TRUE;
@@ -1039,7 +1039,7 @@ em_utils_folder_is_drafts (CamelFolder *folder, const gchar *uri)
 	gchar *drafts_uri;
 
 	local_drafts_folder =
-		e_mail_local_get_folder (E_MAIL_FOLDER_DRAFTS);
+		e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_DRAFTS);
 
 	if (folder == local_drafts_folder)
 		return TRUE;
@@ -1092,7 +1092,7 @@ em_utils_folder_is_sent (CamelFolder *folder, const gchar *uri)
 	gint is = FALSE;
 	gchar *sent_uri;
 
-	local_sent_folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
+	local_sent_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_SENT);
 
 	if (folder == local_sent_folder)
 		return TRUE;
@@ -1141,9 +1141,9 @@ em_utils_folder_is_outbox (CamelFolder *folder, const gchar *uri)
 	const gchar *local_outbox_folder_uri;
 
 	local_outbox_folder =
-		e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+		e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 	local_outbox_folder_uri =
-		e_mail_local_get_folder_uri (E_MAIL_FOLDER_OUTBOX);
+		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_OUTBOX);
 
 	if (folder == local_outbox_folder)
 		return TRUE;
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index aba980188e..1354b9ba0b 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -120,7 +120,7 @@ mbox_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
 	}
 
 	if (!select_uri)
-		select_uri = g_strdup (e_mail_local_get_folder_uri (E_MAIL_FOLDER_INBOX));
+		select_uri = g_strdup (e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_INBOX));
 
 	hbox = gtk_hbox_new (FALSE, 0);
 
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index ff987f40c1..b4fb3c0431 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -121,7 +121,7 @@ import_mbox_exec (struct _import_mbox_msg *m)
 	}
 
 	if (m->uri == NULL || m->uri[0] == 0)
-		folder = e_mail_local_get_folder (E_MAIL_FOLDER_INBOX);
+		folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_INBOX);
 	else
 		folder = e_mail_session_uri_to_folder_sync (
 			m->session, m->uri, CAMEL_STORE_FOLDER_CREATE,
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 1789a17423..f5c107ddcc 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -370,9 +370,9 @@ mail_config_uri_deleted (GCompareFunc uri_cmp, const gchar *uri)
 
 	/* assumes these can't be removed ... */
 	local_drafts_folder_uri =
-		e_mail_local_get_folder_uri (E_MAIL_FOLDER_DRAFTS);
+		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS);
 	local_sent_folder_uri =
-		e_mail_local_get_folder_uri (E_MAIL_FOLDER_SENT);
+		e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_SENT);
 
 	account_list = e_get_account_list ();
 	iter = e_list_get_iterator ((EList *) account_list);
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 51ed266f4a..29038093cb 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -23,45 +23,10 @@
 #ifndef MAIL_CONFIG_H
 #define MAIL_CONFIG_H
 
-#include <gtk/gtk.h>
-#include <libedataserver/e-account.h>
-#include <libedataserver/e-account-list.h>
-
-#include <e-util/e-signature.h>
-#include <e-util/e-signature-list.h>
-
 #include <mail/e-mail-session.h>
 
 G_BEGIN_DECLS
 
-typedef enum {
-	MAIL_CONFIG_HTTP_NEVER,
-	MAIL_CONFIG_HTTP_SOMETIMES,
-	MAIL_CONFIG_HTTP_ALWAYS
-} MailConfigHTTPMode;
-
-typedef enum {
-	MAIL_CONFIG_FORWARD_ATTACHED,
-	MAIL_CONFIG_FORWARD_INLINE,
-	MAIL_CONFIG_FORWARD_QUOTED
-} MailConfigForwardStyle;
-
-typedef enum {
-	MAIL_CONFIG_REPLY_QUOTED,
-	MAIL_CONFIG_REPLY_DO_NOT_QUOTE,
-	MAIL_CONFIG_REPLY_ATTACH,
-	MAIL_CONFIG_REPLY_OUTLOOK
-} MailConfigReplyStyle;
-
-typedef enum {
-	MAIL_CONFIG_DISPLAY_NORMAL,
-	MAIL_CONFIG_DISPLAY_FULL_HEADERS,
-	MAIL_CONFIG_DISPLAY_SOURCE,
-	MAIL_CONFIG_DISPLAY_MAX
-} MailConfigDisplayStyle;
-
-GType		evolution_mail_config_get_type	(void);
-
 /* Configuration */
 void		mail_config_init		(EMailSession *session);
 void		mail_config_write		(void);
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 0cbcea511a..85b60ad364 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -345,9 +345,9 @@ folder_changed_cb (CamelFolder *folder,
 	latest_received = GPOINTER_TO_INT (
 		g_hash_table_lookup (last_newmail_per_folder, folder));
 
-	local_drafts = e_mail_local_get_folder (E_MAIL_FOLDER_DRAFTS);
-	local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
-	local_sent = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
+	local_drafts = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_DRAFTS);
+	local_outbox = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
+	local_sent = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_SENT);
 
 	if (!CAMEL_IS_VEE_FOLDER (folder)
 	    && folder != local_drafts
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 97a72aade0..2cdce4c598 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -230,7 +230,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m)
 	struct _filter_mail_msg *fm = (struct _filter_mail_msg *)m;
 	gint i;
 
-	fm->destination = e_mail_local_get_folder (E_MAIL_FOLDER_LOCAL_INBOX);
+	fm->destination = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_LOCAL_INBOX);
 	if (fm->destination == NULL)
 		goto fail;
 	g_object_ref (fm->destination);
@@ -625,7 +625,7 @@ mail_send_message (struct _send_queue_msg *m,
 		}
 
 		if (!folder) {
-			folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
+			folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_SENT);
 			g_object_ref (folder);
 		}
 
@@ -638,7 +638,7 @@ mail_send_message (struct _send_queue_msg *m,
 			if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
 				goto exit;
 
-			sent_folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
+			sent_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_SENT);
 
 			if (folder != sent_folder) {
 				const gchar *description;
@@ -741,7 +741,7 @@ send_queue_exec (struct _send_queue_msg *m)
 
 	d(printf("sending queue\n"));
 
-	sent_folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
+	sent_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_SENT);
 
 	if (!(uids = camel_folder_get_uids (m->queue)))
 		return;
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 88993d7b8d..3d303873cf 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -169,7 +169,7 @@ setup_send_data (void)
 			(GDestroyNotify) NULL,
 			(GDestroyNotify) free_folder_info);
 		data->inbox = e_mail_local_get_folder (
-			E_MAIL_FOLDER_LOCAL_INBOX);
+			E_MAIL_LOCAL_FOLDER_LOCAL_INBOX);
 		g_object_ref (data->inbox);
 		data->active = g_hash_table_new_full (
 			g_str_hash, g_str_equal,
@@ -763,7 +763,7 @@ receive_done (const gchar *uri, gpointer data)
 	if (info->type == SEND_SEND && info->state == SEND_ACTIVE && info->again) {
 		CamelFolder *local_outbox;
 
-		local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+		local_outbox = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 
 		info->again = 0;
 		mail_send_queue (
@@ -1033,7 +1033,7 @@ mail_send_receive (GtkWindow *parent,
 
 	accounts = e_get_account_list ();
 
-	local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+	local_outbox = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 	data = build_dialog (
 		parent, session, accounts,
 		local_outbox, account->transport->url);
@@ -1306,7 +1306,7 @@ mail_receive_uri (EMailSession *session,
 		break;
 	case SEND_SEND:
 		/* todo, store the folder in info? */
-		local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+		local_outbox = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 		mail_send_queue (
 			info->session,
 			local_outbox, info->uri,
@@ -1374,7 +1374,7 @@ mail_send (EMailSession *session)
 	g_hash_table_insert (data->active, (gpointer) SEND_URI_KEY, info);
 
 	/* todo, store the folder in info? */
-	local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+	local_outbox = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 	mail_send_queue (
 		session,
 		local_outbox, info->uri,
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index a47b422f46..eb447ea888 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -352,9 +352,9 @@ uri_is_ignore (CamelStore *store, const gchar *uri)
 	const gchar *local_sent_uri;
 	gint found = FALSE;
 
-	local_drafts_uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_DRAFTS);
-	local_outbox_uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_OUTBOX);
-	local_sent_uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_SENT);
+	local_drafts_uri = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS);
+	local_outbox_uri = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_OUTBOX);
+	local_sent_uri = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_SENT);
 
 	d(printf("checking '%s' against:\n  %s\n  %s\n  %s\n", uri,
 		local_outbox_uri,
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 522138a134..ff8f238b4a 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -611,16 +611,16 @@ emmp_empty_junk_init (EMMailerPrefs *prefs,
 static void
 http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs)
 {
-	gint when;
+	EMailImageLoadingPolicy policy;
 
 	if (gtk_toggle_button_get_active (prefs->images_always))
-		when = MAIL_CONFIG_HTTP_ALWAYS;
+		policy = E_MAIL_IMAGE_LOADING_POLICY_ALWAYS;
 	else if (gtk_toggle_button_get_active (prefs->images_sometimes))
-		when = MAIL_CONFIG_HTTP_SOMETIMES;
+		policy = E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES;
 	else
-		when = MAIL_CONFIG_HTTP_NEVER;
+		policy = E_MAIL_IMAGE_LOADING_POLICY_NEVER;
 
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", when, NULL);
+	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", policy, NULL);
 }
 
 static GtkWidget *
@@ -929,17 +929,17 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 
 	val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", NULL);
 	prefs->images_never = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "radImagesNever"));
-	gtk_toggle_button_set_active (prefs->images_never, val == MAIL_CONFIG_HTTP_NEVER);
+	gtk_toggle_button_set_active (prefs->images_never, val == E_MAIL_IMAGE_LOADING_POLICY_NEVER);
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->images_never, FALSE);
 
 	prefs->images_sometimes = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "radImagesSometimes"));
-	gtk_toggle_button_set_active (prefs->images_sometimes, val == MAIL_CONFIG_HTTP_SOMETIMES);
+	gtk_toggle_button_set_active (prefs->images_sometimes, val == E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES);
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->images_sometimes, FALSE);
 
 	prefs->images_always = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "radImagesAlways"));
-	gtk_toggle_button_set_active (prefs->images_always, val == MAIL_CONFIG_HTTP_ALWAYS);
+	gtk_toggle_button_set_active (prefs->images_always, val == E_MAIL_IMAGE_LOADING_POLICY_ALWAYS);
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->images_always, FALSE);
 
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c
index 3079442ad6..28db6b175f 100644
--- a/plugins/dbx-import/dbx-importer.c
+++ b/plugins/dbx-import/dbx-importer.c
@@ -220,7 +220,7 @@ org_gnome_evolution_readdbx_getwidget (EImport *ei, EImportTarget *target, EImpo
 	}
 #endif
 	if (!select_uri)
-		select_uri = g_strdup (e_mail_local_get_folder_uri (E_MAIL_FOLDER_INBOX));
+		select_uri = g_strdup (e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_INBOX));
 
 	hbox = gtk_hbox_new (FALSE, 0);
 
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index e9203d1dd7..2e994f78e4 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -234,7 +234,7 @@ get_suggested_foldername (EImportTargetURI *target)
 
 	/* Suggest a folder that is in the same mail storage as the users' inbox,
 	   with a name derived from the .PST file */
-	inbox = e_mail_local_get_folder_uri (E_MAIL_FOLDER_INBOX);
+	inbox = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_INBOX);
 
 	delim = g_strrstr (inbox, "#");
 	if (delim != NULL) {
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index a2bac3dec9..815ee69882 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -479,7 +479,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes
 	/* FIXME Pass this in somehow. */
 	shell = e_shell_get_default ();
 
-	folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES);
+	folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_TEMPLATES);
 	template = g_object_get_data (G_OBJECT (action), "template");
 
 	/* The new message we are creating */
@@ -700,7 +700,7 @@ got_message_draft_cb (EMsgComposer *composer,
 	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
 
 	/* Get the templates folder and all UIDs of the messages there. */
-	folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES);
+	folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_TEMPLATES);
 
 	info = camel_message_info_new (NULL);
 
@@ -778,7 +778,8 @@ update_actions_cb (EShellView *shell_view)
 	/* Now recursively build template submenus in the pop-up menu. */
 
 	store = e_mail_local_get_store ();
-	templates_folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES);
+	templates_folder = e_mail_local_get_folder (
+		E_MAIL_LOCAL_FOLDER_TEMPLATES);
 	full_name = camel_folder_get_full_name (templates_folder);
 
 	/* FIXME Not passing a GCancellable or GError here. */