removed unused files

svn path=/trunk/; revision=23068

2 files changed, 0 insertions, 3372 deletions

diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
deleted file mode 100644
index cfb657b542..0000000000
--- a/mail/mail-callbacks.c
+++ /dev/null
@@ -1,3228 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-ops.c: callbacks for the mail toolbar/menus */
-
-/* 
- * Authors: 
- *  Dan Winship <danw@ximian.com>
- *  Peter Williams <peterw@ximian.com>
- *  Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-#include <errno.h>
-
-#include <gtkhtml/gtkhtml.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
-#include <gtk/gtkmessagedialog.h>
-
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-
-#include <bonobo/bonobo-widget.h>
-#include <bonobo/bonobo-socket.h>
-#include <gal/e-table/e-table.h>
-#include <e-util/e-dialog-utils.h>
-#include <filter/filter-editor.h>
-
-#include "mail.h"
-#include "message-browser.h"
-#include "mail-callbacks.h"
-#include "mail-component.h"
-#include "mail-config.h"
-#include "mail-accounts.h"
-#include "mail-config-druid.h"
-#include "mail-mt.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-local.h"
-#include "mail-search.h"
-#include "mail-send-recv.h"
-#include "mail-vfolder.h"
-#include "mail-folder-cache.h"
-#include "folder-browser.h"
-#include "subscribe-dialog.h"
-#include "message-tag-editor.h"
-#include "message-tag-followup.h"
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-client.h"
-
-#define d(x) x
-
-#define FB_WINDOW(fb) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (fb), GTK_TYPE_WINDOW))
-
-
-/* default is default gtk response
-   if again is != NULL, a checkbox "dont show this again" will appear, and the result stored in *again
-*/
-static gboolean
-e_question (GtkWindow *parent, int def, gboolean *again, const char *fmt, ...)
-{
-	GtkWidget *mbox, *check = NULL;
-	va_list ap;
-	int button;
-	char *str;
-	
-	va_start (ap, fmt);
-	str = g_strdup_vprintf (fmt, ap);
-	va_end (ap);
-	mbox = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT,
-				       GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-				       "%s", str);
-	g_free (str);
-	gtk_dialog_set_default_response ((GtkDialog *) mbox, def);
-	if (again) {
-		check = gtk_check_button_new_with_label (_("Don't show this message again."));
-		gtk_box_pack_start ((GtkBox *)((GtkDialog *) mbox)->vbox, check, TRUE, TRUE, 10);
-		gtk_widget_show (check);
-	}
-	
-	button = gtk_dialog_run ((GtkDialog *) mbox);
-	if (again)
-		*again = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
-	gtk_widget_destroy (mbox);
-	
-	return button == GTK_RESPONSE_YES;
-}
-
-
-struct _composer_callback_data {
-	unsigned int ref_count;
-	
-	CamelFolder *drafts_folder;
-	char *drafts_uid;
-	
-	CamelFolder *folder;
-	guint32 flags, set;
-	char *uid;
-};
-
-static struct _composer_callback_data *
-ccd_new (void)
-{
-	struct _composer_callback_data *ccd;
-	
-	ccd = g_new (struct _composer_callback_data, 1);
-	ccd->ref_count = 1;
-	ccd->drafts_folder = NULL;
-	ccd->drafts_uid = NULL;
-	ccd->folder = NULL;
-	ccd->flags = 0;
-	ccd->set = 0;
-	ccd->uid = NULL;
-	
-	return ccd;
-}
-
-static void
-free_ccd (struct _composer_callback_data *ccd)
-{
-	if (ccd->drafts_folder)
-		camel_object_unref (ccd->drafts_folder);
-	g_free (ccd->drafts_uid);
-	
-	if (ccd->folder)
-		camel_object_unref (ccd->folder);
-	g_free (ccd->uid);
-	g_free (ccd);
-}
-
-static void
-ccd_ref (struct _composer_callback_data *ccd)
-{
-	ccd->ref_count++;
-}
-
-static void
-ccd_unref (struct _composer_callback_data *ccd)
-{
-	ccd->ref_count--;
-	if (ccd->ref_count == 0)
-		free_ccd (ccd);
-}
-
-
-static void
-composer_destroy_cb (gpointer user_data, GObject *deadbeef)
-{
-	ccd_unref (user_data);
-}
-
-
-static void
-druid_destroy_cb (gpointer user_data, GObject *deadbeef)
-{
-	gtk_main_quit ();
-}
-
-static gboolean
-configure_mail (FolderBrowser *fb)
-{
-	MailConfigDruid *druid;
-	
-	if (e_question (FB_WINDOW (fb), GTK_RESPONSE_YES, NULL,
-			_("You have not configured the mail client.\n"
-			  "You need to do this before you can send,\n"
-			  "receive or compose mail.\n"
-			  "Would you like to configure it now?"))) {
-		druid = mail_config_druid_new ();
-		g_object_weak_ref ((GObject *) druid, (GWeakNotify) druid_destroy_cb, NULL);
-		gtk_widget_show ((GtkWidget *) druid);
-		gtk_grab_add ((GtkWidget *) druid);
-		gtk_main ();
-	}
-	
-	return mail_config_is_configured ();
-}
-
-static gboolean
-check_send_configuration (FolderBrowser *fb)
-{
-	EAccount *account;
-	
-	if (!mail_config_is_configured ()) {
-		if (fb == NULL) {
-			e_notice (NULL, GTK_MESSAGE_WARNING,
-				  _("You need to configure an account\nbefore you can compose mail."));
-			return FALSE;
-		}
-		
-		if (!configure_mail (fb))
-			return FALSE;
-	}
-	
-	/* Get the default account */
-	account = mail_config_get_default_account ();
-	
-	/* Check for an identity */
-	if (!account) {
-		e_notice (FB_WINDOW (fb), GTK_MESSAGE_WARNING,
-			  _("You need to configure an identity\nbefore you can compose mail."));
-		return FALSE;
-	}
-	
-	/* Check for a transport */
-	if (!account->transport->url) {
-		e_notice (FB_WINDOW (fb), GTK_MESSAGE_WARNING,
-			  _("You need to configure a mail transport\n"
-			    "before you can compose mail."));
-		return FALSE;
-	}
-	
-	return TRUE;
-}
-
-static gboolean
-ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recipients)
-{
-	gboolean show_again, res;
-	GConfClient *gconf;
-	GString *str;
-	int i;
-	
-	gconf = mail_config_get_gconf_client ();
-	
-	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/unwanted_html", NULL))
-		return TRUE;
-	
-	/* FIXME: this wording sucks */
-	str = g_string_new (_("You are sending an HTML-formatted message. Please make sure that\n"
-			      "the following recipients are willing and able to receive HTML mail:\n"));
-	for (i = 0; recipients[i] != NULL; ++i) {
-		if (!e_destination_get_html_mail_pref (recipients[i])) {
-			const char *name;
-			
-			name = e_destination_get_textrep (recipients[i], FALSE);
-			
-			g_string_append_printf (str, "     %s\n", name);
-		}
-	}
-	
-	g_string_append (str, _("Send anyway?"));
-	res = e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, &show_again, "%s", str->str);
-	g_string_free (str, TRUE);
-	
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/prompts/unwanted_html", show_again, NULL);
-	
-	return res;
-}
-
-static gboolean
-ask_confirm_for_empty_subject (EMsgComposer *composer)
-{
-	gboolean show_again, res;
-	GConfClient *gconf;
-	
-	gconf = mail_config_get_gconf_client ();
-	
-	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/empty_subject", NULL))
-		return TRUE;
-	
-	res = e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, &show_again,
-			  _("This message has no subject.\nReally send?"));
-	
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/prompts/empty_subject", show_again, NULL);
-	
-	return res;
-}
-
-static gboolean
-ask_confirm_for_only_bcc (EMsgComposer *composer, gboolean hidden_list_case)
-{
-	gboolean show_again, res;
-	const char *first_text;
-	GConfClient *gconf;
-	
-	gconf = mail_config_get_gconf_client ();
-	
-	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/only_bcc", NULL))
-		return TRUE;
-	
-	/* If the user is mailing a hidden contact list, it is possible for
-	   them to create a message with only Bcc recipients without really
-	   realizing it.  To try to avoid being totally confusing, I've changed
-	   this dialog to provide slightly different text in that case, to
-	   better explain what the hell is going on. */
-	
-	if (hidden_list_case) {
-		first_text =  _("Since the contact list you are sending to "
-				"is configured to hide the list's addresses, "
-				"this message will contain only Bcc recipients.");
-	} else {
-		first_text = _("This message contains only Bcc recipients.");
-	}
-	
-	res = e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, &show_again,
-			  "%s\n%s", first_text,
-			  _("It is possible that the mail server may reveal the recipients "
-			    "by adding an Apparently-To header.\nSend anyway?"));
-	
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/prompts/only_bcc", show_again, NULL);
-	
-	return res;
-}
-
-
-struct _send_data {
-	struct _composer_callback_data *ccd;
-	EMsgComposer *composer;
-	gboolean send;
-};
-
-static void
-composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info,
-			 int queued, const char *appended_uid, void *data)
-{
-	struct _composer_callback_data *ccd;
-	struct _send_data *send = data;
-	
-	ccd = send->ccd;
-	
-	if (queued) {
-		if (ccd && ccd->drafts_folder) {
-			/* delete the old draft message */
-			camel_folder_set_message_flags (ccd->drafts_folder, ccd->drafts_uid,
-							CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
-							CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
-			camel_object_unref (ccd->drafts_folder);
-			ccd->drafts_folder = NULL;
-			g_free (ccd->drafts_uid);
-			ccd->drafts_uid = NULL;
-		}
-		
-		if (ccd && ccd->folder) {
-			/* set any replied flags etc */
-			camel_folder_set_message_flags (ccd->folder, ccd->uid, ccd->flags, ccd->set);
-			camel_object_unref (ccd->folder);
-			ccd->folder = NULL;
-			g_free (ccd->uid);
-			ccd->uid = NULL;
-		}
-
-		gtk_widget_destroy (GTK_WIDGET (send->composer));
-		
-		if (send->send && camel_session_is_online (session)) {
-			/* queue a message send */
-			mail_send ();
-		}
-	} else {
-		if (!ccd) {
-			ccd = ccd_new ();
-			
-			/* disconnect the previous signal handlers */
-			g_signal_handlers_disconnect_matched(send->composer, G_SIGNAL_MATCH_FUNC, 0,
-							     0, NULL, composer_send_cb, NULL);
-			g_signal_handlers_disconnect_matched(send->composer, G_SIGNAL_MATCH_FUNC, 0,
-							     0, NULL, composer_save_draft_cb, NULL);
-			
-			/* reconnect to the signals using a non-NULL ccd for the callback data */
-			g_signal_connect (send->composer, "send", G_CALLBACK (composer_send_cb), ccd);
-			g_signal_connect (send->composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-			
-			g_object_weak_ref ((GObject *) send->composer, (GWeakNotify) composer_destroy_cb, ccd);
-		}
-		
-		e_msg_composer_set_enable_autosave (send->composer, TRUE);
-		gtk_widget_show (GTK_WIDGET (send->composer));
-	}
-	
-	camel_message_info_free (info);
-	
-	if (send->ccd)
-		ccd_unref (send->ccd);
-	
-	g_object_unref(send->composer);
-	g_free (send);
-}
-
-static CamelMimeMessage *
-composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_object_data)
-{
-	CamelMimeMessage *message = NULL;
-	EDestination **recipients, **recipients_bcc;
-	gboolean send_html, confirm_html;
-	CamelInternetAddress *cia;
-	int hidden = 0, shown = 0;
-	int num = 0, num_bcc = 0;
-	const char *subject;
-	GConfClient *gconf;
-	EAccount *account;
-	int i;
-	
-	gconf = mail_config_get_gconf_client ();
-	
-	/* We should do all of the validity checks based on the composer, and not on
-	   the created message, as extra interaction may occur when we get the message
-	   (e.g. to get a passphrase to sign a message) */
-	
-	/* get the message recipients */
-	recipients = e_msg_composer_get_recipients (composer);
-	
-	cia = camel_internet_address_new ();
-	
-	/* see which ones are visible/present, etc */
-	if (recipients) {
-		for (i = 0; recipients[i] != NULL; i++) {
-			const char *addr = e_destination_get_address (recipients[i]);
-			
-			if (addr && addr[0]) {
-				camel_address_decode ((CamelAddress *) cia, addr);
-				if (camel_address_length ((CamelAddress *) cia) > 0) {
-					camel_address_remove ((CamelAddress *) cia, -1);
-					num++;
-					if (e_destination_is_evolution_list (recipients[i])
-					    && !e_destination_list_show_addresses (recipients[i])) {
-						hidden++;
-					} else {
-						shown++;
-					}
-				}
-			}
-		}
-	}
-	
-	recipients_bcc = e_msg_composer_get_bcc (composer);
-	if (recipients_bcc) {
-		for (i = 0; recipients_bcc[i] != NULL; i++) {
-			const char *addr = e_destination_get_address (recipients_bcc[i]);
-			
-			if (addr && addr[0]) {
-				camel_address_decode ((CamelAddress *) cia, addr);
-				if (camel_address_length ((CamelAddress *) cia) > 0) {
-					camel_address_remove ((CamelAddress *) cia, -1);
-					num_bcc++;
-				}
-			}
-		}
-		
-		e_destination_freev (recipients_bcc);
-	}
-	
-	camel_object_unref (cia);
-	
-	/* I'm sensing a lack of love, er, I mean recipients. */
-	if (num == 0 && !post) {
-		e_notice ((GtkWindow *) composer, GTK_MESSAGE_WARNING,
-			  _("You must specify recipients in order to send this message."));
-		goto finished;
-	}
-	
-	if (num > 0 && (num == num_bcc || shown == 0)) {
-		/* this means that the only recipients are Bcc's */		
-		if (!ask_confirm_for_only_bcc (composer, shown == 0))
-			goto finished;
-	}
-	
-	send_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/send_html", NULL);
-	confirm_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/unwanted_html", NULL);
-	
-	/* Only show this warning if our default is to send html.  If it isn't, we've
-	   manually switched into html mode in the composer and (presumably) had a good
-	   reason for doing this. */
-	if (e_msg_composer_get_send_html (composer) && send_html && confirm_html) {
-		gboolean html_problem = FALSE;
-		
-		if (recipients) {
-			for (i = 0; recipients[i] != NULL && !html_problem; i++) {
-				if (!e_destination_get_html_mail_pref (recipients[i]))
-					html_problem = TRUE;
-			}
-		}
-		
-		if (html_problem) {
-			html_problem = !ask_confirm_for_unwanted_html_mail (composer, recipients);
-			if (html_problem)
-				goto finished;
-		}
-	}
-	
-	/* Check for no subject */
-	subject = e_msg_composer_get_subject (composer);
-	if (subject == NULL || subject[0] == '\0') {
-		if (!ask_confirm_for_empty_subject (composer))
-			goto finished;
-	}
-	
-	/* actually get the message now, this will sign/encrypt etc */
-	message = e_msg_composer_get_message (composer, save_html_object_data);
-	if (message == NULL)
-		goto finished;
-	
-	/* Add info about the sending account */
-	account = e_msg_composer_get_preferred_account (composer);
-	
-	if (account) {
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Account", account->name);
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Transport", account->transport->url);
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc", account->sent_folder_uri);
-		if (account->id->organization && *account->id->organization)
-			camel_medium_set_header (CAMEL_MEDIUM (message), "Organization", account->id->organization);
-	}
-	
-	/* Get the message recipients and 'touch' them, boosting their use scores */
-	if (recipients)
-		e_destination_touchv (recipients);
-	
- finished:
-	
-	if (recipients)
-		e_destination_freev (recipients);
-	
-	return message;
-}
-
-static void
-got_post_folder (char *uri, CamelFolder *folder, void *data)
-{
-	CamelFolder **fp = data;
-	
-	*fp = folder;
-	
-	if (folder)
-		camel_object_ref (folder);
-}
-
-void
-composer_send_cb (EMsgComposer *composer, gpointer user_data)
-{
-	extern CamelFolder *outbox_folder;
-	CamelMimeMessage *message;
-	CamelMessageInfo *info;
-	struct _send_data *send;
-	gboolean post = FALSE;
-	CamelFolder *folder;
-	XEvolution *xev;
-	char *url;
-	
-	url = e_msg_composer_hdrs_get_post_to ((EMsgComposerHdrs *) composer->hdrs);
-	if (url && *url) {
-		post = TRUE;
-		
-		mail_msg_wait (mail_get_folder (url, 0, got_post_folder, &folder, mail_thread_new));
-		
-		if (!folder) {
-			g_free (url);
-			return;
-		}
-	} else {
-		folder = outbox_folder;
-		camel_object_ref (folder);
-	}
-	
-	g_free (url);
-	
-	message = composer_get_message (composer, post, FALSE);
-	if (!message)
-		return;
-	
-	if (post) {
-		/* Remove the X-Evolution* headers if we are in Post-To mode */
-		xev = mail_tool_remove_xevolution_headers (message);
-		mail_tool_destroy_xevolution (xev);
-	}
-	
-	info = camel_message_info_new ();
-	info->flags = CAMEL_MESSAGE_SEEN;
-	
-	send = g_malloc (sizeof (*send));
-	send->ccd = user_data;
-	if (send->ccd)
-		ccd_ref (send->ccd);
-	send->send = !post;
-	send->composer = composer;
-	g_object_ref (composer);
-	gtk_widget_hide (GTK_WIDGET (composer));
-	
-	e_msg_composer_set_enable_autosave (composer, FALSE);
-	
-	mail_append_mail (folder, message, info, composer_send_queued_cb, send);
-	camel_object_unref (message);
-	camel_object_unref (folder);
-}
-
-struct _save_draft_info {
-	struct _composer_callback_data *ccd;
-	EMsgComposer *composer;
-	int quit;
-};
-
-static void
-save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok,
-		 const char *appended_uid, void *user_data)
-{
-	struct _save_draft_info *sdi = user_data;
-	struct _composer_callback_data *ccd;
-	CORBA_Environment ev;
-	
-	if (!ok)
-		goto done;
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (sdi->composer->editor_engine, "saved", &ev);
-	CORBA_exception_free (&ev);
-	
-	if ((ccd = sdi->ccd) == NULL) {
-		ccd = ccd_new ();
-		
-		/* disconnect the previous signal handlers */
-		g_signal_handlers_disconnect_by_func (sdi->composer, G_CALLBACK (composer_send_cb), NULL);
-		g_signal_handlers_disconnect_by_func (sdi->composer, G_CALLBACK (composer_save_draft_cb), NULL);
-		
-		/* reconnect to the signals using a non-NULL ccd for the callback data */
-		g_signal_connect (sdi->composer, "send", G_CALLBACK (composer_send_cb), ccd);
-		g_signal_connect (sdi->composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-		
-		g_object_weak_ref ((GObject *) sdi->composer, (GWeakNotify) composer_destroy_cb, ccd);
-	}
-	
-	if (ccd->drafts_folder) {
-		/* delete the original draft message */
-		camel_folder_set_message_flags (ccd->drafts_folder, ccd->drafts_uid,
-						CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
-						CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
-		camel_object_unref (ccd->drafts_folder);
-		ccd->drafts_folder = NULL;
-		g_free (ccd->drafts_uid);
-		ccd->drafts_uid = NULL;
-	}
-	
-	if (ccd->folder) {
-		/* set the replied flags etc */
-		camel_folder_set_message_flags (ccd->folder, ccd->uid, ccd->flags, ccd->set);
-		camel_object_unref (ccd->folder);
-		ccd->folder = NULL;
-		g_free (ccd->uid);
-		ccd->uid = NULL;
-	}
-	
-	if (appended_uid) {
-		camel_object_ref (folder);
-		ccd->drafts_folder = folder;
-		ccd->drafts_uid = g_strdup (appended_uid);
-	}
-	
-	if (sdi->quit)
-		gtk_widget_destroy (GTK_WIDGET (sdi->composer));
-	
- done:
-	g_object_unref (sdi->composer);
-	if (sdi->ccd)
-		ccd_unref (sdi->ccd);
-	g_free (info);
-	g_free (sdi);
-}
-
-static void
-save_draft_folder (char *uri, CamelFolder *folder, gpointer data)
-{
-	CamelFolder **save = data;
-	
-	if (folder) {
-		*save = folder;
-		camel_object_ref (folder);
-	}
-}
-
-void
-composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer user_data)
-{
-	extern char *default_drafts_folder_uri;
-	extern CamelFolder *drafts_folder;
-	struct _save_draft_info *sdi;
-	CamelFolder *folder = NULL;
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info;
-	EAccount *account;
-	
-	account = e_msg_composer_get_preferred_account (composer);
-	if (account && account->drafts_folder_uri &&
-	    strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) {
-		int id;
-		
-		id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new);
-		mail_msg_wait (id);
-		
-		if (!folder) {
-			if (!e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, NULL,
-					 _("Unable to open the drafts folder for this account.\n"
-					   "Would you like to use the default drafts folder?")))
-				return;
-			
-			folder = drafts_folder;
-			camel_object_ref (drafts_folder);
-		}
-	} else {
-		folder = drafts_folder;
-		camel_object_ref (folder);
-	}
-	
-	msg = e_msg_composer_get_message_draft (composer);
-	
-	info = g_new0 (CamelMessageInfo, 1);
-	info->flags = CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_SEEN;
-	
-	sdi = g_malloc (sizeof (struct _save_draft_info));
-	sdi->composer = composer;
-	g_object_ref (composer);
-	sdi->ccd = user_data;
-	if (sdi->ccd)
-		ccd_ref (sdi->ccd);
-	sdi->quit = quit;
-	
-	mail_append_mail (folder, msg, info, save_draft_done, sdi);
-	camel_object_unref (folder);
-	camel_object_unref (msg);
-}
-
-static GtkWidget *
-create_msg_composer (EAccount *account, gboolean post, const char *url)
-{
-	EMsgComposer *composer;
-	GConfClient *gconf;
-	gboolean send_html;
-	
-	/* Make sure that we've actually been passed in an account. If one has
-	 * not been passed in, grab the default account.
-	 */
-	if (account == NULL)
-		account = mail_config_get_default_account ();
-	
-	gconf = mail_config_get_gconf_client ();
-	send_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/send_html", NULL);
-	
-	if (post)
-		composer = e_msg_composer_new_post ();
-	else if (url)
-		composer = e_msg_composer_new_from_url (url);
-	else
-		composer = e_msg_composer_new ();
-	
-	if (composer) {
-		e_msg_composer_hdrs_set_from_account (E_MSG_COMPOSER_HDRS (composer->hdrs), account->name);
-		e_msg_composer_set_send_html (composer, send_html);
-		e_msg_composer_unset_changed (composer);
-		e_msg_composer_drop_editor_undo (composer);
-		return GTK_WIDGET (composer);
-	} else
-		return NULL;
-}
-
-void
-compose_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	struct _composer_callback_data *ccd;
-	GtkWidget *composer;
-	EAccount *account;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
-		return;
-	
-	/* Figure out which account we want to initially compose from */
-	account = mail_config_get_account_by_source_url (fb->uri);
-	
-	composer = create_msg_composer (account, FALSE, NULL);
-	if (!composer)
-		return;
-	
-	ccd = ccd_new ();
-	
-	g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
-	g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-	
-	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
-	
-	gtk_widget_show (composer);
-}
-
-/* Send according to a mailto (RFC 2368) URL. */
-void
-send_to_url (const char *url, const char *parent_uri)
-{
-	struct _composer_callback_data *ccd;
-	GtkWidget *composer;
-	EAccount *account = NULL;
-	
-	/* FIXME: no way to get folder browser? Not without
-	 * big pain in the ass, as far as I can tell */
-	if (!check_send_configuration (NULL))
-		return;
-	
-	if (parent_uri)
-		account = mail_config_get_account_by_source_url (parent_uri);
-	
-	composer = create_msg_composer (account, FALSE, url);
-	
-	if (!composer)
-		return;
-	
-	ccd = ccd_new ();
-	
-	g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
-	g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-	
-	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
-	
-	gtk_widget_show (composer);
-}	
-
-static GList *
-list_add_addresses (GList *list, const CamelInternetAddress *cia, GHashTable *account_hash,
-		    GHashTable *rcpt_hash, EAccount **me)
-{
-	const char *name, *addr;
-	EAccount *account;
-	int i;
-	
-	for (i = 0; camel_internet_address_get (cia, i, &name, &addr); i++) {
-		/* Here I'll check to see if the cc:'d address is the address
-		   of the sender, and if so, don't add it to the cc: list; this
-		   is to fix Bugzilla bug #455. */
-		account = g_hash_table_lookup (account_hash, addr);
-		if (account && me && !*me)
-			*me = account;
-		
-		if (!account && !g_hash_table_lookup (rcpt_hash, addr)) {
-			EDestination *dest;
-			
-			dest = e_destination_new ();
-			e_destination_set_name (dest, name);
-			e_destination_set_email (dest, addr);
-			
-			list = g_list_append (list, dest);
-			g_hash_table_insert (rcpt_hash, (char *) addr, GINT_TO_POINTER (1));
-		}
-	}
-	
-	return list;
-}
-
-static EAccount *
-guess_me (const CamelInternetAddress *to, const CamelInternetAddress *cc, GHashTable *account_hash)
-{
-	EAccount *account = NULL;
-	const char *addr;
-	int i;
-	
-	/* "optimization" */
-	if (!to && !cc)
-		return NULL;
-	
-	if (to) {
-		for (i = 0; camel_internet_address_get (to, i, NULL, &addr); i++) {
-			account = g_hash_table_lookup (account_hash, addr);
-			if (account)
-				goto found;
-		}
-	}
-	
-	if (cc) {
-		for (i = 0; camel_internet_address_get (cc, i, NULL, &addr); i++) {
-			account = g_hash_table_lookup (account_hash, addr);
-			if (account)
-				goto found;
-		}
-	}
-	
- found:
-	
-	return account;
-}
-
-static EAccount *
-guess_me_from_accounts (const CamelInternetAddress *to, const CamelInternetAddress *cc, EAccountList *accounts)
-{
-	EAccount *account, *def;
-	GHashTable *account_hash;
-	EIterator *iter;
-	
-	account_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-	
-	/* add the default account to the hash first */
-	if ((def = mail_config_get_default_account ())) {
-		if (def->id->address)
-			g_hash_table_insert (account_hash, (char *) def->id->address, (void *) def);
-	}
-	
-	iter = e_list_get_iterator ((EList *) accounts);
-	while (e_iterator_is_valid (iter)) {
-		account = (EAccount *) e_iterator_get (iter);
-		
-		if (account->id->address) {
-			EAccount *acnt;
-			
-			/* Accounts with identical email addresses that are enabled
-			 * take precedence over the accounts that aren't. If all
-			 * accounts with matching email addresses are disabled, then
-			 * the first one in the list takes precedence. The default
-			 * account always takes precedence no matter what.
-			 */
-			acnt = g_hash_table_lookup (account_hash, account->id->address);
-			if (acnt && acnt != def && !acnt->enabled && account->enabled) {
-				g_hash_table_remove (account_hash, acnt->id->address);
-				acnt = NULL;
-			}
-			
-			if (!acnt)
-				g_hash_table_insert (account_hash, (char *) account->id->address, (void *) account);
-		}
-		
-		e_iterator_next (iter);
-	}
-	
-	g_object_unref (iter);
-	
-	account = guess_me (to, cc, account_hash);
-	
-	g_hash_table_destroy (account_hash);
-	
-	return account;
-}
-
-inline static void
-mail_ignore (EMsgComposer *composer, const char *name, const char *address)
-{
-	e_msg_composer_ignore (composer, name && *name ? name : address);
-}
-
-static void
-mail_ignore_address (EMsgComposer *composer, const CamelInternetAddress *addr)
-{
-	const char *name, *address;
-	int i, max;
-	
-	max = camel_address_length (CAMEL_ADDRESS (addr));
-	for (i = 0; i < max; i++) {
-		camel_internet_address_get (addr, i, &name, &address);
-		mail_ignore (composer, name, address);
-	}
-}
-
-#define MAX_SUBJECT_LEN  1024
-
-static EMsgComposer *
-mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char *uid, int mode)
-{
-	const CamelInternetAddress *reply_to, *sender, *to_addrs, *cc_addrs;
-	const char *name = NULL, *address = NULL, *source = NULL;
-	const char *message_id, *references, *mlist = NULL;
-	char *text = NULL, *subject, format[256];
-	EAccount *def, *account, *me = NULL;
-	EAccountList *accounts = NULL;
-	GHashTable *account_hash = NULL;
-	CamelMessageInfo *info = NULL;
-	GList *to = NULL, *cc = NULL;
-	EDestination **tov, **ccv;
-	EMsgComposer *composer;
-	CamelMimePart *part;
-	GConfClient *gconf;
-	EIterator *iter;
-	time_t date;
-	int date_ofs;
-	char *url;
-	
-	gconf = mail_config_get_gconf_client ();
-	
-	if (mode == REPLY_POST) {
-		composer = e_msg_composer_new_post ();
-		if (composer != NULL) {
-			url = mail_tools_folder_to_url (folder);
-			e_msg_composer_hdrs_set_post_to ((EMsgComposerHdrs *) composer->hdrs, url);
-			g_free (url);
-		}
-	} else
-		composer = e_msg_composer_new ();
-	
-	if (!composer)
-		return NULL;
-	
-	e_msg_composer_add_message_attachments (composer, message, TRUE);
-	
-	/* Set the recipients */
-	accounts = mail_config_get_accounts ();
-	account_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-	
-	/* add the default account to the hash first */
-	if ((def = mail_config_get_default_account ())) {
-		if (def->id->address)
-			g_hash_table_insert (account_hash, (char *) def->id->address, (void *) def);
-	}
-	
-	iter = e_list_get_iterator ((EList *) accounts);
-	while (e_iterator_is_valid (iter)) {
-		account = (EAccount *) e_iterator_get (iter);
-		
-		if (account->id->address) {
-			EAccount *acnt;
-			
-			/* Accounts with identical email addresses that are enabled
-			 * take precedence over the accounts that aren't. If all
-			 * accounts with matching email addresses are disabled, then
-			 * the first one in the list takes precedence. The default
-			 * account always takes precedence no matter what.
-			 */
-			acnt = g_hash_table_lookup (account_hash, account->id->address);
-			if (acnt && acnt != def && !acnt->enabled && account->enabled) {
-				g_hash_table_remove (account_hash, acnt->id->address);
-				acnt = NULL;
-			}
-			
-			if (!acnt)
-				g_hash_table_insert (account_hash, (char *) account->id->address, (void *) account);
-		}
-		
-		e_iterator_next (iter);
-	}
-	
-	g_object_unref (iter);
-	
-	to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-	cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
-	mail_ignore_address (composer, to_addrs);
-	mail_ignore_address (composer, cc_addrs);
-	
-	if (mode == REPLY_LIST) {
-		/* make sure we can reply to an mlist */
-		info = camel_folder_get_message_info (folder, uid);
-		if (!(mlist = camel_message_info_mlist (info)) || *mlist == '\0') {
-			camel_folder_free_message_info (folder, info);
-			mode = REPLY_ALL;
-			info = NULL;
-		}
-	}
-	
- determine_recipients:
-	if (mode == REPLY_LIST) {
-		EDestination *dest;
-		int i, max;
-		
-		/* look through the recipients to find the *real* mailing list address */
-		d(printf ("we are looking for the mailing list called: %s\n", mlist));
-		
-		max = camel_address_length (CAMEL_ADDRESS (to_addrs));
-		for (i = 0; i < max; i++) {
-			camel_internet_address_get (to_addrs, i, &name, &address);
-			if (!strcasecmp (address, mlist))
-				break;
-		}
-		
-		if (i == max) {
-			max = camel_address_length (CAMEL_ADDRESS (cc_addrs));
-			for (i = 0; i < max; i++) {
-				camel_internet_address_get (cc_addrs, i, &name, &address);
-				if (!strcasecmp (address, mlist))
-					break;
-			}
-		}
-		
-		if (address && i != max) {
-			dest = e_destination_new ();
-			e_destination_set_name (dest, name);
-			e_destination_set_email (dest, address);
-			
-			to = g_list_append (to, dest);
-		} else {
-			/* mailing list address wasn't found */
-			if (strchr (mlist, '@')) {
-				/* mlist string has an @, maybe it's valid? */
-				dest = e_destination_new ();
-				e_destination_set_email (dest, mlist);
-				
-				to = g_list_append (to, dest);
-			} else {
-				/* give up and just reply to all recipients? */
-				mode = REPLY_ALL;
-				camel_folder_free_message_info (folder, info);
-				goto determine_recipients;
-			}
-		}
-		
-		me = guess_me (to_addrs, cc_addrs, account_hash);
-		camel_folder_free_message_info (folder, info);
-	} else {
-		GHashTable *rcpt_hash;
-		EDestination *dest;
-		
-		rcpt_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-		
-		reply_to = camel_mime_message_get_reply_to (message);
-		if (!reply_to)
-			reply_to = camel_mime_message_get_from (message);
-		
-		if (reply_to) {
-			int i;
-			
-			for (i = 0; camel_internet_address_get (reply_to, i, &name, &address); i++) {
-				/* ignore references to the Reply-To address in the To and Cc lists */
-				if (address && !(mode == REPLY_ALL && g_hash_table_lookup (account_hash, address))) {
-					/* In the case that we are doing a Reply-To-All, we do not want
-					   to include the user's email address because replying to oneself
-					   is kinda silly. */
-					dest = e_destination_new ();
-					e_destination_set_name (dest, name);
-					e_destination_set_email (dest, address);
-					to = g_list_append (to, dest);
-					g_hash_table_insert (rcpt_hash, (char *) address, GINT_TO_POINTER (1));
-					mail_ignore (composer, name, address);
-				}
-			}
-		}
-		
-		if (mode == REPLY_ALL) {
-			cc = list_add_addresses (cc, to_addrs, account_hash, rcpt_hash, me ? NULL : &me);
-			cc = list_add_addresses (cc, cc_addrs, account_hash, rcpt_hash, me ? NULL : &me);
-			
-			/* promote the first Cc: address to To: if To: is empty */
-			if (to == NULL && cc != NULL) {
-				to = cc;
-				cc = g_list_remove_link (cc, to);
-			}
-		} else {
-			me = guess_me (to_addrs, cc_addrs, account_hash);
-		}
-		
-		g_hash_table_destroy (rcpt_hash);
-	}
-	
-	g_hash_table_destroy (account_hash);
-	
-	if (!me) {
-		/* default 'me' to the source account... */
-		if ((source = camel_mime_message_get_source (message)))
-			me = mail_config_get_account_by_source_url (source);
-	}
-	
-	/* set body text here as we want all ignored words to take effect */
-	switch (gconf_client_get_int (gconf, "/apps/evolution/mail/format/reply_style", NULL)) {
-	case MAIL_CONFIG_REPLY_DO_NOT_QUOTE:
-		/* do nothing */
-		break;
-	case MAIL_CONFIG_REPLY_ATTACH:
-		/* attach the original message as an attachment */
-		part = mail_tool_make_message_attachment (message);
-		e_msg_composer_attach (composer, part);
-		camel_object_unref (part);
-		break;
-	case MAIL_CONFIG_REPLY_QUOTED:
-	default:
-		/* do what any sane user would want when replying... */
-		sender = camel_mime_message_get_from (message);
-		if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) {
-			camel_internet_address_get (sender, 0, &name, &address);
-		} else {
-			name = _("an unknown sender");
-		}
-		
-		date = camel_mime_message_get_date (message, &date_ofs);
-		/* Convert to UTC */
-		date += (date_ofs / 100) * 60 * 60;
-		date += (date_ofs % 100) * 60;
-
-		/* translators: attribution string used when quoting messages */
-		e_utf8_strftime (format, sizeof (format), _("On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"), gmtime (&date));
-		text = mail_tool_quote_message (message, format, date_ofs, name && *name ? name : address);
-		mail_ignore (composer, name, address);
-		if (text) {
-			e_msg_composer_set_body_text (composer, text);
-			g_free (text);
-		}
-		break;
-	}
-	
-	/* Set the subject of the new message. */
-	subject = (char *) camel_mime_message_get_subject (message);
-	if (!subject)
-		subject = g_strdup ("");
-	else {
-		if (!strncasecmp (subject, "Re: ", 4))
-			subject = g_strndup (subject, MAX_SUBJECT_LEN);
-		else {
-			if (strlen (subject) < MAX_SUBJECT_LEN) {
-				subject = g_strdup_printf ("Re: %s", subject);
-			} else {
-				/* We can't use %.*s because it depends on the locale being C/POSIX
-                                   or UTF-8 to work correctly in glibc */
-				char *sub;
-				
-				/*subject = g_strdup_printf ("Re: %.*s...", MAX_SUBJECT_LEN, subject);*/
-				sub = g_malloc (MAX_SUBJECT_LEN + 8);
-				memcpy (sub, "Re: ", 4);
-				memcpy (sub + 4, subject, MAX_SUBJECT_LEN);
-				memcpy (sub + 4 + MAX_SUBJECT_LEN, "...", 4);
-				subject = sub;
-			}
-		}
-	}
-	
-	tov = e_destination_list_to_vector (to);
-	ccv = e_destination_list_to_vector (cc);
-	
-	g_list_free (to);
-	g_list_free (cc);
-	
-	e_msg_composer_set_headers (composer, me ? me->name : NULL, tov, ccv, NULL, subject);
-	
-	e_destination_freev (tov);
-	e_destination_freev (ccv);
-	
-	g_free (subject);
-	
-	/* Add In-Reply-To and References. */
-	message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-Id");
-	references = camel_medium_get_header (CAMEL_MEDIUM (message), "References");
-	if (message_id) {
-		char *reply_refs;
-		
-		e_msg_composer_add_header (composer, "In-Reply-To", message_id);
-		
-		if (references)
-			reply_refs = g_strdup_printf ("%s %s", references, message_id);
-		else
-			reply_refs = g_strdup (message_id);
-		
-		e_msg_composer_add_header (composer, "References", reply_refs);
-		g_free (reply_refs);
-	} else if (references) {
-		e_msg_composer_add_header (composer, "References", references);
-	}
-	
-	e_msg_composer_drop_editor_undo (composer);
-	
-	return composer;
-}
-
-static void
-requeue_mail_reply (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
-{
-	int mode = GPOINTER_TO_INT (data);
-	
-	if (msg != NULL)
-		mail_reply (folder, msg, uid, mode);
-}
-
-void
-mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, int mode)
-{
-	struct _composer_callback_data *ccd;
-	EMsgComposer *composer;
-	
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (uid != NULL);
-	
-	if (!msg) {
-		mail_get_message (folder, uid, requeue_mail_reply,
-				  GINT_TO_POINTER (mode), mail_thread_new);
-		return;
-	}
-	
-	composer = mail_generate_reply (folder, msg, uid, mode);
-	if (!composer)
-		return;
-	
-	ccd = ccd_new ();
-	
-	camel_object_ref (folder);
-	ccd->folder = folder;
-	ccd->uid = g_strdup (uid);
-	ccd->flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN;
-	if (mode == REPLY_LIST || mode == REPLY_ALL)
-		ccd->flags |= CAMEL_MESSAGE_ANSWERED_ALL;
-	ccd->set = ccd->flags;
-	
-	g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
-	g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-	
-	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
-	
-	gtk_widget_show (GTK_WIDGET (composer));	
-	e_msg_composer_unset_changed (composer);
-}
-
-void
-reply_to_sender (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
-		return;
-	
-	mail_reply (fb->folder, NULL, fb->message_list->cursor_uid, REPLY_SENDER);
-}
-
-void
-reply_to_list (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
-		return;
-	
-	mail_reply (fb->folder, NULL, fb->message_list->cursor_uid, REPLY_LIST);
-}
-
-void
-reply_to_all (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
-		return;
-	
-	mail_reply(fb->folder, NULL, fb->message_list->cursor_uid, REPLY_ALL);
-}
-
-void
-enumerate_msg (MessageList *ml, const char *uid, gpointer data)
-{
-	g_return_if_fail (ml != NULL);
-	
-	g_ptr_array_add ((GPtrArray *) data, g_strdup (uid));
-}
-
-
-static EMsgComposer *
-forward_get_composer (CamelMimeMessage *message, const char *subject)
-{
-	struct _composer_callback_data *ccd;
-	EAccount *account = NULL;
-	EMsgComposer *composer;
-	
-	if (message) {
-		const CamelInternetAddress *to_addrs, *cc_addrs;
-		EAccountList *accounts;
-		
-		accounts = mail_config_get_accounts ();
-		to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-		cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
-		
-		account = guess_me_from_accounts (to_addrs, cc_addrs, accounts);
-		
-		if (!account) {
-			const char *source;
-			
-			source = camel_mime_message_get_source (message);
-			account = mail_config_get_account_by_source_url (source);
-		}
-	}
-	
-	if (!account)
-		account = mail_config_get_default_account ();
-	
-	composer = e_msg_composer_new ();
-	if (composer) {
-		ccd = ccd_new ();
-		
-		g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
-		g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-		
-		g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
-		
-		e_msg_composer_set_headers (composer, account->name, NULL, NULL, NULL, subject);
-	} else {
-		g_warning ("Could not create composer");
-	}
-	
-	return composer;
-}
-
-static void
-do_forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
-{
-	MailConfigForwardStyle style = GPOINTER_TO_INT (data);
-	CamelMimeMessage *message;
-	char *subject, *text;
-	int i;
-	
-	if (messages->len == 0)
-		return;
-	
-	for (i = 0; i < messages->len; i++) {
-		message = messages->pdata[i];
-		subject = mail_tool_generate_forward_subject (message);
-		text = mail_tool_forward_message (message, style == MAIL_CONFIG_FORWARD_QUOTED);
-		
-		if (text) {
-			EMsgComposer *composer = forward_get_composer (message, subject);
-			if (composer) {
-				CamelDataWrapper *wrapper;
-				
-				e_msg_composer_set_body_text (composer, text);
-				
-				wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-				if (CAMEL_IS_MULTIPART (wrapper))
-					e_msg_composer_add_message_attachments (composer, message, FALSE);
-				
-				gtk_widget_show (GTK_WIDGET (composer));
-				e_msg_composer_unset_changed (composer);
-				e_msg_composer_drop_editor_undo (composer);
-			}
-			g_free (text);
-		}
-		
-		g_free (subject);
-	}
-}
-
-static void
-forward_message (FolderBrowser *fb, MailConfigForwardStyle style)
-{
-	GPtrArray *uids;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (!check_send_configuration (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	mail_get_messages (fb->folder, uids, do_forward_non_attached, GINT_TO_POINTER (style));
-}
-
-void
-forward_inline (GtkWidget *widget, gpointer user_data)
-{
-	forward_message (user_data, MAIL_CONFIG_FORWARD_INLINE);
-}
-
-void
-forward_quoted (GtkWidget *widget, gpointer user_data)
-{
-	forward_message (user_data, MAIL_CONFIG_FORWARD_QUOTED);
-}
-
-static void
-do_forward_attach (CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, char *subject, void *data)
-{
-	CamelMimeMessage *message = data;
-	
-	if (part) {
-		EMsgComposer *composer = forward_get_composer (message, subject);
-		if (composer) {
-			e_msg_composer_attach (composer, part);
-			gtk_widget_show (GTK_WIDGET (composer));
-			e_msg_composer_unset_changed (composer);
-			e_msg_composer_drop_editor_undo (composer);
-		}
-	}
-}
-
-void
-forward_attached (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = (FolderBrowser *) user_data;
-	GPtrArray *uids;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	mail_build_attachment (fb->folder, uids, do_forward_attach,
-			       uids->len == 1 ? fb->mail_display->current_message : NULL);
-}
-
-void
-forward (GtkWidget *widget, gpointer user_data)
-{
-	MailConfigForwardStyle style;
-	GConfClient *gconf;
-	
-	gconf = mail_config_get_gconf_client ();
-	style = gconf_client_get_int (gconf, "/apps/evolution/mail/format/forward_style", NULL);
-	
-	if (style == MAIL_CONFIG_FORWARD_ATTACHED)
-		forward_attached (widget, user_data);
-	else
-		forward_message (user_data, style);
-}
-
-
-void
-post_to_url (const char *url)
-{
-	struct _composer_callback_data *ccd;
-	GtkWidget *composer;
-	EAccount *account = NULL;
-	
-	/* FIXME: no way to get folder browser? Not without
-	 * big pain in the ass, as far as I can tell */
-	if (!check_send_configuration (NULL))
-		return;
-	
-	if (url)
-		account = mail_config_get_account_by_source_url (url);
-	
-	composer = create_msg_composer (account, TRUE, NULL);
-	if (!composer)
-		return;
-	
-	e_msg_composer_hdrs_set_post_to ((EMsgComposerHdrs *) ((EMsgComposer *) composer)->hdrs, url);
-	
-	ccd = ccd_new ();
-	
-	g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
-	g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-	
-	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
-	
-	gtk_widget_show (composer);
-}
-
-void
-post_message (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	char *url;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
-		return;
-	
-	url = mail_tools_folder_to_url (fb->folder);
-	post_to_url (url);
-	g_free (url);
-}
-
-void
-post_reply (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
-		return;
-	
-	mail_reply (fb->folder, NULL, fb->message_list->cursor_uid, REPLY_POST);
-}
-
-
-static EMsgComposer *
-redirect_get_composer (CamelMimeMessage *message)
-{
-	const CamelInternetAddress *to_addrs, *cc_addrs;
-	struct _composer_callback_data *ccd;
-	EAccountList *accounts = NULL;
-	EAccount *account = NULL;
-	EMsgComposer *composer;
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	
-	accounts = mail_config_get_accounts ();
-	to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-	cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
-	
-	account = guess_me_from_accounts (to_addrs, cc_addrs, accounts);
-	
-	if (!account) {
-		const char *source;
-		
-		source = camel_mime_message_get_source (message);
-		account = mail_config_get_account_by_source_url (source);
-	}
-	
-	if (!account)
-		account = mail_config_get_default_account ();
-	
-	/* QMail will refuse to send a message if it finds one of
-           it's Delivered-To headers in the message, so remove all
-           Delivered-To headers. Fixes bug #23635. */
-	while (camel_medium_get_header (CAMEL_MEDIUM (message), "Delivered-To"))
-		camel_medium_remove_header (CAMEL_MEDIUM (message), "Delivered-To");
-	
-	composer = e_msg_composer_new_redirect (message, account->name);
-	if (composer) {
-		ccd = ccd_new ();
-		
-		g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
-		g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-		
-		g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
-	} else {
-		g_warning ("Could not create composer");
-	}
-	
-	return composer;
-}
-
-static void
-do_redirect (CamelFolder *folder, const char *uid, CamelMimeMessage *message, void *data)
-{
-	EMsgComposer *composer;
-	
-	if (!message)
-		return;
-	
-	composer = redirect_get_composer (message);
-	if (composer) {
-		CamelDataWrapper *wrapper;
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-		if (CAMEL_IS_MULTIPART (wrapper))
-			e_msg_composer_add_message_attachments (composer, message, FALSE);
-		
-		gtk_widget_show (GTK_WIDGET (composer));
-		e_msg_composer_unset_changed (composer);
-		e_msg_composer_drop_editor_undo (composer);
-	}
-}
-
-void
-redirect (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = (FolderBrowser *) user_data;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (!check_send_configuration (fb))
-		return;
-	
-	mail_get_message (fb->folder, fb->message_list->cursor_uid,
-			  do_redirect, NULL, mail_thread_new);
-}
-
-static void
-transfer_msg_done (gboolean ok, void *data)
-{
-	FolderBrowser *fb = data;
-	gboolean hide_deleted;
-	GConfClient *gconf;
-	int row;
-	
-	if (ok && !FOLDER_BROWSER_IS_DESTROYED (fb)) {
-		gconf = mail_config_get_gconf_client ();
-		hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);
-		
-		row = e_tree_row_of_node (fb->message_list->tree,
-					  e_tree_get_cursor (fb->message_list->tree));
-		
-		/* If this is the last message and deleted messages
-                   are hidden, select the previous */
-		if ((row + 1 == e_tree_row_count (fb->message_list->tree)) && hide_deleted)
-			message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
-					     0, CAMEL_MESSAGE_DELETED, FALSE);
-		else
-			message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT,
-					     0, 0, FALSE);
-	}
-	
-	g_object_unref (fb);
-}
-
-static void
-transfer_msg (FolderBrowser *fb, gboolean delete_from_source)
-{
-	static const char *allowed_types[] = { "mail/*", "vtrash", NULL };
-	extern EvolutionShellClient *global_shell_client;
-	GNOME_Evolution_Folder *folder;
-	static char *last_uri = NULL;
-	GPtrArray *uids;
-	char *desc;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (last_uri == NULL)
-		last_uri = g_strdup (fb->uri);
-	
-	if (delete_from_source)
-		desc = _("Move message(s) to");
-	else
-		desc = _("Copy message(s) to");
-	
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (fb))),
-						   desc, last_uri, allowed_types,
-						   &folder);
-	if (!folder)
-		return;
-	
-	if (strcmp (last_uri, folder->evolutionUri) != 0) {
-		g_free (last_uri);
-		last_uri = g_strdup (folder->evolutionUri);
-	}
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	if (delete_from_source) {
-		g_object_ref (fb);
-		mail_transfer_messages (fb->folder, uids, delete_from_source,
-					folder->physicalUri, 0,
-					transfer_msg_done, fb);
-	} else {
-		mail_transfer_messages (fb->folder, uids, delete_from_source,
-					folder->physicalUri, 0, NULL, NULL);
-	}
-	
-	CORBA_free (folder);
-}
-
-void
-move_msg_cb (GtkWidget *widget, gpointer user_data)
-{
-	transfer_msg (user_data, TRUE);
-}
-
-void
-move_msg (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	transfer_msg (user_data, TRUE);
-}
-
-void
-copy_msg_cb (GtkWidget *widget, gpointer user_data)
-{
-	transfer_msg (user_data, FALSE);
-}
-
-void
-copy_msg (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	transfer_msg (user_data, FALSE);
-}
-
-/* Copied from e-shell-view.c */
-static GtkWidget *
-find_socket (GtkContainer *container)
-{
-        GList *children, *tmp;
-	
-        children = gtk_container_get_children (container);
-        while (children) {
-                if (BONOBO_IS_SOCKET (children->data))
-                        return children->data;
-                else if (GTK_IS_CONTAINER (children->data)) {
-                        GtkWidget *socket = find_socket (children->data);
-                        if (socket)
-                                return socket;
-                }
-                tmp = children->next;
-                g_list_free_1 (children);
-                children = tmp;
-        }
-	
-	return NULL;
-}
-
-static void
-popup_listener_cb (BonoboListener *listener,
-		   const char *event_name,
-		   const CORBA_any *any,
-		   CORBA_Environment *ev,
-		   gpointer user_data)
-{
-	char *type = bonobo_event_subtype (event_name);
-	
-	if (!strcmp (type, "Destroy")) {
-		gtk_widget_destroy (GTK_WIDGET (user_data));
-	}
-	
-	g_free (type);
-}
-
-void
-addrbook_sender (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	const char *addr_str;
-	CamelMessageInfo *info;
-	GtkWidget *win;
-	GtkWidget *control;
-	GtkWidget *socket;
-	GPtrArray *uids;
-	int i;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	if (uids->len != 1)
-		goto done;
-	
-	info = camel_folder_get_message_info (fb->folder, uids->pdata[0]);
-	if (info == NULL || (addr_str = camel_message_info_from (info)) == NULL)
-		goto done;
-	
-	win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title (GTK_WINDOW (win), _("Sender"));
-	
-	control = bonobo_widget_new_control ("OAFIID:GNOME_Evolution_Addressbook_AddressPopup",
-					     CORBA_OBJECT_NIL);
-	bonobo_widget_set_property (BONOBO_WIDGET (control),
-				    "email", TC_CORBA_string, addr_str,
-				    NULL);
-	
-	bonobo_event_source_client_add_listener (bonobo_widget_get_objref (BONOBO_WIDGET (control)),
-						 popup_listener_cb, NULL, NULL, win);
-	
-	socket = find_socket (GTK_CONTAINER (control));
-	
-	g_object_weak_ref ((GObject *) socket, (GWeakNotify) gtk_widget_destroy, win);
-	
-	gtk_container_add (GTK_CONTAINER (win), control);
-	gtk_widget_show_all (win);
-
-done:
-	for (i = 0; i < uids->len; i++)
-		g_free (uids->pdata[i]);
-	g_ptr_array_free (uids, TRUE);
-}
-
-void
-add_sender_to_addrbook (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	addrbook_sender (NULL, user_data);
-}
-
-void
-apply_filters (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	mail_filter_on_demand (fb->folder, uids);
-}
-
-void
-select_all (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	ESelectionModel *etsm;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (GTK_WIDGET_HAS_FOCUS (fb->mail_display->html)) {
-		gtk_html_select_all (fb->mail_display->html);
-	} else {
-		etsm = e_tree_get_selection_model (fb->message_list->tree);
-		
-		e_selection_model_select_all (etsm);
-	}
-}
-
-/* Thread selection */
-
-typedef struct thread_select_info {
-	MessageList *ml;
-	GPtrArray *paths;
-} thread_select_info_t;
-
-static gboolean
-select_node (ETreeModel *tm, ETreePath path, gpointer user_data)
-{
-	thread_select_info_t *tsi = (thread_select_info_t *) user_data;
-	
-	g_ptr_array_add (tsi->paths, path);
-	return FALSE; /*not done yet*/
-}
-
-static void
-thread_select_foreach (ETreePath path, gpointer user_data)
-{
-	thread_select_info_t *tsi = (thread_select_info_t *) user_data;
-	ETreeModel *tm = tsi->ml->model;
-	ETreePath node;
-	
-	/* @path part of the initial selection. If it has children,
-	 * we select them as well. If it doesn't, we select its siblings and
-	 * their children (ie, the current node must be inside the thread
-	 * that the user wants to mark.
-	 */
-	
-	if (e_tree_model_node_get_first_child (tm, path)) 
-		node = path;
-	else {
-		node = e_tree_model_node_get_parent (tm, path);
-		
-		/* Let's make an exception: if no parent, then we're about
-		 * to mark the whole tree. No. */
-		if (e_tree_model_node_is_root (tm, node)) 
-			node = path;
-	}
-	
-	e_tree_model_node_traverse (tm, node, select_node, tsi);
-}
-
-void
-select_thread (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	ETreeSelectionModel *selection_model;
-	thread_select_info_t tsi;
-	int i;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	/* For every selected item, select the thread containing it.
-	 * We can't alter the selection while iterating through it,
-	 * so build up a list of paths.
-	 */
-	
-	tsi.ml = fb->message_list;
-	tsi.paths = g_ptr_array_new ();
-	
-	e_tree_selected_path_foreach (fb->message_list->tree, thread_select_foreach, &tsi);
-	
-	selection_model = E_TREE_SELECTION_MODEL (e_tree_get_selection_model (fb->message_list->tree));
-	
-	for (i = 0; i < tsi.paths->len; i++)
-		e_tree_selection_model_add_to_selection (selection_model,
-							 tsi.paths->pdata[i]);
-	g_ptr_array_free (tsi.paths, TRUE);
-}
-
-void
-invert_selection (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	ESelectionModel *etsm;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	etsm = e_tree_get_selection_model (fb->message_list->tree);
-	
-	e_selection_model_invert_selection (etsm);
-}
-
-/* flag all selected messages. Return number flagged */
-static int
-flag_messages (FolderBrowser *fb, guint32 mask, guint32 set)
-{
-	GPtrArray *uids;
-	int i;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return 0;
-	
-	/* could just use specific callback but i'm lazy */
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	camel_folder_freeze (fb->folder);
-	for (i = 0; i < uids->len; i++) {
-		camel_folder_set_message_flags (fb->folder, uids->pdata[i], mask, set);
-		g_free (uids->pdata[i]);
-	}
-	
-	camel_folder_thaw (fb->folder);
-	
-	g_ptr_array_free (uids, TRUE);
-	
-	return i;
-}
-
-static int
-toggle_flags (FolderBrowser *fb, guint32 mask)
-{
-	GPtrArray *uids;
-	int i;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return 0;
-	
-	/* could just use specific callback but i'm lazy */
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	camel_folder_freeze (fb->folder);
-	for (i = 0; i < uids->len; i++) {
-		guint32 flags;
-		
-		flags = ~(camel_folder_get_message_flags (fb->folder, uids->pdata[i]));
-		
-		/* if we're flagging a message important, always undelete it too */
-		if (mask & flags & CAMEL_MESSAGE_FLAGGED) {
-			flags &= ~CAMEL_MESSAGE_DELETED;
-			mask |= CAMEL_MESSAGE_DELETED;
-		}
-		
-		/* if we're flagging a message deleted, mark it seen. If 
-		 * we're undeleting it, we also want it to be seen, so always do this.
-		 */
-		if (mask & CAMEL_MESSAGE_DELETED) {
-			flags |= CAMEL_MESSAGE_SEEN;
-			mask |= CAMEL_MESSAGE_SEEN;
-		}
-		
-		camel_folder_set_message_flags (fb->folder, uids->pdata[i], mask, flags);
-		
-		g_free (uids->pdata[i]);
-	}
-	camel_folder_thaw (fb->folder);
-	
-	g_ptr_array_free (uids, TRUE);
-	
-	return i;
-}
-
-void
-mark_as_seen (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-}
-
-void
-mark_as_unseen (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	/* Remove the automatic mark-as-read timer first */
-	if (fb->seen_id) {
-		g_source_remove (fb->seen_id);
-		fb->seen_id = 0;
-	}
-	
-	flag_messages (fb, CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED, 0);
-}
-
-void
-mark_all_as_seen (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids;
-	int i;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	uids = camel_folder_get_uids (fb->folder);
-	camel_folder_freeze (fb->folder);
-	for (i = 0; i < uids->len; i++)
-		camel_folder_set_message_flags (fb->folder, uids->pdata[i], CAMEL_MESSAGE_SEEN, ~0);
-	camel_folder_free_uids (fb->folder, uids);
-	camel_folder_thaw (fb->folder);
-}
-
-void
-mark_as_important (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_FLAGGED);
-}
-
-void
-mark_as_unimportant (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED, 0);
-}
-
-void
-toggle_as_important (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	toggle_flags (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED);
-}
-
-
-struct _tag_editor_data {
-	MessageTagEditor *editor;
-	FolderBrowser *fb;
-	GPtrArray *uids;
-};
-
-static void
-tag_editor_response(GtkWidget *gd, int button, struct _tag_editor_data *data)
-{
-	CamelFolder *folder;
-	CamelTag *tags, *t;
-	GPtrArray *uids;
-	int i;
-
-	/*if (FOLDER_BROWSER_IS_DESTROYED (data->fb))
-	  goto done;*/
-
-	if (button == GTK_RESPONSE_OK
-	    && (tags = message_tag_editor_get_tag_list (data->editor))) {
-		folder = data->fb->folder;
-		uids = data->uids;
-	
-		camel_folder_freeze (folder);
-		for (i = 0; i < uids->len; i++) {
-			for (t = tags; t; t = t->next)
-				camel_folder_set_message_user_tag (folder, uids->pdata[i], t->name, t->value);
-		}
-		camel_folder_thaw (folder);
-		camel_tag_list_free (&tags);
-	}
-
-	gtk_widget_destroy(gd);
-
-	g_object_unref (data->fb);
-	g_ptr_array_free (data->uids, TRUE);
-	g_free (data);
-}
-
-void
-flag_for_followup (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	struct _tag_editor_data *data;
-	GtkWidget *editor;
-	GPtrArray *uids;
-	int i;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	editor = (GtkWidget *) message_tag_followup_new ();
-	
-	data = g_new (struct _tag_editor_data, 1);
-	data->editor = MESSAGE_TAG_EDITOR (editor);
-	gtk_widget_ref (GTK_WIDGET (fb));
-	data->fb = fb;
-	data->uids = uids;
-	
-	for (i = 0; i < uids->len; i++) {
-		CamelMessageInfo *info;
-		
-		info = camel_folder_get_message_info (fb->folder, uids->pdata[i]);
-		message_tag_followup_append_message (MESSAGE_TAG_FOLLOWUP (editor),
-						     camel_message_info_from (info),
-						     camel_message_info_subject (info));
-	}
-
-	g_signal_connect(editor, "response", G_CALLBACK(tag_editor_response), data);
-	
-	/* special-case... */
-	if (uids->len == 1) {
-		CamelMessageInfo *info;
-		
-		info = camel_folder_get_message_info (fb->folder, uids->pdata[0]);
-		if (info) {
-			if (info->user_tags)
-				message_tag_editor_set_tag_list (MESSAGE_TAG_EDITOR (editor), info->user_tags);
-			camel_folder_free_message_info (fb->folder, info);
-		}
-	}
-	
-	gtk_widget_show (editor);
-}
-
-void
-flag_followup_completed (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids;
-	char *now;
-	int i;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	now = header_format_date (time (NULL), 0);
-	
-	camel_folder_freeze (fb->folder);
-	for (i = 0; i < uids->len; i++) {
-		const char *tag;
-		
-		tag = camel_folder_get_message_user_tag (fb->folder, uids->pdata[i], "follow-up");
-		if (tag == NULL || *tag == '\0')
-			continue;
-		
-		camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "completed-on", now);
-	}
-	camel_folder_thaw (fb->folder);
-	
-	g_free (now);
-	
-	g_ptr_array_free (uids, TRUE);
-}
-
-void
-flag_followup_clear (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids;
-	int i;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	camel_folder_freeze (fb->folder);
-	for (i = 0; i < uids->len; i++) {
-		camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "follow-up", "");
-		camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "due-by", "");
-		camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "completed-on", "");
-	}
-	camel_folder_thaw (fb->folder);
-	
-	g_ptr_array_free (uids, TRUE);
-}
-
-void
-zoom_in (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	gtk_html_zoom_in (fb->mail_display->html);
-}
-
-void
-zoom_out (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	gtk_html_zoom_out (fb->mail_display->html);
-}
-
-void
-zoom_reset (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	gtk_html_zoom_reset (fb->mail_display->html);
-}
-
-static void
-do_edit_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
-{
-	FolderBrowser *fb = (FolderBrowser *) data;
-	int i;
-	
-	if (messages == NULL)
-		return;
-	
-	for (i = 0; i < messages->len; i++) {
-		struct _composer_callback_data *ccd;
-		EMsgComposer *composer;
-		
-		camel_medium_remove_header (CAMEL_MEDIUM (messages->pdata[i]), "X-Mailer");
-		
-		composer = e_msg_composer_new_with_message (messages->pdata[i]);
-		e_msg_composer_unset_changed (composer);
-		e_msg_composer_drop_editor_undo (composer);
-		
-		if (composer) {
-			ccd = ccd_new ();
-			if (folder_browser_is_drafts (fb)) {
-				camel_object_ref (folder);
-				ccd->drafts_folder = folder;
-				ccd->drafts_uid = g_strdup (uids->pdata[i]);
-			}
-			
-			g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
-			g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
-			
-			g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
-			
-			gtk_widget_show (GTK_WIDGET (composer));
-		}
-	}
-}
-
-static gboolean
-are_you_sure (const char *msg, GPtrArray *uids, FolderBrowser *fb)
-{
-	GtkWidget *dialog;
-	int button, i;
-
-	dialog = gtk_message_dialog_new (FB_WINDOW (fb), GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-					 GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
-					 msg, uids->len);
-	button = gtk_dialog_run ((GtkDialog *) dialog);
-	gtk_widget_destroy (dialog);
-	
-	if (button != GTK_RESPONSE_OK) {
-		for (i = 0; i < uids->len; i++)
-			g_free (uids->pdata[i]);
-		g_ptr_array_free (uids, TRUE);
-	}
-	
-	return button == GTK_RESPONSE_OK;
-}
-
-static void
-edit_msg_internal (FolderBrowser *fb)
-{
-	GPtrArray *uids;
-	
-	if (!check_send_configuration (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	if (uids->len > 10 && !are_you_sure (_("Are you sure you want to edit all %d messages?"), uids, fb))
-		return;
-	
-	mail_get_messages (fb->folder, uids, do_edit_messages, fb);
-}
-
-void
-edit_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (!folder_browser_is_drafts (fb)) {
-		e_notice(FB_WINDOW(fb), GTK_MESSAGE_ERROR,
-			 _("You may only edit messages saved\nin the Drafts folder."));
-		return;
-	}
-	
-	edit_msg_internal (fb);
-}
-
-static void
-do_resend_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
-{
-	int i;
-	
-	for (i = 0; i < messages->len; i++) {
-		/* generate a new Message-Id because they need to be unique */
-		camel_mime_message_set_message_id (messages->pdata[i], NULL);
-	}
-	
-	/* "Resend" should open up the composer to let the user edit the message */
-	do_edit_messages (folder, uids, messages, data);
-}
-
-
-void
-resend_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (!folder_browser_is_sent (fb)) {
-		e_notice (FB_WINDOW (fb), GTK_MESSAGE_ERROR,
-			  _("You may only resend messages\nin the Sent folder."));
-		return;
-	}
-	
-	if (!check_send_configuration (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	if (uids->len > 10 && !are_you_sure (_("Are you sure you want to resend all %d messages?"), uids, fb))
-		return;
-	
-	mail_get_messages (fb->folder, uids, do_resend_messages, fb);
-}
-
-
-void
-search_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GtkWidget *w;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (fb->mail_display->current_message == NULL) {
-		GtkWidget *dialog;
-		
-		dialog = gtk_message_dialog_new (FB_WINDOW(fb), GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
-						 _("No Message Selected"));
-		g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
-		gtk_widget_show (dialog);
-		return;
-	}
-	
-	w = mail_search_new (fb->mail_display);
-	gtk_widget_show_all (w);
-}
-
-void
-load_images (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	mail_display_load_images (fb->mail_display);
-}
-
-static void
-save_msg_ok (GtkWidget *widget, gpointer user_data)
-{
-	CamelFolder *folder;
-	GPtrArray *uids;
-	const char *path;
-	struct stat st;
-	gboolean ret = TRUE;
-	
-	path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (user_data));
-	if (path[0] == '\0')
-		return;
-	
-	/* make sure we can actually save to it... */
-	if (stat (path, &st) != -1 && !S_ISREG (st.st_mode))
-		return;
-
-	if (access(path, F_OK) == 0) {
-		if (access(path, W_OK) != 0) {
-			e_notice(GTK_WINDOW(user_data), GTK_MESSAGE_ERROR,
-				 _("Cannot save to `%s'\n %s"), path, g_strerror(errno));
-			return;
-		}
-
-		ret = e_question(GTK_WINDOW(user_data), GTK_RESPONSE_NO, NULL,
-				 _("`%s' already exists.\nOverwrite it?"), path);
-	}
-	
-	if (ret) {
-		folder = g_object_get_data ((GObject *) user_data, "folder");
-		uids = g_object_steal_data (G_OBJECT (user_data), "uids");
-		mail_save_messages (folder, uids, path, NULL, NULL);
-		gtk_widget_destroy (GTK_WIDGET (user_data));
-	}
-}
-
-static void
-save_msg_destroy (gpointer user_data)
-{
-	GPtrArray *uids = user_data;
-	
-	if (uids) {
-		int i;
-		
-		for (i = 0; i < uids->len; i++)
-			g_free (uids->pdata[i]);
-		
-		g_ptr_array_free (uids, TRUE);
-	}
-}
-
-void
-save_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GtkFileSelection *filesel;
-	GPtrArray *uids;
-	char *title, *path;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	if (uids->len == 1)
-		title = _("Save Message As...");
-	else
-		title = _("Save Messages As...");
-	
-	filesel = GTK_FILE_SELECTION (gtk_file_selection_new (title));
-	path = g_strdup_printf ("%s/", g_get_home_dir ());
-	gtk_file_selection_set_filename (filesel, path);
-	g_free (path);
-	
-	g_object_set_data_full ((GObject *) filesel, "uids", uids, save_msg_destroy);
-	g_object_set_data ((GObject *) filesel, "folder", fb->folder);
-	
-	g_signal_connect (filesel->ok_button, "clicked", G_CALLBACK (save_msg_ok), filesel);
-	g_signal_connect_swapped (filesel->cancel_button, "clicked",
-				  G_CALLBACK (gtk_widget_destroy), filesel);
-	
-	gtk_widget_show (GTK_WIDGET (filesel));
-}
-
-void
-colour_msg (GtkWidget *widget, gpointer user_data)
-{
-	/* FIXME: implement me? */
-}
-
-void
-delete_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	gboolean hide_deleted;
-	GConfClient *gconf;
-	int deleted, row;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	deleted = flag_messages (fb, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
-				 CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
-	
-	/* Select the next message if we are only deleting one message */
-	if (deleted == 1) {
-		row = e_tree_row_of_node (fb->message_list->tree,
-					  e_tree_get_cursor (fb->message_list->tree));
-		
-		gconf = mail_config_get_gconf_client ();
-		hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);
-		
-		/* If this is the last message and deleted messages
-                   are hidden, select the previous */
-		if ((row + 1 == e_tree_row_count (fb->message_list->tree)) && hide_deleted)
-			message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
-					     0, CAMEL_MESSAGE_DELETED, FALSE);
-		else
-			message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT,
-					     0, 0, FALSE);
-	}
-}
-
-void
-undelete_msg (GtkWidget *button, gpointer user_data)
-{
-	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_DELETED, 0);
-}
-
-void
-next_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE);
-}
-
-void
-next_unread_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN, TRUE);
-}
-
-void
-next_flagged_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT,
-			     CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED, FALSE);
-}
-
-void
-next_thread (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	message_list_select_next_thread (fb->message_list);
-}
-
-void
-previous_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
-			     0, 0, FALSE);
-}
-
-void
-previous_unread_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
-			     0, CAMEL_MESSAGE_SEEN, TRUE);
-}
-
-void
-previous_flagged_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
-			     CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED, TRUE);
-}
-
-static void
-expunged_folder (CamelFolder *f, void *data)
-{
-	FolderBrowser *fb = data;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	fb->expunging = NULL;
-	gtk_widget_set_sensitive (GTK_WIDGET (fb->message_list), TRUE);
-
-	/* FIXME: we should check that the focus hasn't changed in the
-	 * mean time, otherwise we steal the focus unecessarily.
-	 * Check :get_toplevel()->focus_widget? */
-	if (fb->expunge_mlfocussed)
-		gtk_widget_grab_focus((GtkWidget *)fb->message_list);
-}
-
-static gboolean
-confirm_expunge (FolderBrowser *fb)
-{
-	gboolean res, show_again;
-	GConfClient *gconf;
-	
-	gconf = mail_config_get_gconf_client ();
-	
-	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/expunge", NULL))
-		return TRUE;
-	
-	res = e_question (FB_WINDOW (fb), GTK_RESPONSE_NO, &show_again,
-			  _("This operation will permanently erase all messages marked as\n"
-			    "deleted. If you continue, you will not be able to recover these messages.\n"
-			    "\nReally erase these messages?"));
-	
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/prompts/expunge", show_again, NULL);
-	
-	return res;
-}
-
-void
-expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (fb->folder && (fb->expunging == NULL || fb->folder != fb->expunging) && confirm_expunge (fb)) {
-		CamelMessageInfo *info;
-		GtkWindow *top;
-		GtkWidget *focus;
-
-		/* disable the message list so user can't click on them while we expunge */
-
-		/* nasty hack to find out if some widget inside the message list is focussed ... */
-		top = GTK_WINDOW (gtk_widget_get_toplevel((GtkWidget *)fb->message_list));
-		focus = top?top->focus_widget:NULL;
-		while (focus && focus != (GtkWidget *)fb->message_list)
-			focus = focus->parent;
-		fb->expunge_mlfocussed = focus == (GtkWidget *)fb->message_list;
-		gtk_widget_set_sensitive (GTK_WIDGET (fb->message_list), FALSE);
-		
-		/* Only blank the mail display if the message being
-                   viewed is one of those to be expunged */
-		if (fb->loaded_uid) {
-			info = camel_folder_get_message_info (fb->folder, fb->loaded_uid);
-			
-			if (!info || info->flags & CAMEL_MESSAGE_DELETED)
-				mail_display_set_message (fb->mail_display, NULL, NULL, NULL);
-		}
-		
-		fb->expunging = fb->folder;
-		mail_expunge_folder (fb->folder, expunged_folder, fb);
-	}
-}
-
-/********************** Begin Filter Editor ********************/
-
-static GtkWidget *filter_editor = NULL;
-
-static void
-filter_editor_response (GtkWidget *dialog, int button, FolderBrowser *fb)
-{
-	FilterContext *fc;
-	
-	if (button == GTK_RESPONSE_ACCEPT) {
-		char *user;
-		
-		fc = g_object_get_data(G_OBJECT(dialog), "context");
-		user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ()));
-		rule_context_save ((RuleContext *)fc, user);
-		g_free (user);
-	}
-
-	gtk_widget_destroy(dialog);
-
-	filter_editor = NULL;
-}
-
-static const char *filter_source_names[] = {
-	"incoming",
-	"outgoing",
-	NULL,
-};
-
-void
-filter_edit (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	FilterContext *fc;
-	char *user, *system;
-	
-	if (filter_editor) {
-		gdk_window_raise (GTK_WIDGET (filter_editor)->window);
-		return;
-	}
-	
-	fc = filter_context_new ();
-	user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ()));
-	system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
-	rule_context_load ((RuleContext *)fc, system, user);
-	g_free (user);
-	
-	if (((RuleContext *)fc)->error) {
-		e_notice(FB_WINDOW (fb), GTK_MESSAGE_ERROR,
-			 _("Error loading filter information:\n%s"),
-			 ((RuleContext *)fc)->error);
-		return;
-	}
-	
-	filter_editor = (GtkWidget *)filter_editor_new (fc, filter_source_names);
-	/* FIXME: maybe this needs destroy func? */
-	gtk_window_set_transient_for ((GtkWindow *) filter_editor, FB_WINDOW (fb));
-	gtk_window_set_title (GTK_WINDOW (filter_editor), _("Filters"));
-	g_object_set_data_full ((GObject *) filter_editor, "context", fc, (GtkDestroyNotify) g_object_unref);
-	g_signal_connect (filter_editor, "response", G_CALLBACK (filter_editor_response), fb);
-	gtk_widget_show (GTK_WIDGET (filter_editor));
-}
-
-/********************** End Filter Editor ********************/
-
-void
-vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	vfolder_edit ();
-}
-
-
-/* static void
-header_print_cb (GtkHTML *html, GnomePrintContext *print_context,
-		 double x, double y, double width, double height, gpointer user_data)
-{
-	printf ("header_print_cb %f,%f x %f,%f\n", x, y, width, height);
-
-	gnome_print_newpath (print_context);
-	gnome_print_setlinewidth (print_context, 12.0);
-	gnome_print_setrgbcolor (print_context, 1.0, 0.0, 0.0);
-	gnome_print_moveto (print_context, x, y);
-	gnome_print_lineto (print_context, x+width, y-height);
-	gnome_print_strokepath (print_context);
-} */
-
-struct footer_info {
-	GnomeFont *local_font;
-	gint page_num, pages;
-};
-
-static void
-footer_print_cb (GtkHTML *html, GnomePrintContext *print_context,
-		 double x, double y, double width, double height, gpointer user_data)
-{
-	struct footer_info *info = (struct footer_info *) user_data;
-	
-	if (info->local_font) {
-		char *text = g_strdup_printf (_("Page %d of %d"), info->page_num, info->pages);
-		/*gdouble tw = gnome_font_get_width_string (info->local_font, text);*/
-		/* FIXME: work out how to measure this */
-		gdouble tw = strlen (text) * 8;
-		
-		gnome_print_gsave       (print_context);
-		gnome_print_newpath     (print_context);
-		gnome_print_setrgbcolor (print_context, .0, .0, .0);
-		gnome_print_moveto      (print_context, x + width - tw, y - gnome_font_get_ascender (info->local_font));
-		gnome_print_setfont     (print_context, info->local_font);
-		gnome_print_show        (print_context, text);
-		gnome_print_grestore    (print_context);
-		
-		g_free (text);
-		info->page_num++;
-	}
-}
-
-static void
-footer_info_free (struct footer_info *info)
-{
-	if (info->local_font)
-		gnome_font_unref (info->local_font);
-	g_free (info);
-}
-
-static struct footer_info *
-footer_info_new (GtkHTML *html, GnomePrintContext *pc, gdouble *line)
-{
-	struct footer_info *info;
-	
-	info = g_new (struct footer_info, 1);
-	info->local_font = gnome_font_find_closest ("Helvetica", 10.0);
-	
-	if (info->local_font)
-		*line = gnome_font_get_ascender (info->local_font) - gnome_font_get_descender (info->local_font);
-	
-	info->page_num = 1;
-	info->pages = gtk_html_print_get_pages_num (html, pc, 0.0, *line);
-	
-	return info;
-}
-
-static void
-do_mail_print (FolderBrowser *fb, gboolean preview)
-{
-	GtkHTML *html;
-	GtkWidget *w = NULL;
-	GnomePrintContext *print_context;
-	GnomePrintJob *print_master;
-	GnomePrintConfig *config = NULL;
-	GtkDialog *dialog;
-	gdouble line = 0.0;
-	struct footer_info *info;
-	
-	if (!preview) {
-		dialog = (GtkDialog *) gnome_print_dialog_new (NULL, _("Print Message"), GNOME_PRINT_DIALOG_COPIES);
-		gtk_dialog_set_default_response (dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
-		gtk_window_set_transient_for ((GtkWindow *) dialog, (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) fb));
-		
-		switch (gtk_dialog_run (dialog)) {
-		case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-			break;
-		case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-			preview = TRUE;
-			break;
-		default:
-			gtk_widget_destroy ((GtkWidget *) dialog);
-			return;
-		}
-		
-		config = gnome_print_dialog_get_config ((GnomePrintDialog *) dialog);
-		gtk_widget_destroy ((GtkWidget *)dialog);
-	}
-	
-	if (config) {
-		print_master = gnome_print_job_new (config);
-		gnome_print_config_unref (config);
-	} else
-		print_master = gnome_print_job_new (NULL);
-	
-	/* paper size settings? */
-	/*gnome_print_master_set_paper (print_master, paper);*/
-	print_context = gnome_print_job_get_context (print_master);
-	
-	html = GTK_HTML (gtk_html_new ());
-	gtk_widget_set_name (GTK_WIDGET (html), "EvolutionMailPrintHTMLWidget");
-	mail_display_initialize_gtkhtml (fb->mail_display, html);
-	
-	/* Set our 'printing' flag to true and render.  This causes us
-	   to ignoring any adjustments we made to accomodate the
-	   user's theme. */
-	fb->mail_display->printing = TRUE;
-	
-	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (html))) {
-		/* gtk widgets don't like to be realized outside top level widget
-		   so we put new html widget into gtk window */
-		w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (html));
-		gtk_widget_realize (GTK_WIDGET (html));
-	}
-	mail_display_render (fb->mail_display, html, TRUE);
-	gtk_html_print_set_master (html, print_master);
-	
-	info = footer_info_new (html, print_context, &line);
-	gtk_html_print_with_header_footer (html, print_context, 0.0, line, NULL, footer_print_cb, info);
-	footer_info_free (info);
-	
-	fb->mail_display->printing = FALSE;
-	
-	gnome_print_job_close (print_master);
-	gtk_widget_destroy (GTK_WIDGET (html));
-	if (w)
-		gtk_widget_destroy (w);
-	
-	if (preview){
-		GtkWidget *pw;
-		
-		pw = gnome_print_job_preview_new (print_master, _("Print Preview"));
-		gtk_widget_show (pw);
-	} else {
-		int result = gnome_print_job_print (print_master);
-		
-		if (result == -1)
-			e_notice (FB_WINDOW (fb), GTK_MESSAGE_ERROR, _("Printing of message failed"));
-	}
-
-        g_object_unref (print_master);
-}
-
-/* This is pretty evil.  FolderBrowser's API should be extended to allow these sorts of
-   things to be done in a more natural way. */
-
-/* <evil_code> */
-
-struct blarg_this_sucks {
-	FolderBrowser *fb;
-	gboolean preview;
-};
-
-static void
-done_message_selected (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
-{
-	struct blarg_this_sucks *blarg = data;
-	FolderBrowser *fb = blarg->fb;
-	gboolean preview = blarg->preview;
-	CamelMessageInfo *info;
-	
-	g_free (blarg);
-	
-	info = camel_folder_get_message_info (fb->folder, uid);
-	mail_display_set_message (fb->mail_display, (CamelMedium *) msg, fb->folder, info);
-	if (info)
-		camel_folder_free_message_info (fb->folder, info);
-	
-	g_free (fb->loaded_uid);
-	fb->loaded_uid = fb->loading_uid;
-	fb->loading_uid = NULL;
-	
-	if (msg)
-		do_mail_print (fb, preview);
-}
-
-/* Ack!  Most of this is copied from folder-browser.c */
-static void
-do_mail_fetch_and_print (FolderBrowser *fb, gboolean preview)
-{
-	if (!fb->preview_shown || fb->mail_display->current_message == NULL) {
-		/* If the preview pane is closed, we have to do some
-		   extra magic to load the message. */
-		struct blarg_this_sucks *blarg = g_new (struct blarg_this_sucks, 1);
-		
-		blarg->fb = fb;
-		blarg->preview = preview;
-		
-		fb->loading_id = 0;
-		
-		/* if we are loading, then set a pending, but leave the loading, coudl cancel here (?) */
-		if (fb->loading_uid) {
-			g_free (fb->pending_uid);
-			fb->pending_uid = g_strdup (fb->new_uid);
-		} else {
-			if (fb->new_uid) {
-				fb->loading_uid = g_strdup (fb->new_uid);
-				mail_get_message (fb->folder, fb->loading_uid, done_message_selected, blarg, mail_thread_new);
-			} else {
-				mail_display_set_message (fb->mail_display, NULL, NULL, NULL);
-				g_free (blarg);
-			}
-		}
-	} else {
-		do_mail_print (fb, preview);
-	}
-}
-
-/* </evil_code> */
-
-
-void
-print_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	do_mail_fetch_and_print (fb, FALSE);
-}
-
-void
-print_preview_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	do_mail_fetch_and_print (fb, TRUE);
-}
-
-/******************** Begin Subscription Dialog ***************************/
-
-static GtkObject *subscribe_dialog = NULL;
-
-static void
-subscribe_dialog_destroy (GtkObject *dialog, GObject *deadbeef)
-{
-	if (subscribe_dialog) {
-		g_object_unref (subscribe_dialog);
-		subscribe_dialog = NULL;
-	}
-}
-
-void
-manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	if (!subscribe_dialog) {
-		subscribe_dialog = subscribe_dialog_new ();
-		
-		g_object_weak_ref ((GObject *) SUBSCRIBE_DIALOG (subscribe_dialog)->app,
-				   (GWeakNotify) subscribe_dialog_destroy, subscribe_dialog);
-		g_object_ref(subscribe_dialog);
-		gtk_object_sink((GtkObject *)subscribe_dialog);
-		subscribe_dialog_show (subscribe_dialog);
-	} else {
-		gdk_window_raise (SUBSCRIBE_DIALOG (subscribe_dialog)->app->window);
-	}
-}
-
-/******************** End Subscription Dialog ***************************/
-
-static void
-local_configure_done(const char *uri, CamelFolder *folder, void *data)
-{
-	FolderBrowser *fb = data;
-
-	if (FOLDER_BROWSER_IS_DESTROYED (fb)) {
-		g_object_unref(fb);
-		return;
-	}
-
-	if (folder == NULL)
-		folder = fb->folder;
-
-	message_list_set_folder(fb->message_list, folder, FALSE);
-	g_object_unref(fb);
-}
-
-void
-configure_folder (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (fb->uri) {
-		if (strncmp (fb->uri, "vfolder:", 8) == 0) {
-			vfolder_edit_rule (fb->uri);
-		} else {
-			message_list_set_folder(fb->message_list, NULL, FALSE);
-			g_object_ref((GtkObject *)fb);
-			mail_local_reconfigure_folder(fb->uri, local_configure_done, fb);
-		}
-	}
-}
-
-static void
-do_view_messages(CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data)
-{
-	FolderBrowser *fb = data;
-	int i;
-
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-
-	for (i = 0; i < uids->len && i < msgs->len; i++) {
-		char *uid = uids->pdata[i];
-		CamelMimeMessage *msg = msgs->pdata[i];
-		GtkWidget *mb;
-		
-		camel_folder_set_message_flags (folder, uid, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-		mb = message_browser_new (fb->uri, uid);
-		gtk_widget_show (mb);
-	}
-}
-
-void
-view_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-
-	if (uids->len > 10 && !are_you_sure (_("Are you sure you want to open all %d messages in separate windows?"), uids, fb))
-		return;
-	
-	mail_get_messages(fb->folder, uids, do_view_messages, fb);
-}
-
-void
-open_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	extern CamelFolder *outbox_folder;
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (folder_browser_is_drafts (fb) || fb->folder == outbox_folder)
-		edit_msg_internal (fb);
-	else
-		view_msg (NULL, user_data);
-}
-
-void
-open_message (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	open_msg (NULL, user_data);
-}
-
-void
-edit_message (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-        edit_msg (NULL, user_data);
-}
-
-void
-stop_threads (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	camel_operation_cancel (NULL);
-}
-
-void
-empty_trash (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	CamelProvider *provider;
-	EAccountList *accounts;
-	FolderBrowser *fb;
-	CamelException ex;
-	EAccount *account;
-	EIterator *iter;
-	
-	fb = user_data ? FOLDER_BROWSER (user_data) : NULL;
-	
-	if (fb && !confirm_expunge (fb))
-		return;
-	
-	camel_exception_init (&ex);
-	
-	/* expunge all remote stores */
-	accounts = mail_config_get_accounts ();
-	iter = e_list_get_iterator ((EList *) accounts);
-	while (e_iterator_is_valid (iter)) {
-		account = (EAccount *) e_iterator_get (iter);
-		
-		/* make sure this is a valid source */
-		if (account->enabled && account->source->url) {
-			provider = camel_session_get_provider (session, account->source->url, &ex);
-			if (provider) {
-				/* make sure this store is a remote store */
-				if (provider->flags & CAMEL_PROVIDER_IS_STORAGE &&
-				    provider->flags & CAMEL_PROVIDER_IS_REMOTE) {
-					mail_empty_trash (account, NULL, NULL);
-				}
-			}
-			
-			/* clear the exception for the next round */
-			camel_exception_clear (&ex);
-		}
-		
-		e_iterator_next (iter);
-	}
-	
-	g_object_unref (iter);
-	
-	/* Now empty the local trash folder */
-	mail_empty_trash (NULL, NULL, NULL);
-}
diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h
deleted file mode 100644
index 6b2c4573c9..0000000000
--- a/mail/mail-callbacks.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_CALLBACKS_H
-#define MAIL_CALLBACKS_H
-
-#include <camel/camel.h>
-#include "composer/e-msg-composer.h"
-#include <mail/mail-types.h>
-#include "evolution-storage.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* these are the possible modes for replying */
-enum {
-	REPLY_SENDER,
-	REPLY_LIST,
-	REPLY_ALL,
-	REPLY_POST,
-	REPLY_NO_QUOTE = 0x80	/* dont quote reply */
-};
-
-void enumerate_msg (MessageList *ml, const char *uid, gpointer data);
-
-void fetch_mail            (GtkWidget *widget, gpointer user_data);
-void send_queued_mail      (GtkWidget *widget, gpointer user_data);
-
-void compose_msg           (GtkWidget *widget, gpointer user_data);
-void send_to_url           (const char *url, const char *parent_uri);
-
-void forward_inline        (GtkWidget *widget, gpointer user_data);
-void forward_quoted        (GtkWidget *widget, gpointer user_data);
-void forward_attached      (GtkWidget *widget, gpointer user_data);
-void forward               (GtkWidget *widget, gpointer user_data);
-
-void post_to_url           (const char *url);
-void post_message          (GtkWidget *widget, gpointer user_data);
-void post_reply            (GtkWidget *widget, gpointer user_data);
-
-void redirect              (GtkWidget *widget, gpointer user_data);
-
-void reply_to_sender       (GtkWidget *widget, gpointer user_data);
-void reply_to_list         (GtkWidget *widget, gpointer user_data);
-void reply_to_all          (GtkWidget *widget, gpointer user_data);
-
-void colour_msg            (GtkWidget *widget, gpointer user_data);
-void delete_msg            (GtkWidget *widget, gpointer user_data);
-void undelete_msg          (GtkWidget *widget, gpointer user_data);
-void move_msg_cb           (GtkWidget *widget, gpointer user_data);
-void copy_msg_cb           (GtkWidget *widget, gpointer user_data);
-void addrbook_sender       (GtkWidget *widget, gpointer user_data);
-void apply_filters         (GtkWidget *widget, gpointer user_data);
-void print_msg             (GtkWidget *widget, gpointer user_data);
-void print_preview_msg     (GtkWidget *widget, gpointer user_data);
-void edit_msg              (GtkWidget *widget, gpointer user_data);
-void open_msg              (GtkWidget *widget, gpointer user_data);
-void save_msg              (GtkWidget *widget, gpointer user_data);
-void view_msg              (GtkWidget *widget, gpointer user_data);
-void view_digest           (GtkWidget *widget, gpointer user_data);
-void view_source           (GtkWidget *widget, gpointer user_data);
-void next_msg              (GtkWidget *widget, gpointer user_data);
-void next_unread_msg       (GtkWidget *widget, gpointer user_data);
-void next_flagged_msg      (GtkWidget *widget, gpointer user_data);
-void next_thread           (GtkWidget *widget, gpointer user_data);
-void previous_msg          (GtkWidget *widget, gpointer user_data);
-void previous_unread_msg   (GtkWidget *widget, gpointer user_data);
-void previous_flagged_msg  (GtkWidget *widget, gpointer user_data);
-void resend_msg            (GtkWidget *widget, gpointer user_data);
-void search_msg            (GtkWidget *widget, gpointer user_data);
-void load_images           (GtkWidget *widget, gpointer user_data);
-
-void add_sender_to_addrbook    (BonoboUIComponent *uih, void *user_data, const char *path);
-void move_msg                  (BonoboUIComponent *uih, void *user_data, const char *path);
-void copy_msg                  (BonoboUIComponent *uih, void *user_data, const char *path);
-void select_all                (BonoboUIComponent *uih, void *user_data, const char *path);
-void select_thread             (BonoboUIComponent *uih, void *user_data, const char *path);
-void invert_selection          (BonoboUIComponent *uih, void *user_data, const char *path);
-void mark_as_seen              (BonoboUIComponent *uih, void *user_data, const char *path);
-void mark_all_as_seen          (BonoboUIComponent *uih, void *user_data, const char *path);
-void mark_as_unseen            (BonoboUIComponent *uih, void *user_data, const char *path);
-void mark_as_important         (BonoboUIComponent *uih, void *user_data, const char *path);
-void mark_as_unimportant       (BonoboUIComponent *uih, void *user_data, const char *path);
-void toggle_as_important       (BonoboUIComponent *uih, void *user_data, const char *path);
-void flag_for_followup         (BonoboUIComponent *uih, void *user_data, const char *path);
-void flag_followup_completed   (BonoboUIComponent *uih, void *user_data, const char *path);
-void flag_followup_clear       (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void zoom_in               (BonoboUIComponent *uih, void *user_data, const char *path);
-void zoom_out              (BonoboUIComponent *uih, void *user_data, const char *path);
-void zoom_reset            (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void edit_message          (BonoboUIComponent *uih, void *user_data, const char *path);
-void open_message          (BonoboUIComponent *uih, void *user_data, const char *path);
-void expunge_folder        (BonoboUIComponent *uih, void *user_data, const char *path);
-void filter_edit           (BonoboUIComponent *uih, void *user_data, const char *path);
-void vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path);
-void manage_subscriptions  (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void configure_folder      (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void stop_threads          (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void empty_trash           (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void mail_reply            (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, int mode);
-
-void composer_send_cb      (EMsgComposer *composer, gpointer data);
-void composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer data);
-
-void forward_messages	   (CamelFolder *folder, GPtrArray *uids, gboolean inline);
-
-/* CamelStore callbacks */
-void folder_created (CamelStore *store, const char *prefix, CamelFolderInfo *fi);
-void folder_deleted (CamelStore *store, CamelFolderInfo *fi);
-
-void mail_storage_create_folder (EvolutionStorage *storage, CamelStore *store, CamelFolderInfo *fi);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! MAIL_CALLBACKS_H */