This commit was manufactured by cvs2svn to create tagRELEASE-2_5_2

'RELEASE-2_5_2'.

svn path=/tags/RELEASE-2_5_2/; revision=23844

1 files changed, 0 insertions, 5055 deletions

diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
deleted file mode 100644
index c5f59ae298..0000000000
--- a/composer/e-msg-composer.c
+++ /dev/null
@@ -1,5055 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.c
- *
- * Copyright (C) 1999-2003 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
- * published by the Free Software Foundation; either version 2 of the
- * 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.
- *
- * Authors:
- *   Ettore Perazzoli (ettore@ximian.com)
- *   Jeffrey Stedfast (fejj@ximian.com)
- *   Miguel de Icaza  (miguel@ximian.com)
- *   Radek Doulik     (rodo@ximian.com)
- * 
- */
-
-/*
-
-   TODO
-
-   - Somehow users should be able to see if any file(s) are attached even when
-     the attachment bar is not shown.
-
-   Should use EventSources to keep track of global changes made to configuration
-   values.  Right now it ignores the problem olympically. Miguel.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define SMIME_SUPPORTED 1
-
-#include <string.h>
-#include <stdlib.h>
-#include <dirent.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkscrolledwindow.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
-#include <libgnome/gnome-exec.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-window-icon.h>
-
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <bonobo/bonobo-stream-memory.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-widget.h>
-
-#include <libgnomevfs/gnome-vfs.h>
-
-#include <gtkhtml/htmlselection.h>
-
-#include <glade/glade.h>
-
-#include <gal/util/e-iconv.h>
-#include <gal/e-text/e-entry.h>
-
-#include "e-util/e-dialog-utils.h"
-#include "widgets/misc/e-charset-picker.h"
-
-#include <camel/camel-session.h>
-#include <camel/camel-charset-map.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-charset.h>
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
-#include <camel/camel-smime-context.h>
-#endif
-
-#include "mail/em-utils.h"
-#include "mail/mail-crypto.h"
-#include "mail/mail-tools.h"
-#include "mail/mail-ops.h"
-#include "mail/mail-mt.h"
-#include "mail/mail-session.h"
-
-#include "e-msg-composer.h"
-#include "e-msg-composer-attachment-bar.h"
-#include "e-msg-composer-hdrs.h"
-#include "e-msg-composer-select-file.h"
-
-#include "evolution-shell-component-utils.h"
-
-#include "Editor.h"
-#include "listener.h"
-
-#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:3.1"
-
-#define d(x) x
-
-
-#define DEFAULT_WIDTH 600
-#define DEFAULT_HEIGHT 500
-
-enum {
-	SEND,
-	SAVE_DRAFT,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-enum {
-	DND_TYPE_MESSAGE_RFC822,
-	DND_TYPE_TEXT_URI_LIST,
-	DND_TYPE_NETSCAPE_URL,
-	DND_TYPE_TEXT_VCARD,
-};
-
-static GtkTargetEntry drop_types[] = {
-	{ "message/rfc822", 0, DND_TYPE_MESSAGE_RFC822 },
-	{ "text/uri-list", 0, DND_TYPE_TEXT_URI_LIST },
-	{ "_NETSCAPE_URL", 0, DND_TYPE_NETSCAPE_URL },
-	{ "text/x-vcard", 0, DND_TYPE_TEXT_VCARD },
-};
-
-static int num_drop_types = sizeof (drop_types) / sizeof (drop_types[0]);
-
-
-/* The parent class.  */
-static BonoboWindowClass *parent_class = NULL;
-
-/* All the composer windows open, for bookkeeping purposes.  */
-static GSList *all_composers = NULL;
-
-
-/* local prototypes */
-static GList *add_recipients   (GList *list, const char *recips, gboolean decode);
-
-static void handle_mailto (EMsgComposer *composer, const char *mailto);
-
-static void message_rfc822_dnd (EMsgComposer *composer, CamelStream *stream);
-
-/* used by e_msg_composer_add_message_attachments() */
-static void add_attachments_from_multipart (EMsgComposer *composer, CamelMultipart *multipart,
-					    gboolean just_inlines, int depth);
-
-/* used by e_msg_composer_new_with_message() */
-static void handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-static void handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-static void handle_multipart_encrypted (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-static void handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-
-static void set_editor_signature (EMsgComposer *composer);
-
-
-static GByteArray *
-get_text (Bonobo_PersistStream persist, char *format)
-{
-	BonoboStream *stream;
-	BonoboStreamMem *stream_mem;
-	CORBA_Environment ev;
-	GByteArray *text;
-	
-	CORBA_exception_init (&ev);
-	
-	stream = bonobo_stream_mem_create (NULL, 0, FALSE, TRUE);
-	Bonobo_PersistStream_save (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)),
-				   format, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Exception getting mail '%s'",
-			   bonobo_exception_get_text (&ev));
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	stream_mem = BONOBO_STREAM_MEM (stream);
-	text = g_byte_array_new ();
-	g_byte_array_append (text, stream_mem->buffer, stream_mem->pos);
-	bonobo_object_unref (BONOBO_OBJECT (stream));
-	
-	return text;
-}
-
-#define LINE_LEN 72
-
-static CamelTransferEncoding
-best_encoding (GByteArray *buf, const char *charset)
-{
-	char *in, *out, outbuf[256], *ch;
-	size_t inlen, outlen;
-	int status, count = 0;
-	iconv_t cd;
-	
-	if (!charset)
-		return -1;
-	
-	cd = e_iconv_open (charset, "utf-8");
-	if (cd == (iconv_t) -1)
-		return -1;
-	
-	in = buf->data;
-	inlen = buf->len;
-	do {
-		out = outbuf;
-		outlen = sizeof (outbuf);
-		status = e_iconv (cd, (const char **) &in, &inlen, &out, &outlen);
-		for (ch = out - 1; ch >= outbuf; ch--) {
-			if ((unsigned char)*ch > 127)
-				count++;
-		}
-	} while (status == (size_t) -1 && errno == E2BIG);
-	e_iconv_close (cd);
-	
-	if (status == (size_t) -1)
-		return -1;
-	
-	if (count == 0)
-		return CAMEL_TRANSFER_ENCODING_7BIT;
-	else if (count <= buf->len * 0.17)
-		return CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE;
-	else
-		return CAMEL_TRANSFER_ENCODING_BASE64;
-}
-
-static const char *
-composer_get_default_charset_setting (void)
-{
-	GConfClient *gconf;
-	const char *charset;
-	char *buf;
-	
-	gconf = gconf_client_get_default ();
-	buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
-	
-	if (buf == NULL || buf[0] == '\0') {
-		g_free (buf);
-		buf = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
-		if (buf && buf[0] == '\0') {
-			g_free (buf);
-			buf = NULL;
-		}
-	}
-	
-	g_object_unref (gconf);
-	
-	if (buf != NULL) {
-		charset = e_iconv_charset_name (buf);
-		g_free (buf);
-	} else
-		charset = e_iconv_locale_charset ();
-	
-	return charset ? charset : "us-ascii";
-}
-
-static const char *
-best_charset (GByteArray *buf, const char *default_charset, CamelTransferEncoding *encoding)
-{
-	const char *charset;
-	
-	/* First try US-ASCII */
-	*encoding = best_encoding (buf, "US-ASCII");
-	if (*encoding == CAMEL_TRANSFER_ENCODING_7BIT)
-		return NULL;
-	
-	/* Next try the user-specified charset for this message */
-	charset = default_charset;
-	*encoding = best_encoding (buf, charset);
-	if (*encoding != -1)
-		return charset;
-	
-	/* Now try the user's default charset from the mail config */
-	charset = composer_get_default_charset_setting ();
-	*encoding = best_encoding (buf, charset);
-	if (*encoding != -1)
-		return charset;
-	
-	/* Try to find something that will work */
-	charset = camel_charset_best (buf->data, buf->len);
-	if (!charset)
-		*encoding = CAMEL_TRANSFER_ENCODING_7BIT;
-	else
-		*encoding = best_encoding (buf, charset);
-	
-	return charset;
-}
-
-static gboolean
-clear_inline_images (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	camel_object_unref (value);
-
-	return TRUE;
-}
-
-static void
-clear_current_images (EMsgComposer *composer)
-{
-	g_list_free (composer->current_images);
-	composer->current_images = NULL;
-}
-
-static gboolean
-clear_url (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-
-	return TRUE;
-}
-
-void
-e_msg_composer_clear_inlined_table (EMsgComposer *composer)
-{
-	g_hash_table_foreach_remove (composer->inline_images, clear_inline_images, NULL);
-	g_hash_table_foreach_remove (composer->inline_images_by_url, clear_url, NULL);
-}
-
-static void
-add_inlined_images (EMsgComposer *composer, CamelMultipart *multipart)
-{
-	GList *d = composer->current_images;
-	GHashTable *added;
-
-	added = g_hash_table_new (g_direct_hash, g_direct_equal);
-	while (d) {
-		CamelMimePart *part = d->data;
-
-		if (!g_hash_table_lookup (added, part)) {
-			camel_multipart_add_part (multipart, part);
-			g_hash_table_insert (added, part, part);
-		}
-		d = d->next;
-	}
-	g_hash_table_destroy (added);
-}
-
-/* This functions builds a CamelMimeMessage for the message that the user has
- * composed in `composer'.
- */
-static CamelMimeMessage *
-build_message (EMsgComposer *composer, gboolean save_html_object_data)
-{
-	EMsgComposerAttachmentBar *attachment_bar =
-		E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar);
-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	CamelDataWrapper *plain, *html, *current;
-	CamelTransferEncoding plain_encoding;
-	GPtrArray *recipients = NULL;
-	CamelMultipart *body = NULL;
-	CamelContentType *type;
-	CamelMimeMessage *new;
-	const char *charset = NULL;
-	CamelStream *stream;
-	CamelMimePart *part;
-	CamelException ex;
-	GByteArray *data;
-	int i;
-	
-	if (composer->persist_stream_interface == CORBA_OBJECT_NIL)
-		return NULL;
-	
-	/* evil kludgy hack for Redirect */
-	if (composer->redirect) {
-		e_msg_composer_hdrs_to_redirect (hdrs, composer->redirect);
-		camel_object_ref (composer->redirect);
-		return composer->redirect;
-	}
-	
-	new = camel_mime_message_new ();
-	e_msg_composer_hdrs_to_message (hdrs, new);
-	for (i = 0; i < composer->extra_hdr_names->len; i++) {
-		camel_medium_add_header (CAMEL_MEDIUM (new),
-					 composer->extra_hdr_names->pdata[i],
-					 composer->extra_hdr_values->pdata[i]);
-	}
-	
-	if (composer->mime_body) {
-		plain_encoding = CAMEL_TRANSFER_ENCODING_7BIT;
-		for (i = 0; composer->mime_body[i]; i++) {
-			if ((unsigned char) composer->mime_body[i] > 127) {
-				plain_encoding = CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE;
-				break;
-			}
-		}
-		data = g_byte_array_new ();
-		g_byte_array_append (data, composer->mime_body, strlen (composer->mime_body));
-		type = camel_content_type_decode (composer->mime_type);
-	} else {
-		data = get_text (composer->persist_stream_interface, "text/plain");
-		if (!data) {
-			/* The component has probably died */
-			camel_object_unref (CAMEL_OBJECT (new));
-			return NULL;
-		}
-		
-		/* FIXME: we may want to do better than this... */
-		charset = best_charset (data, composer->charset, &plain_encoding);
-		type = camel_content_type_new ("text", "plain");
-		if (charset)
-			camel_content_type_set_param (type, "charset", charset);
-	}
-	
-	stream = camel_stream_mem_new_with_byte_array (data);
-	
-	/* convert the stream to the appropriate charset */
-	if (charset && strcasecmp (charset, "UTF-8") != 0) {
-		CamelStreamFilter *filter_stream;
-		CamelMimeFilterCharset *filter;
-		
-		filter_stream = camel_stream_filter_new_with_stream (stream);
-		camel_object_unref (stream);
-		
-		stream = (CamelStream *) filter_stream;
-		filter = camel_mime_filter_charset_new_convert ("UTF-8", charset);
-		camel_stream_filter_add (filter_stream, (CamelMimeFilter *) filter);
-		camel_object_unref (filter);
-	}
-	
-	/* construct the content object */
-	plain = camel_data_wrapper_new ();
-	camel_data_wrapper_construct_from_stream (plain, stream);
-	camel_object_unref (stream);
-	
-	camel_data_wrapper_set_mime_type_field (plain, type);
-	camel_content_type_unref (type);
-	
-	if (composer->send_html) {
-		CORBA_Environment ev;
-		clear_current_images (composer);
-		
-		if (save_html_object_data) {
-			CORBA_exception_init (&ev);
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "save-data-on", &ev);
-		}
-		data = get_text (composer->persist_stream_interface, "text/html");		
-		if (save_html_object_data) {
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "save-data-off", &ev);
-			CORBA_exception_free (&ev);
-		}
-		
-		if (!data) {
-			/* The component has probably died */
-			camel_object_unref (new);
-			camel_object_unref (plain);
-			return NULL;
-		}
-		
-		html = camel_data_wrapper_new ();
-		
-		stream = camel_stream_mem_new_with_byte_array (data);
-		camel_data_wrapper_construct_from_stream (html, stream);
-		camel_object_unref (stream);
-		camel_data_wrapper_set_mime_type (html, "text/html; charset=utf-8");
-		
-		/* Build the multipart/alternative */
-		body = camel_multipart_new ();
-		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (body),
-						  "multipart/alternative");
-		camel_multipart_set_boundary (body, NULL);
-		
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), plain);
-		camel_object_unref (plain);
-		camel_mime_part_set_encoding (part, plain_encoding);
-		camel_multipart_add_part (body, part);
-		camel_object_unref (part);
-		
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), html);
-		camel_object_unref (html);
-		camel_multipart_add_part (body, part);
-		camel_object_unref (part);
-		
-		/* If there are inlined images, construct a
-		 * multipart/related containing the
-		 * multipart/alternative and the images.
-		 */
-		if (composer->current_images) {
-			CamelMultipart *html_with_images;
-			
-			html_with_images = camel_multipart_new ();
-			camel_data_wrapper_set_mime_type (
-				CAMEL_DATA_WRAPPER (html_with_images),
-				"multipart/related; type=\"multipart/alternative\"");
-			camel_multipart_set_boundary (html_with_images, NULL);
-			
-			part = camel_mime_part_new ();
-			camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (body));
-			camel_object_unref (body);
-			camel_multipart_add_part (html_with_images, part);
-			camel_object_unref (part);
-			
-			add_inlined_images (composer, html_with_images);
-			clear_current_images (composer);
-			
-			current = CAMEL_DATA_WRAPPER (html_with_images);
-		} else
-			current = CAMEL_DATA_WRAPPER (body);
-	} else
-		current = plain;
-	
-	if (e_msg_composer_attachment_bar_get_num_attachments (attachment_bar)) {
-		CamelMultipart *multipart = camel_multipart_new ();
-		
-		if (composer->is_alternative) {
-			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
-							  "multipart/alternative");
-		}
-		
-		/* Generate a random boundary. */
-		camel_multipart_set_boundary (multipart, NULL);
-		
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), current);
-		if (current == plain)
-			camel_mime_part_set_encoding (part, plain_encoding);
-		camel_object_unref (current);
-		camel_multipart_add_part (multipart, part);
-		camel_object_unref (part);
-		
-		e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart, composer->charset);
-		
-		if (composer->is_alternative) {
-			int i;
-			
-			for (i = camel_multipart_get_number (multipart); i > 1; i--) {
-				part = camel_multipart_get_part (multipart, i - 1);
-				camel_medium_remove_header (CAMEL_MEDIUM (part), "Content-Disposition");
-			}
-		}
-		
-		current = CAMEL_DATA_WRAPPER (multipart);
-	}
-	
-	camel_exception_init (&ex);
-
-	/* Setup working recipient list if we're encrypting */
-	if (composer->pgp_encrypt
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
-	    || composer->smime_encrypt
-#endif
-		) {
-		int i, j;
-		const char *types[] = { CAMEL_RECIPIENT_TYPE_TO, CAMEL_RECIPIENT_TYPE_CC, CAMEL_RECIPIENT_TYPE_BCC };
-
-		recipients = g_ptr_array_new();
-		for (i=0; i < sizeof(types)/sizeof(types[0]); i++) {
-			const CamelInternetAddress *addr;
-			const char *address;
-
-			addr = camel_mime_message_get_recipients(new, types[i]);
-			for (j=0;camel_internet_address_get(addr, j, NULL, &address); j++)
-				g_ptr_array_add(recipients, g_strdup (address));
-
-		}
-	}
-	
-	if (composer->pgp_sign || composer->pgp_encrypt) {
-		const char *pgp_userid;
-		CamelInternetAddress *from = NULL;
-		CamelCipherContext *cipher;
-
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), current);
-		if (current == plain)
-			camel_mime_part_set_encoding (part, plain_encoding);
-		camel_object_unref (current);
-
-		if (hdrs->account && hdrs->account->pgp_key && *hdrs->account->pgp_key) {
-			pgp_userid = hdrs->account->pgp_key;
-		} else {
-			from = e_msg_composer_hdrs_get_from(hdrs);
-			camel_internet_address_get(from, 0, NULL, &pgp_userid);
-		}
-		
-		if (composer->pgp_sign) {
-			CamelMimePart *npart = camel_mime_part_new();
-
-			cipher = mail_crypto_get_pgp_cipher_context(hdrs->account);
-			camel_cipher_sign(cipher, pgp_userid, CAMEL_CIPHER_HASH_SHA1, part, npart, &ex);
-			camel_object_unref(cipher);
-			
-			if (camel_exception_is_set(&ex)) {
-				camel_object_unref(npart);
-				goto exception;
-			}
-
-			camel_object_unref(part);
-			part = npart;
-		}
-		
-		if (composer->pgp_encrypt) {
-			CamelMimePart *npart = camel_mime_part_new();
-
-			/* check to see if we should encrypt to self, NB gets removed immediately after use */
-			if (hdrs->account && hdrs->account->pgp_encrypt_to_self && pgp_userid)
-				g_ptr_array_add (recipients, (char *)pgp_userid);
-
-			cipher = mail_crypto_get_pgp_cipher_context (hdrs->account);
-			camel_cipher_encrypt(cipher, pgp_userid, recipients, part, npart, &ex);
-			camel_object_unref (cipher);
-
-			if (hdrs->account && hdrs->account->pgp_encrypt_to_self && pgp_userid)
-				g_ptr_array_set_size(recipients, recipients->len - 1);
-
-			if (camel_exception_is_set (&ex)) {
-				camel_object_unref(npart);
-				goto exception;
-			}
-
-			camel_object_unref (part);
-			part = npart;
-		}
-
-		if (from)
-			camel_object_unref (from);	
-	
-		current = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-		camel_object_ref (current);
-		camel_object_unref (part);
-	}
-	
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
-	if (composer->smime_sign || composer->smime_encrypt) {
-		CamelInternetAddress *from = NULL;
-		CamelCipherContext *cipher;
-
-		part = camel_mime_part_new();
-		camel_medium_set_content_object((CamelMedium *)part, current);
-		if (current == plain)
-			camel_mime_part_set_encoding(part, plain_encoding);
-		camel_object_unref(current);
-
-		if (composer->smime_sign
-		    && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
-			camel_exception_setv(&ex, 1, _("Cannot sign outgoing message: No signing certificate set for from account"));
-			goto exception;
-		}
-
-		if (composer->smime_encrypt
-		    && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
-			camel_exception_setv(&ex, 1, _("Cannot encrypt outgoing message: No encryption certificate set for from account"));
-			goto exception;
-		}
-
-		if (composer->smime_sign) {
-			CamelMimePart *npart = camel_mime_part_new();
-
-			cipher = camel_smime_context_new(session);
-
-			/* if we're also encrypting, envelope-sign rather than clear-sign */
-			if (composer->smime_encrypt) {
-				camel_smime_context_set_sign_mode((CamelSMIMEContext *)cipher, CAMEL_SMIME_SIGN_ENVELOPED);
-				camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
-			} else if (hdrs->account && hdrs->account->smime_encrypt_key && *hdrs->account->smime_encrypt_key) {
-				camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
-			}
-
-			camel_cipher_sign(cipher, hdrs->account->smime_sign_key, CAMEL_CIPHER_HASH_SHA1, part, npart, &ex);
-			camel_object_unref(cipher);
-			
-			if (camel_exception_is_set(&ex)) {
-				camel_object_unref(npart);
-				goto exception;
-			}
-
-			camel_object_unref(part);
-			part = npart;
-		}
-	
-		if (composer->smime_encrypt) {
-			/* check to see if we should encrypt to self, NB removed after use */
-			if (hdrs->account->smime_encrypt_to_self)
-				g_ptr_array_add(recipients, hdrs->account->smime_encrypt_key);
-
-			cipher = camel_smime_context_new(session);
-			camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
-
-			camel_cipher_encrypt(cipher, NULL, recipients, part, (CamelMimePart *)new, &ex);
-			camel_object_unref(cipher);
-
-			if (camel_exception_is_set(&ex))
-				goto exception;
-
-			if (hdrs->account->smime_encrypt_to_self)
-				g_ptr_array_set_size(recipients, recipients->len - 1);
-		}
-
-		if (from)
-			camel_object_unref(from);
-
-		/* we replaced the message directly, we don't want to do reparenting foo */
-		if (composer->smime_encrypt) {
-			camel_object_unref(part);
-			goto skip_content;
-		} else {
-			current = camel_medium_get_content_object((CamelMedium *)part);
-			camel_object_ref(current);
-			camel_object_unref(part);
-		}
-	}
-#endif /* HAVE_NSS */
-
-	camel_medium_set_content_object (CAMEL_MEDIUM (new), current);
-	if (current == plain)
-		camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);
-	camel_object_unref (current);
-
-skip_content:
-
-	if (recipients) {
-		for (i=0; i<recipients->len; i++)
-			g_free(recipients->pdata[i]);
-		g_ptr_array_free(recipients, TRUE);
-	}
-
-	/* Attach whether this message was written in HTML */
-	camel_medium_set_header (CAMEL_MEDIUM (new), "X-Evolution-Format",
-				 composer->send_html ? "text/html" : "text/plain");
-	
-	return new;
-	
- exception:
-	
-	if (part != CAMEL_MIME_PART (new))
-		camel_object_unref (part);
-	
-	camel_object_unref (new);
-	
-	if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) {
-		GtkWidget *dialog;
-
-		dialog = gtk_message_dialog_new(GTK_WINDOW(composer),
-						GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-						GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-						"%s", camel_exception_get_description (&ex));
-		gtk_dialog_run(GTK_DIALOG(dialog));
-		gtk_widget_destroy(dialog);
-	}
-
-	camel_exception_clear (&ex);
-
-	if (recipients) {
-		for (i=0; i<recipients->len; i++)
-			g_free(recipients->pdata[i]);
-		g_ptr_array_free(recipients, TRUE);
-	}
-	
-	return NULL;
-}
-
-
-static char *
-get_file_content (EMsgComposer *composer, const char *file_name, gboolean want_html, guint flags, gboolean warn)
-{
-	CamelStreamFilter *filtered_stream;
-	CamelStreamMem *memstream;
-	CamelMimeFilter *html, *charenc;
-	CamelStream *stream;
-	GByteArray *buffer;
-	const char *charset;
-	char *content;
-	int fd;
-	
-	fd = open (file_name, O_RDONLY);
-	if (fd == -1) {
-		if (warn) {
-			GtkWidget *dialog;
-
-			dialog = gtk_message_dialog_new(GTK_WINDOW(composer),
-							GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-							GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-							_("Error while reading file %s:\n%s"),
-							file_name, g_strerror (errno));
-			gtk_dialog_run(GTK_DIALOG(dialog));
-			gtk_widget_destroy(dialog);
-		}
-		return g_strdup ("");
-	}
-	
-	stream = camel_stream_fs_new_with_fd (fd);
-	
-	if (want_html) {
-		filtered_stream = camel_stream_filter_new_with_stream (stream);
-		camel_object_unref (stream);
-		
-		html = camel_mime_filter_tohtml_new (flags, 0);
-		camel_stream_filter_add (filtered_stream, html);
-		camel_object_unref (html);
-		
-		stream = (CamelStream *) filtered_stream;
-	}
-	
-	memstream = (CamelStreamMem *) camel_stream_mem_new ();
-	buffer = g_byte_array_new ();
-	camel_stream_mem_set_byte_array (memstream, buffer);
-	
-	camel_stream_write_to_stream (stream, (CamelStream *) memstream);
-	camel_object_unref (stream);
-	
-	/* The newer signature UI saves signatures in UTF-8, but we still need to check that
-	   the signature is valid UTF-8 because it is possible that the user imported a
-	   signature file that is in his/her locale charset. If it's not in UTF-8 and not in
-	   the charset the composer is in (or their default mail charset) then fuck it,
-	   there's nothing we can do. */
-	if (buffer->len && !g_utf8_validate (buffer->data, buffer->len, NULL)) {
-		stream = (CamelStream *) memstream;
-		memstream = (CamelStreamMem *) camel_stream_mem_new ();
-		camel_stream_mem_set_byte_array (memstream, g_byte_array_new ());
-		
-		filtered_stream = camel_stream_filter_new_with_stream (stream);
-		camel_object_unref (stream);
-		
-		charset = composer ? composer->charset : composer_get_default_charset_setting ();
-		charenc = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "utf-8");
-		camel_stream_filter_add (filtered_stream, charenc);
-		camel_object_unref (charenc);
-		
-		camel_stream_write_to_stream ((CamelStream *) filtered_stream, (CamelStream *) memstream);
-		camel_object_unref (filtered_stream);
-		g_byte_array_free (buffer, TRUE);
-		
-		buffer = memstream->buffer;
-	}
-	
-	camel_object_unref (memstream);
-	
-	g_byte_array_append (buffer, "", 1);
-	content = buffer->data;
-	g_byte_array_free (buffer, FALSE);
-	
-	return content;
-}
-
-char *
-e_msg_composer_get_sig_file_content (const char *sigfile, gboolean in_html)
-{
-	if (!sigfile || !*sigfile) {
-		return NULL;
-	}
-	
-	return get_file_content (NULL, sigfile, !in_html, CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, FALSE);
-}
-
-static void
-prepare_engine (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	/* printf ("prepare_engine\n"); */
-	
-	CORBA_exception_init (&ev);
-	composer->editor_engine = (GNOME_GtkHTML_Editor_Engine) Bonobo_Unknown_queryInterface
-		(bonobo_widget_get_objref (BONOBO_WIDGET (composer->editor)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &ev);
-	if ((composer->editor_engine != CORBA_OBJECT_NIL) && (ev._major == CORBA_NO_EXCEPTION)) {
-		
-		/* printf ("trying set listener\n"); */
-		composer->editor_listener = BONOBO_OBJECT (listener_new (composer));
-		if (composer->editor_listener != NULL)
-			GNOME_GtkHTML_Editor_Engine__set_listener (composer->editor_engine,
-								   (GNOME_GtkHTML_Editor_Listener)
-								   bonobo_object_dup_ref
-								   (bonobo_object_corba_objref (composer->editor_listener),
-								    &ev),
-								   &ev);
-		
-		if ((ev._major != CORBA_NO_EXCEPTION) || (composer->editor_listener == NULL)) {
-			CORBA_Environment err_ev;
-
-			CORBA_exception_init (&err_ev);
-			
-			Bonobo_Unknown_unref (composer->editor_engine, &err_ev);
-			CORBA_Object_release (composer->editor_engine, &err_ev);
-
-			CORBA_exception_free (&err_ev);
-
-			composer->editor_engine = CORBA_OBJECT_NIL;
-			g_warning ("Can't establish Editor Listener\n");
-		}
-	} else {
-		composer->editor_engine = CORBA_OBJECT_NIL;
-		g_warning ("Can't get Editor Engine\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gchar *
-encode_signature_name (const gchar *name)
-{
-	const gchar *s;
-	gchar *ename, *e;
-	gint len = 0;
-
-	s = name;
-	while (*s) {
-		len ++;
-		if (*s == '"' || *s == '.' || *s == '=')
-			len ++;
-		s ++;
-	}
-
-	ename = g_new (gchar, len + 1);
-
-	s = name;
-	e = ename;
-	while (*s) {
-		if (*s == '"') {
-			*e = '.';
-			e ++;
-			*e = '1';
-			e ++;
-		} else if (*s == '=') {
-			*e = '.';
-			e ++;
-			*e = '2';
-			e ++;
-		} else {
-			*e = *s;
-			e ++;
-		}
-		if (*s == '.') {
-			*e = '.';
-			e ++;
-		}
-		s ++;
-	}
-	*e = 0;
-	
-	return ename;
-}
-
-static gchar *
-decode_signature_name (const gchar *name)
-{
-	const gchar *s;
-	gchar *dname, *d;
-	gint len = 0;
-
-	s = name;
-	while (*s) {
-		len ++;
-		if (*s == '.') {
-			s ++;
-			if (!*s || !(*s == '.' || *s == '1' || *s == '2'))
-				return NULL;
-		}
-		s ++;
-	}
-
-	dname = g_new (gchar, len + 1);
-
-	s = name;
-	d = dname;
-	while (*s) {
-		if (*s == '.') {
-			s ++;
-			if (!*s || !(*s == '.' || *s == '1' || *s == '2')) {
-				g_free (dname);
-				return NULL;
-			}
-			if (*s == '1')
-				*d = '"';
-			else if (*s == '2')
-				*d = '=';
-			else
-				*d = '.';
-		} else
-			*d = *s;
-		d ++;
-		s ++;
-	}
-	*d = 0;
-
-	return dname;
-}
-
-#define CONVERT_SPACES CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES
-
-static char *
-get_signature_html (EMsgComposer *composer)
-{
-	gboolean format_html = FALSE;
-	char *text = NULL, *html = NULL, *sig_file = NULL, *script = NULL;
-	
-	if (composer->signature) {
-		sig_file = composer->signature->filename;
-		format_html = composer->signature->html;
-		script = composer->signature->script;
-	} else if (composer->auto_signature) {
-		EAccountIdentity *id;
-		char *organization;
-		char *address;
-		char *name;
-		
-		id = E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id;
-		address = id->address ? camel_text_to_html (id->address, CONVERT_SPACES, 0) : NULL;
-		name = id->name ? camel_text_to_html (id->name, CONVERT_SPACES, 0) : NULL;
-		organization = id->organization ? camel_text_to_html (id->organization, CONVERT_SPACES, 0) : NULL;
-		
-		text = g_strdup_printf ("-- <BR>%s%s%s%s%s%s%s%s",
-					name ? name : "",
-					(address && *address) ? " &lt;<A HREF=\"mailto:" : "",
-					address ? address : "",
-					(address && *address) ? "\">" : "",
-					address ? address : "",
-					(address && *address) ? "</A>&gt;" : "",
-					(organization && *organization) ? "<BR>" : "",
-					organization ? organization : "");
-		g_free (address);
-		g_free (name);
-		g_free (organization);
-		format_html = TRUE;
-	}
-
-	if (!text) {
-		if (script)
-			text = mail_config_signature_run_script (script);
-		else {
-			if (!sig_file)
-				return NULL;
-			/* printf ("sig file: %s\n", sig_file); */
-			text = e_msg_composer_get_sig_file_content (sig_file, format_html);
-		}
-	}
-
-	/* printf ("text: %s\n", text); */
-	if (text) {
-		gchar *encoded_name = NULL;
-
-		if (composer->signature)
-			encoded_name = encode_signature_name (composer->signature->name);
-
-		/* The signature dash convention ("-- \n") is specified in the
-		 * "Son of RFC 1036": http://www.chemie.fu-berlin.de/outerspace/netnews/son-of-1036.html,
-		 * section 4.3.2.
-		 */
-		html = g_strdup_printf ("<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature\" value=\"1\">-->"
-					"<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature_name\" value=\"%s%s\">-->"
-					"<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD>"
-					"%s%s%s%s"
-					"</TD></TR></TABLE>",
-					composer->signature ? "name:" : "auto",
-					composer->signature ? encoded_name : "",
-					format_html ? "" : "<PRE>\n",
-					format_html || (!strncmp ("-- \n", text, 4) || strstr(text, "\n-- \n")) ? "" : "-- \n",
-					text,
-					format_html ? "" : "</PRE>\n");
-		g_free (text);
-		g_free (encoded_name);
-		text = html;
-	}
-	
-	return text;
-}
-
-static void
-set_editor_text (EMsgComposer *composer, const char *text)
-{
-	Bonobo_PersistStream persist;
-	BonoboStream *stream;
-	BonoboWidget *editor;
-	CORBA_Environment ev;
-	Bonobo_Unknown object;
-	
-	g_return_if_fail (composer->persist_stream_interface != CORBA_OBJECT_NIL);
-	
-	persist = composer->persist_stream_interface;
-	
-	editor = BONOBO_WIDGET (composer->editor);
-	
-	CORBA_exception_init (&ev);
-	
-	stream = bonobo_stream_mem_create (text, strlen (text), TRUE, FALSE);
-	object = bonobo_object_corba_objref (BONOBO_OBJECT (stream));
-	Bonobo_PersistStream_load (persist, (Bonobo_Stream) object, "text/html", &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		/* FIXME. Some error message. */
-		bonobo_object_unref (BONOBO_OBJECT (stream));
-		CORBA_exception_free (&ev);
-		return;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	bonobo_object_unref (BONOBO_OBJECT (stream));
-}
-
-/* Commands.  */
-
-static void
-show_attachments (EMsgComposer *composer,
-		  gboolean show)
-{
-	if (show) {
-		gtk_widget_show (composer->attachment_scrolled_window);
-		gtk_widget_show (composer->attachment_bar);
-	} else {
-		gtk_widget_hide (composer->attachment_scrolled_window);
-		gtk_widget_hide (composer->attachment_bar);
-	}
-	
-	composer->attachment_bar_visible = show;
-	
-	/* Update the GUI.  */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewAttach",
-		"state", show ? "1" : "0", NULL);
-}
-
-static void
-save (EMsgComposer *composer, const char *default_filename)
-{
-	CORBA_Environment ev;
-	char *filename;
-	int fd;
-	
-	if (default_filename != NULL)
-		filename = g_strdup (default_filename);
-	else
-		filename = e_msg_composer_select_file (composer, _("Save as..."));
-	
-	if (filename == NULL)
-		return;
-	
-	/* check to see if we already have the file and that we can create it */
-	if ((fd = open (filename, O_RDONLY | O_CREAT | O_EXCL, 0777)) == -1) {
-		int resp, errnosav = errno;
-		GtkWidget *dialog;
-		struct stat st;
-		
-		if (stat (filename, &st) == 0 && S_ISREG (st.st_mode)) {
-			dialog = gtk_message_dialog_new (GTK_WINDOW (composer),
-							 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-							 GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-							 _("File exists, overwrite?"));
-			resp = gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-			if (resp != GTK_RESPONSE_YES) {
-				g_free (filename);
-				return;
-			}
-		} else {
-			dialog = gtk_message_dialog_new (GTK_WINDOW (composer),
-							 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-							 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-							 _("Error saving file: %s"), g_strerror (errnosav));
-			gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-			g_free (filename);
-			return;
-		}
-	} else
-		close (fd);
-	
-	CORBA_exception_init (&ev);
-	
-	Bonobo_PersistFile_save (composer->persist_file_interface, filename, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		char *tmp = g_path_get_basename (filename);
-		
-		e_notice (composer, GTK_MESSAGE_ERROR, _("Error saving file: %s"), tmp);
-		g_free(tmp);
-	} else {
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "saved", &ev);
-		e_msg_composer_unset_autosaved (composer);
-	}
-	CORBA_exception_free (&ev);
-	
-	g_free (filename);
-}
-
-static void
-load (EMsgComposer *composer, const char *file_name)
-{
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	
-	Bonobo_PersistFile_load (composer->persist_file_interface, file_name, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		char *tmp = g_path_get_basename(file_name);
-
-		e_notice (composer, GTK_MESSAGE_ERROR,
-			  _("Error loading file: %s"), tmp);
-		g_free(tmp);
-	}
-	
-	CORBA_exception_free (&ev);
-}
-
-#define AUTOSAVE_SEED ".evolution-composer.autosave-XXXXXX"
-#define AUTOSAVE_INTERVAL 60000
-
-typedef struct _AutosaveManager AutosaveManager;
-struct _AutosaveManager {
-	GHashTable *table;
-	guint id;
-	gboolean ask;
-};
-
-static AutosaveManager *am = NULL;
-static void autosave_manager_start (AutosaveManager *am);
-static void autosave_manager_stop (AutosaveManager *am);
-
-static gboolean
-autosave_save_draft (EMsgComposer *composer)
-{
-	CamelMimeMessage *message;
-	CamelStream *stream;
-	char *file;
-	int fd, camelfd;
-	gboolean success = TRUE;
-	
-	if (!e_msg_composer_is_dirty (composer))
-		return TRUE;
-
-	fd = composer->autosave_fd;
-	file = composer->autosave_file;
-	
-	if (fd == -1) {
-		e_notice (composer, GTK_MESSAGE_ERROR,
-			  _("Error accessing file: %s"), file);
-		return FALSE;
-	}
-	
-	message = e_msg_composer_get_message_draft (composer);
-	
-	if (message == NULL) {
-		e_notice (composer, GTK_MESSAGE_ERROR,
-			  _("Unable to retrieve message from editor"));
-		return FALSE;
-	}
-	
-	if (lseek (fd, (off_t)0, SEEK_SET) == -1) {
-		camel_object_unref (message);
-		e_notice (composer, GTK_MESSAGE_ERROR,
-			  _("Unable to seek on file: %s\n%s"), file, g_strerror (errno));
-		return FALSE;
-	}
-	
-	if (ftruncate (fd, (off_t)0) == -1) {
-		camel_object_unref (message);
-		e_notice (composer, GTK_MESSAGE_ERROR,
-			  _("Unable to truncate file: %s\n%s"), file, g_strerror (errno));
-		return FALSE;
-	}
-
-	/* dup the fd because we dont want camel to close it when done */
-	camelfd = dup(fd);
-	if (fd == -1) {
-		camel_object_unref (message);
-		e_notice (composer, GTK_MESSAGE_ERROR,
-			  _("Unable to copy file descriptor: %s\n%s"), file, g_strerror (errno));
-		return FALSE;
-	}
-	
-	/* this does an lseek so we don't have to */
-	stream = camel_stream_fs_new_with_fd (camelfd);
-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream) == -1
-	    || camel_stream_close (CAMEL_STREAM (stream)) == -1) {
-		e_notice (composer, GTK_MESSAGE_ERROR,
-			  _("Error autosaving message: %s\n %s"), file, strerror(errno));
-		
-		success = FALSE;
-	} else {
-		CORBA_Environment ev;
-		CORBA_exception_init (&ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "saved", &ev);
-		CORBA_exception_free (&ev);
-		e_msg_composer_unset_changed (composer);
-		e_msg_composer_set_autosaved (composer);
-	}
-	
-	camel_object_unref (stream);
-	
-	camel_object_unref (message);
-	
-	return success;
-}
-
-static EMsgComposer * 
-autosave_load_draft (const char *filename)
-{
-	CamelStream *stream;
-	CamelMimeMessage *msg;
-	EMsgComposer *composer;
-	
-	g_return_val_if_fail (filename != NULL, NULL);
-	
-	g_warning ("autosave load filename = \"%s\"", filename);
-        
-	stream = camel_stream_fs_new_with_name (filename, O_RDONLY, 0);
-	
-	if (stream == NULL) 
-		return NULL;
-		
-	msg = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);
-	unlink (filename);
-	
-	composer = e_msg_composer_new_with_message (msg);
-	if (composer) {
-		autosave_save_draft (composer);
-		
-		g_signal_connect (GTK_OBJECT (composer), "send",
-				  G_CALLBACK (em_utils_composer_send_cb), NULL);
-		
-		g_signal_connect (GTK_OBJECT (composer), "save-draft",
-				  G_CALLBACK (em_utils_composer_save_draft_cb), NULL);
-		
-		gtk_widget_show (GTK_WIDGET (composer));
-	}
-	
-	camel_object_unref (stream);
-	return composer;
-}
-
-static gboolean
-autosave_is_owned (AutosaveManager *am, const char *file)
-{
-        return g_hash_table_lookup (am->table, file) != NULL;
-}
-
-static void
-autosave_manager_query_load_orphans (AutosaveManager *am, GtkWindow *parent)
-{
-	DIR *dir;
-	struct dirent *d;
-	GSList *match = NULL;
-	gint len = strlen (AUTOSAVE_SEED);
-	gint load = FALSE;
-	
-	dir = opendir (g_get_home_dir());
-	if (!dir) {
-		return;
-	}
-	
-	while ((d = readdir (dir))) {
-		if ((!strncmp (d->d_name, AUTOSAVE_SEED, len - 6))
-		    && (strlen (d->d_name) == len)
-		    && (!autosave_is_owned (am, d->d_name))) {
-			char *filename =  g_strdup_printf ("%s/%s", g_get_home_dir(), d->d_name);
-			struct stat st;
-		
-			/*
-			 * check if the file has any length,  It is a valid case if it doesn't 
-			 * so we simply don't ask then.
-			 */
-			if (stat (filename, &st) == -1 || st.st_size == 0) {
-				unlink (filename);
-				g_free (filename);
-				continue;
-			}
-			match = g_slist_prepend (match, filename);				
-		}
-	}
-	
-	closedir (dir);
-	
-	if (match != NULL) {
-		GtkWidget *dialog;
-
-		dialog = gtk_message_dialog_new (parent,
-						 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-						 _("Ximian Evolution has found unsaved files from a previous session.\n"
-						   "Would you like to try to recover them?"));
-		gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
-		load = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES;
-		gtk_widget_destroy (dialog);
-	}
-	
-	while (match != NULL) {
-		GSList *next = match->next;
-		char *filename = match->data;
-		EMsgComposer *composer;
-		
-		if (load) { 
-			composer = autosave_load_draft (filename);
-		} else {
-			unlink (filename);
-		}
-			
-		g_free (filename);
-		g_slist_free_1 (match);
-		match = next;
-	}			
-}
-
-static void
-autosave_run_foreach_cb (gpointer key, gpointer value, gpointer data)
-{
-	EMsgComposer *composer = E_MSG_COMPOSER (value);
-	
-	if (composer->enable_autosave)
-		autosave_save_draft (composer);
-}
-
-static gint
-autosave_run (gpointer data)
-{
-	AutosaveManager *am = data;
-	
-	g_hash_table_foreach (am->table, (GHFunc)autosave_run_foreach_cb, am);
-
-	autosave_manager_stop (am);
-	autosave_manager_start (am);
-	
-	return FALSE;
-}
-
-static gboolean
-autosave_init_file (EMsgComposer *composer)
-{
-	if (composer->autosave_file == NULL) {
-		composer->autosave_file = g_strdup_printf ("%s/%s", g_get_home_dir(), AUTOSAVE_SEED);
-		composer->autosave_fd = mkstemp (composer->autosave_file);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-static void
-autosave_manager_start (AutosaveManager *am)
-{
-	if (am->id == 0)
-		am->id = gtk_timeout_add (AUTOSAVE_INTERVAL, autosave_run, am);
-}
-
-static void
-autosave_manager_stop (AutosaveManager *am)
-{
-	if (am->id) {
-		gtk_timeout_remove (am->id);
-		am->id = 0;
-	}
-}
-
-static AutosaveManager *
-autosave_manager_new ()
-{
-	AutosaveManager *am;
-	
-	am = g_new (AutosaveManager, 1);
-	am->table = g_hash_table_new (g_str_hash, g_str_equal);
-	am->id = 0;
-	am->ask = TRUE;
-	
-	return am;
-}
-
-static void
-autosave_manager_register (AutosaveManager *am, EMsgComposer *composer) 
-{
-	char *key;
-	
-	g_return_if_fail (composer != NULL);
-	
-	if (autosave_init_file (composer)) {
-		key = g_path_get_basename (composer->autosave_file);
-		g_hash_table_insert (am->table, key, composer);
-		if (am->ask) {
-			/* keep recursion out of our bedrooms. */
-			am->ask = FALSE;
-			autosave_manager_query_load_orphans (am, (GtkWindow *)composer);
-			am->ask = TRUE;
-		}
-	}
-	autosave_manager_start (am);
-}
-
-static void
-autosave_manager_unregister (AutosaveManager *am, EMsgComposer *composer) 
-{
-	char *key, *oldkey;
-	void *olddata;
-
-	if (!composer->autosave_file)
-		return;
-
-	key = g_path_get_basename(composer->autosave_file);
-	if (g_hash_table_lookup_extended(am->table, key, (void **)&oldkey, &olddata)) {
-		g_hash_table_remove(am->table, oldkey);
-		g_free(oldkey);
-		g_free(key);
-	}
-	
-	/* only remove the file if we can successfully save it */
-	/* FIXME this test could probably be more efficient */
-	if (autosave_save_draft (composer)) {
-		unlink (composer->autosave_file);
-	}
-	close (composer->autosave_fd);
-	g_free (composer->autosave_file);
-	composer->autosave_file = NULL;
-	
-	if (g_hash_table_size (am->table) == 0)
-		autosave_manager_stop (am);
-}
-
-static void
-menu_file_save_draft_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	g_signal_emit (data, signals[SAVE_DRAFT], 0, FALSE);
-	e_msg_composer_unset_changed (E_MSG_COMPOSER (data));
-	e_msg_composer_unset_autosaved (E_MSG_COMPOSER (data));
-}
-
-/* Exit dialog.  (Displays a "Save composition to 'Drafts' before exiting?" warning before actually exiting.)  */
-
-static void
-do_exit (EMsgComposer *composer)
-{
-	const char *subject;
-	GtkWidget *dialog;
-	int button;
-	
-	if (!e_msg_composer_is_dirty (composer) && !e_msg_composer_is_autosaved (composer)) {
-		gtk_widget_destroy (GTK_WIDGET (composer));
-		return;
-	}
-	
-	gdk_window_raise (GTK_WIDGET (composer)->window);
-	
-	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs));
-	
-	dialog = gtk_message_dialog_new (GTK_WINDOW (composer),
-					 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					 GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE,
-					 _("The message \"%s\" has not been sent.\n\n"
-					   "Do you wish to save your changes?"),
-					 subject);
-	
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				_("_Discard Changes"), GTK_RESPONSE_NO,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_SAVE, GTK_RESPONSE_YES,
-				NULL);
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Warning: Modified Message"));
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
-	button = gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-	
-	switch (button) {
-	case GTK_RESPONSE_YES:
-		/* Save */
-		g_signal_emit (GTK_OBJECT (composer), signals[SAVE_DRAFT], 0, TRUE);
-		e_msg_composer_unset_changed (composer);
-		e_msg_composer_unset_autosaved (composer);
-		break;
-	case GTK_RESPONSE_NO:
-		/* Don't save */
-		gtk_widget_destroy (GTK_WIDGET (composer));
-		break;
-	case GTK_RESPONSE_CANCEL:
-		break;
-	}
-}
-
-/* Menu callbacks.  */
-
-static void
-menu_file_open_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	EMsgComposer *composer;
-	char *file_name;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	file_name = e_msg_composer_select_file (composer, _("Open file"));
-	if (file_name == NULL)
-		return;
-	
-	load (composer, file_name);
-	
-	g_free (file_name);
-}
-
-static void
-menu_file_save_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	EMsgComposer *composer;
-	CORBA_char *file_name;
-	CORBA_Environment ev;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	CORBA_exception_init (&ev);
-	
-	file_name = Bonobo_PersistFile_getCurrentFile (composer->persist_file_interface, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		save (composer, NULL);
-	} else {
-		save (composer, file_name);
-		CORBA_free (file_name);
-	}
-      	CORBA_exception_free (&ev);
-}
-
-static void
-menu_file_save_as_cb (BonoboUIComponent *uic,
-		      void *data,
-		      const char *path)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	save (composer, NULL);
-}
-
-static void
-menu_file_send_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	g_signal_emit (GTK_OBJECT (data), signals[SEND], 0);
-}
-
-static void
-menu_file_close_cb (BonoboUIComponent *uic,
-		    void *data,
-		    const char *path)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	do_exit (composer);
-}
-	
-static void
-menu_file_add_attachment_cb (BonoboUIComponent *uic,
-			     void *data,
-			     const char *path)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	e_msg_composer_attachment_bar_attach
-		(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-		 NULL);
-}
-
-static void
-menu_edit_cut_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	EMsgComposer *composer = data;
-	
-	g_return_if_fail (composer->focused_entry != NULL);
-	
-	if (GTK_IS_ENTRY (composer->focused_entry)) {
-		gtk_editable_cut_clipboard (GTK_EDITABLE (composer->focused_entry));
-	} else {
-		/* happy happy joy joy, an EEntry. */
-		g_assert_not_reached ();
-	}
-}
-
-static void
-menu_edit_copy_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	EMsgComposer *composer = data;
-	
-	g_return_if_fail (composer->focused_entry != NULL);
-	
-	if (GTK_IS_ENTRY (composer->focused_entry)) {
-		gtk_editable_copy_clipboard (GTK_EDITABLE (composer->focused_entry));
-	} else {
-		/* happy happy joy joy, an EEntry. */
-		g_assert_not_reached ();
-	}
-}
-
-static void
-menu_edit_paste_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	EMsgComposer *composer = data;
-	
-	g_return_if_fail (composer->focused_entry != NULL);
-	
-	if (GTK_IS_ENTRY (composer->focused_entry)) {
-		gtk_editable_paste_clipboard (GTK_EDITABLE (composer->focused_entry));
-	} else {
-		/* happy happy joy joy, an EEntry. */
-		g_assert_not_reached ();
-	}
-}
-
-static void
-menu_edit_select_all_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	EMsgComposer *composer = data;
-	
-	g_return_if_fail (composer->focused_entry != NULL);
-	
-	if (GTK_IS_ENTRY (composer->focused_entry)) {
-		gtk_editable_set_position (GTK_EDITABLE (composer->focused_entry), -1);
-		gtk_editable_select_region (GTK_EDITABLE (composer->focused_entry), 0, -1);
-	} else {
-		/* happy happy joy joy, an EEntry. */
-		g_assert_not_reached ();
-	}
-}
-
-static void
-menu_edit_delete_all_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	CORBA_Environment ev;
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	CORBA_exception_init (&ev);
-	
-	GNOME_GtkHTML_Editor_Engine_undoBegin (composer->editor_engine, "Delete all but signature", "Undelete all", &ev);
-	GNOME_GtkHTML_Editor_Engine_freeze (composer->editor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "disable-selection", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "text-default-color", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "bold-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "italic-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "underline-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "strikeout-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "select-all", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete", &ev);
-	GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "signature", "0", &ev);
-	GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "orig", "0", &ev);
-	e_msg_composer_show_sig_file (composer);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "style-normal", &ev);
-	GNOME_GtkHTML_Editor_Engine_thaw (composer->editor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_undoEnd (composer->editor_engine, &ev);
-	
-	CORBA_exception_free (&ev);
-	/* printf ("delete all\n"); */
-}
-
-static void
-menu_view_attachments_activate_cb (BonoboUIComponent           *component,
-				   const char                  *path,
-				   Bonobo_UIComponent_EventType type,
-				   const char                  *state,
-				   gpointer                     user_data)
-
-{
-	gboolean new_state;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	new_state = atoi (state);
-	
-	e_msg_composer_show_attachments (E_MSG_COMPOSER (user_data), new_state);
-}
-
-static void
-menu_format_html_cb (BonoboUIComponent           *component,
-		     const char                  *path,
-		     Bonobo_UIComponent_EventType type,
-		     const char                  *state,
-		     gpointer                     user_data)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_send_html (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_security_pgp_sign_cb (BonoboUIComponent           *component,
-			   const char                  *path,
-			   Bonobo_UIComponent_EventType type,
-			   const char                  *state,
-			   gpointer                     composer)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_pgp_sign (E_MSG_COMPOSER (composer), atoi (state));
-}
-
-static void
-menu_security_pgp_encrypt_cb (BonoboUIComponent           *component,
-			      const char                  *path,
-			      Bonobo_UIComponent_EventType type,
-			      const char                  *state,
-			      gpointer                     composer)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_pgp_encrypt (E_MSG_COMPOSER (composer), atoi (state));
-}
-
-static void
-menu_security_smime_sign_cb (BonoboUIComponent           *component,
-			     const char                  *path,
-			     Bonobo_UIComponent_EventType type,
-			     const char                  *state,
-			     gpointer                     composer)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_smime_sign (E_MSG_COMPOSER (composer), atoi (state));
-}
-
-static void
-menu_security_smime_encrypt_cb (BonoboUIComponent           *component,
-				const char                  *path,
-				Bonobo_UIComponent_EventType type,
-				const char                  *state,
-				gpointer                     composer)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_smime_encrypt (E_MSG_COMPOSER (composer), atoi (state));
-}
-
-
-static void
-menu_view_from_cb (BonoboUIComponent           *component,
-		   const char                  *path,
-		   Bonobo_UIComponent_EventType type,
-		   const char                  *state,
-		   gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_from (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_replyto_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_replyto (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_cc_cb (BonoboUIComponent           *component,
-		 const char                  *path,
-		 Bonobo_UIComponent_EventType type,
-		 const char                  *state,
-		 gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_cc (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_bcc_cb (BonoboUIComponent           *component,
-		  const char                  *path,
-		  Bonobo_UIComponent_EventType type,
-		  const char                  *state,
-		  gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_bcc (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_changed_charset_cb (BonoboUIComponent           *component,
-			 const char                  *path,
-			 Bonobo_UIComponent_EventType type,
-			 const char                  *state,
-			 gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	if (atoi (state)) {
-		/* Charset menu names are "Charset-%s" where %s is the charset name */
-		g_free (E_MSG_COMPOSER (user_data)->charset);
-		E_MSG_COMPOSER (user_data)->charset = g_strdup (path + strlen ("Charset-"));
-	}
-}
-
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_VERB ("FileOpen", menu_file_open_cb),
-	BONOBO_UI_VERB ("FileSave", menu_file_save_cb),
-	BONOBO_UI_VERB ("FileSaveAs", menu_file_save_as_cb),
-	BONOBO_UI_VERB ("FileSaveDraft", menu_file_save_draft_cb),
-	BONOBO_UI_VERB ("FileClose", menu_file_close_cb),
-	
-	BONOBO_UI_VERB ("FileAttach", menu_file_add_attachment_cb),
-	
-	BONOBO_UI_VERB ("FileSend", menu_file_send_cb),
-	
-	BONOBO_UI_VERB ("DeleteAll", menu_edit_delete_all_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixcache [] = {
-	E_PIXMAP ("/Toolbar/FileAttach", "buttons/add-attachment.png"),
-	E_PIXMAP ("/Toolbar/FileSend", "buttons/send-24.png"),
-	
-/*	E_PIXMAP ("/menu/Insert/FileAttach", "buttons/add-attachment.png"), */
-	E_PIXMAP ("/commands/FileSend", "send-16.png"),
-	E_PIXMAP ("/commands/FileSave", "save-16.png"),
-	E_PIXMAP ("/commands/FileSaveAs", "save-as-16.png"),
-	
-	E_PIXMAP_END
-};
-
-static void sig_select_item (EMsgComposer *composer);
-
-static void
-signature_cb (GtkWidget *w, EMsgComposer *composer)
-{
-	MailConfigSignature *old_sig;
-	gboolean old_auto;
-	int idx = g_list_index (GTK_MENU_SHELL (w)->children, gtk_menu_get_active (GTK_MENU (w)));
-	int len = g_list_length (GTK_MENU_SHELL (w)->children);
-	
-	/* printf ("signature_cb: %d\n", idx); */
-	
-	old_sig = composer->signature;
-	old_auto = composer->auto_signature;
-	
-	if (idx < len) {
-		if (idx == 0) {			                /* none */
-			composer->signature = NULL;
-			composer->auto_signature = FALSE;
-		} else if (idx == 1) {				/* auto */
-			composer->signature = NULL;
-			composer->auto_signature = TRUE;
-		} else {
-			composer->signature = g_slist_nth_data (mail_config_get_signature_list (), idx - 2);
-			composer->auto_signature = FALSE;
-		}
-		if (old_sig != composer->signature || old_auto != composer->auto_signature)
-			e_msg_composer_show_sig_file (composer);
-	}
-	/* printf ("signature_cb end\n"); */
-}
-
-static void setup_signatures_menu (EMsgComposer *composer);
-
-static void
-sig_event_client (MailConfigSigEvent event, MailConfigSignature *sig, EMsgComposer *composer)
-{
-	switch (event) {
-	case MAIL_CONFIG_SIG_EVENT_DELETED:
-		if (sig == composer->signature) {
-			composer->signature = NULL;
-			composer->auto_signature = TRUE;
-			e_msg_composer_show_sig_file (composer);
-		}
-		setup_signatures_menu (composer);
-		break;
-	case MAIL_CONFIG_SIG_EVENT_ADDED:
-	case MAIL_CONFIG_SIG_EVENT_NAME_CHANGED:
-		setup_signatures_menu (composer);
-	default:
-		;
-	}
-}
-
-static void
-prepare_signatures_menu (EMsgComposer *composer)
-{
-	GtkWidget *hbox;
-	GtkWidget *label;
-	
-	hbox = e_msg_composer_hdrs_get_from_hbox (E_MSG_COMPOSER_HDRS (composer->hdrs));
-	
-	label = gtk_label_new (_("Signature:"));
-	gtk_widget_show (label);
-	
-	composer->sig_omenu = gtk_option_menu_new ();
-	gtk_widget_show (composer->sig_omenu);
-	
-	gtk_box_pack_end_defaults (GTK_BOX (hbox), composer->sig_omenu);
-	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-}
-
-static void
-sig_select_item (EMsgComposer *composer)
-{
-	int idx;
-	
-	if (composer->auto_signature) {
-		idx = 1;
-	} else if (composer->signature == NULL) {
-		idx = 0;
-	} else {
-		idx = composer->signature->id + 2;
-	}
-	
-	gtk_option_menu_set_history (GTK_OPTION_MENU (composer->sig_omenu), idx);
-}
-
-static void
-setup_signatures_menu (EMsgComposer *composer)
-{
-	GtkWidget *menu;
-	GtkWidget *mi;
-	GSList *node;
-	
-#define ADD(x) \
-	mi = (x ? gtk_menu_item_new_with_label (x) : gtk_menu_item_new ()); \
-	gtk_widget_show (mi); \
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
-	
-	menu = gtk_menu_new ();
-	ADD (_("None"));
-	ADD (_("Autogenerated"));
-	
-	node = mail_config_get_signature_list ();
-	while (node != NULL) {
-		ADD (((MailConfigSignature *) node->data)->name);
-		node = node->next;
-	}
-#undef ADD
-	
-	gtk_widget_show (menu);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (composer->sig_omenu), menu);
-	sig_select_item (composer);
-	
-	g_signal_connect (menu, "selection-done", (GCallback)signature_cb, composer);
-}
-
-static void
-setup_ui (EMsgComposer *composer)
-{
-	BonoboUIContainer *container;
-	const char *default_charset;
-	gboolean hide_smime;
-	
-	container = bonobo_window_get_ui_container (BONOBO_WINDOW (composer));
-	
-	composer->uic = bonobo_ui_component_new_default ();
-	/* FIXME: handle bonobo exceptions */
-	bonobo_ui_component_set_container (composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
-	
-	bonobo_ui_component_add_verb_list_with_data (composer->uic, verbs, composer);
-	
-	bonobo_ui_component_freeze (composer->uic, NULL);
-	
-	bonobo_ui_util_set_ui (composer->uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-message-composer.xml",
-			       "evolution-message-composer", NULL);
-	
-	e_pixmaps_update (composer->uic, pixcache);
-	
-	/* Populate the Charset Encoding menu and default it to whatever the user
-	   chose as his default charset in the mailer */
-	default_charset = composer_get_default_charset_setting ();
-	e_charset_picker_bonobo_ui_populate (composer->uic, "/menu/Edit/EncodingPlaceholder",
-					     default_charset,
-					     menu_changed_charset_cb,
-					     composer);
-	
-	/* Format -> HTML */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/FormatHtml",
-		"state", composer->send_html ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "FormatHtml",
-		menu_format_html_cb, composer);
-	
-	/* View/From */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewFrom",
-		"state", composer->view_from ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewFrom",
-		menu_view_from_cb, composer);
-	
-	/* View/ReplyTo */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewReplyTo",
-		"state", composer->view_replyto ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewReplyTo",
-		menu_view_replyto_cb, composer);
-	
-	/* View/CC */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewCC",
-		"state", composer->view_cc ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewCC",
-		menu_view_cc_cb, composer);
-	
-	/* View/BCC */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewBCC",
-		"state", composer->view_bcc ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewBCC",
-		menu_view_bcc_cb, composer);
-	
-	/* Security -> PGP Sign */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecurityPGPSign",
-		"state", composer->pgp_sign ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "SecurityPGPSign",
-		menu_security_pgp_sign_cb, composer);
-	
-	/* Security -> PGP Encrypt */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecurityPGPEncrypt",
-		"state", composer->pgp_encrypt ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "SecurityPGPEncrypt",
-		menu_security_pgp_encrypt_cb, composer);
-	
-#if defined(HAVE_NSS) && defined(SMIME_SUPPORTED)
-	hide_smime = FALSE;
-#else
-	hide_smime = TRUE;
-#endif
-	
-	/* Security -> S/MIME Sign */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeSign",
-		"state", composer->smime_sign ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeSign",
-		"hidden", hide_smime ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "SecuritySMimeSign",
-		menu_security_smime_sign_cb, composer);
-	
-	/* Security -> S/MIME Encrypt */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeEncrypt",
-		"state", composer->smime_encrypt ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeEncrypt",
-		"hidden", hide_smime ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "SecuritySMimeEncrypt",
-		menu_security_smime_encrypt_cb, composer);
-	
-	/* View -> Attachments */
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewAttach",
-		menu_view_attachments_activate_cb, composer);
-	
-	mail_config_signature_register_client ((MailConfigSignatureClient) sig_event_client, composer);
-	
-	bonobo_ui_component_thaw (composer->uic, NULL);
-
-	/* Create the UIComponent for the non-control entries */
-
-	composer->entry_uic = bonobo_ui_component_new_default ();
-}
-
-
-/* Miscellaneous callbacks.  */
-
-static void
-attachment_bar_changed_cb (EMsgComposerAttachmentBar *bar,
-			   void *data)
-{
-	EMsgComposer *composer;
-	gboolean show = FALSE;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	if (e_msg_composer_attachment_bar_get_num_attachments (bar) > 0)
-		show = TRUE;
-	
-	e_msg_composer_show_attachments (composer, show);
-	
-	/* Mark the composer as changed so it prompts about unsaved
-           changes on close */
-	e_msg_composer_set_changed (composer);
-}
-
-static void
-subject_changed_cb (EMsgComposerHdrs *hdrs,
-		    gchar *subject,
-		    void *data)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	gtk_window_set_title (GTK_WINDOW (composer), subject[0] ? subject : _("Compose a message"));
-}
-
-static void
-hdrs_changed_cb (EMsgComposerHdrs *hdrs,
-		 void *data)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	/* Mark the composer as changed so it prompts about unsaved changes on close */
-	e_msg_composer_set_changed (composer);
-}
-
-enum {
-	UPDATE_AUTO_CC,
-	UPDATE_AUTO_BCC,
-};
-
-static void
-update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs)
-{
-	EABDestination *dest, **destv = NULL;
-	CamelInternetAddress *iaddr;
-	GList *list, *tail, *node;
-	int i, n = 0;
-	
-	tail = list = NULL;
-	
-	if (auto_addrs) {
-		iaddr = camel_internet_address_new ();
-		if (camel_address_decode (CAMEL_ADDRESS (iaddr), auto_addrs) != -1) {
-			for (i = 0; i < camel_address_length (CAMEL_ADDRESS (iaddr)); i++) {
-				const char *name, *addr;
-				
-				if (!camel_internet_address_get (iaddr, i, &name, &addr))
-					continue;
-				
-				dest = eab_destination_new ();
-				eab_destination_set_auto_recipient (dest, TRUE);
-				
-				if (name)
-					eab_destination_set_name (dest, name);
-				
-				if (addr)
-					eab_destination_set_email (dest, addr);
-				
-				node = g_list_alloc ();
-				node->data = dest;
-				node->next = NULL;
-				
-				if (tail) {
-					node->prev = tail;
-					tail->next = node;
-				} else {
-					node->prev = NULL;
-					list = node;
-				}
-				
-				tail = node;
-				n++;
-			}
-		}
-		
-		camel_object_unref (iaddr);
-	}
-	
-	switch (mode) {
-	case UPDATE_AUTO_CC:
-		destv = e_msg_composer_hdrs_get_cc (hdrs);
-		break;
-	case UPDATE_AUTO_BCC:
-		destv = e_msg_composer_hdrs_get_bcc (hdrs);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-	
-	if (destv) {
-		for (i = 0; destv[i]; i++) {
-			if (!eab_destination_is_auto_recipient (destv[i])) {
-				node = g_list_alloc ();
-				node->data = eab_destination_copy (destv[i]);
-				node->next = NULL;
-				
-				if (tail) {
-					node->prev = tail;
-					tail->next = node;
-				} else {
-					node->prev = NULL;
-					list = node;
-				}
-				
-				tail = node;
-				n++;
-			}
-		}
-		
-		eab_destination_freev (destv);
-	}
-	
-	destv = eab_destination_list_to_vector_sized (list, n);
-	g_list_free (list);
-	
-	switch (mode) {
-	case UPDATE_AUTO_CC:
-		e_msg_composer_hdrs_set_cc (hdrs, destv);
-		break;
-	case UPDATE_AUTO_BCC:
-		e_msg_composer_hdrs_set_bcc (hdrs, destv);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-	
-	eab_destination_freev (destv);
-}
-
-static void
-from_changed_cb (EMsgComposerHdrs *hdrs, void *data)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	if (hdrs->account) {
-		EAccount *account = hdrs->account;
-		
-		e_msg_composer_set_pgp_sign (composer,
-					     account->pgp_always_sign &&
-					     (!account->pgp_no_imip_sign || !composer->mime_type ||
-					      strncasecmp (composer->mime_type, "text/calendar", 13) != 0));
-		e_msg_composer_set_smime_sign (composer, account->smime_sign_default);
-		e_msg_composer_set_smime_encrypt (composer, account->smime_encrypt_default);
-		update_auto_recipients (hdrs, UPDATE_AUTO_CC, account->always_cc ? account->cc_addrs : NULL);
-		update_auto_recipients (hdrs, UPDATE_AUTO_BCC, account->always_bcc ? account->bcc_addrs : NULL);
-	} else {
-		update_auto_recipients (hdrs, UPDATE_AUTO_CC, NULL);
-		update_auto_recipients (hdrs, UPDATE_AUTO_BCC, NULL);
-	}
-	
-	set_editor_signature (composer);
-	e_msg_composer_show_sig_file (composer);
-}
-
-
-/* GObject methods.  */
-
-static void
-composer_finalise (GObject *object)
-{
-	EMsgComposer *composer;
-
-	composer = E_MSG_COMPOSER (object);
-	
-	if (composer->extra_hdr_names) {
-		int i;
-		
-		for (i = 0; i < composer->extra_hdr_names->len; i++) {
-			g_free (composer->extra_hdr_names->pdata[i]);
-			g_free (composer->extra_hdr_values->pdata[i]);
-		}
-		g_ptr_array_free (composer->extra_hdr_names, TRUE);
-		g_ptr_array_free (composer->extra_hdr_values, TRUE);
-	}
-	
-	e_msg_composer_clear_inlined_table (composer);
-	g_hash_table_destroy (composer->inline_images);
-	g_hash_table_destroy (composer->inline_images_by_url);
-	
-	g_free (composer->charset);
-	g_free (composer->mime_type);
-	g_free (composer->mime_body);
-	
-	if (composer->redirect)
-		camel_object_unref (composer->redirect);
-	
-	if (G_OBJECT_CLASS (parent_class)->finalize != NULL)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-composer_dispose(GObject *object)
-{
-	/* When destroy() is called, the contents of the window
-	 * (including the remote editor control) will already have
-	 * been destroyed, so we have to do this here.
-	 */
-	autosave_manager_unregister (am, E_MSG_COMPOSER (object));
-	if (G_OBJECT_CLASS (parent_class)->dispose != NULL)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-/* GtkObject methods */
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposer *composer;
-	CORBA_Environment ev;
-
-	composer = E_MSG_COMPOSER (object);
-	
-	CORBA_exception_init (&ev);
-	
-	if (composer->uic) {
-		bonobo_object_unref (BONOBO_OBJECT (composer->uic));
-		composer->uic = NULL;
-	}
-
-	if (composer->entry_uic) {
-		bonobo_object_unref (BONOBO_OBJECT (composer->entry_uic));
-		composer->entry_uic = NULL;
-	}
-	
-	/* FIXME?  I assume the Bonobo widget will get destroyed
-           normally?  */
-	if (composer->address_dialog != NULL) {
-		gtk_widget_destroy (composer->address_dialog);
-		composer->address_dialog = NULL;
-	}
-	if (composer->hdrs != NULL) {
-		gtk_widget_destroy (composer->hdrs);
-		composer->hdrs = NULL;
-	}
-	
-	if (composer->notify_id) {
-		GConfClient *gconf = gconf_client_get_default ();
-		gconf_client_notify_remove (gconf, composer->notify_id);
-		composer->notify_id = 0;
-		g_object_unref (gconf);
-	}		
-
-	if (composer->persist_stream_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->persist_stream_interface, &ev);
-		CORBA_Object_release (composer->persist_stream_interface, &ev);
-		composer->persist_stream_interface = CORBA_OBJECT_NIL;
-	}
-	
-	if (composer->persist_file_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->persist_file_interface, &ev);
-		CORBA_Object_release (composer->persist_file_interface, &ev);
-		composer->persist_file_interface = CORBA_OBJECT_NIL;
-	}
-	
-	if (composer->editor_engine != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->editor_engine, &ev);
-		CORBA_Object_release (composer->editor_engine, &ev);
-		composer->editor_engine = CORBA_OBJECT_NIL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	if (composer->editor_listener) {
-		bonobo_object_unref (composer->editor_listener);
-		composer->editor_listener = NULL;
-	}
-	
-	mail_config_signature_unregister_client ((MailConfigSignatureClient) sig_event_client, composer);
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* GtkWidget methods.  */
-
-static int
-delete_event (GtkWidget *widget,
-	      GdkEventAny *event)
-{
-	do_exit (E_MSG_COMPOSER (widget));
-	
-	return TRUE;
-}
-
-static void
-message_rfc822_dnd (EMsgComposer *composer, CamelStream *stream)
-{
-	CamelMimeParser *mp;
-	
-	mp = camel_mime_parser_new ();
-	camel_mime_parser_scan_from (mp, TRUE);
-	camel_mime_parser_init_with_stream (mp, stream);
-	
-	while (camel_mime_parser_step (mp, 0, 0) == CAMEL_MIME_PARSER_STATE_FROM) {
-		CamelMimeMessage *message;
-		CamelMimePart *part;
-		
-		message = camel_mime_message_new ();
-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (message), mp) == -1) {
-			camel_object_unref (message);
-			break;
-		}
-		
-		part = camel_mime_part_new ();
-		camel_mime_part_set_disposition (part, "inline");
-		camel_medium_set_content_object (CAMEL_MEDIUM (part),
-						 CAMEL_DATA_WRAPPER (message));
-		camel_mime_part_set_content_type (part, "message/rfc822");
-		e_msg_composer_attachment_bar_attach_mime_part (E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-								part);
-		camel_object_unref (message);
-		camel_object_unref (part);
-		
-		/* skip over the FROM_END state */
-		camel_mime_parser_step (mp, 0, 0);
-	}
-	
-	camel_object_unref (mp);
-}
-
-static void
-drag_data_received (EMsgComposer *composer, GdkDragContext *context,
-		    int x, int y, GtkSelectionData *selection,
-		    guint info, guint time)
-{
-	char *tmp, *str, **urls;
-	CamelMimePart *mime_part;
-	CamelStream *stream;
-	CamelURL *url;
-	int i;
-	
-	switch (info) {
-	case DND_TYPE_MESSAGE_RFC822:
-		d(printf ("dropping a message/rfc822\n"));
-		/* write the message(s) out to a CamelStream so we can use it */
-		stream = camel_stream_mem_new ();
-		camel_stream_write (stream, selection->data, selection->length);
-		camel_stream_reset (stream);
-		
-		message_rfc822_dnd (composer, stream);
-		camel_object_unref (stream);
-		break;
-	case DND_TYPE_TEXT_URI_LIST:
-	case DND_TYPE_NETSCAPE_URL:
-		d(printf ("dropping a text/uri-list\n"));
-		tmp = g_strndup (selection->data, selection->length);
-		urls = g_strsplit (tmp, "\n", 0);
-		g_free (tmp);
-		
-		for (i = 0; urls[i] != NULL; i++) {
-			str = g_strstrip (urls[i]);
-			
-			if (!strncasecmp (str, "mailto:", 7)) {
-				handle_mailto (composer, str);
-				g_free (str);
-			} else {
-				url = camel_url_new (str, NULL);
-				g_free (str);
-
-				if (url == NULL)
-					continue;
-
-				if (!strcasecmp (url->protocol, "file"))
-					e_msg_composer_attachment_bar_attach
-						(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-					 	url->path);
-
-				camel_url_free (url);
-			}
-		}
-		
-		g_free (urls);
-		break;
-	case DND_TYPE_TEXT_VCARD:
-		d(printf ("dropping a text/x-vcard\n"));
-		mime_part = camel_mime_part_new ();
-		camel_mime_part_set_content (mime_part, selection->data,
-					     selection->length, "text/x-vcard");
-		camel_mime_part_set_disposition (mime_part, "inline");
-		
-		e_msg_composer_attachment_bar_attach_mime_part
-			(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-			 mime_part);
-		
-		camel_object_unref (mime_part);
-	default:
-		d(printf ("dropping an unknown\n"));
-		break;
-	}
-}
-
-static void
-class_init (EMsgComposerClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GObjectClass *gobject_class;
-
-	gobject_class = G_OBJECT_CLASS(klass);
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-	
-	gobject_class->finalize = composer_finalise;
-	gobject_class->dispose = composer_dispose;
-	object_class->destroy = destroy;
-	widget_class->delete_event = delete_event;
-	
-	parent_class = g_type_class_ref(bonobo_window_get_type ());
-	
-	signals[SEND] =
-		g_signal_new ("send",
-			      E_TYPE_MSG_COMPOSER,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMsgComposerClass, send),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-	
-	signals[SAVE_DRAFT] =
-		g_signal_new ("save-draft",
-			      E_TYPE_MSG_COMPOSER,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMsgComposerClass, save_draft),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOOLEAN,
-			      G_TYPE_NONE,
-			      1, G_TYPE_BOOLEAN);
-}
-
-static void
-init (EMsgComposer *composer)
-{
-	composer->uic                      = NULL;
-	
-	composer->hdrs                     = NULL;
-	composer->extra_hdr_names          = g_ptr_array_new ();
-	composer->extra_hdr_values         = g_ptr_array_new ();
-	
-	composer->focused_entry            = NULL;
-	
-	composer->editor                   = NULL;
-	
-	composer->address_dialog           = NULL;
-	
-	composer->attachment_bar           = NULL;
-	composer->attachment_scrolled_window = NULL;
-	
-	composer->persist_file_interface   = CORBA_OBJECT_NIL;
-	composer->persist_stream_interface = CORBA_OBJECT_NIL;
-	
-	composer->editor_engine            = CORBA_OBJECT_NIL;
-	composer->inline_images            = g_hash_table_new (g_str_hash, g_str_equal);
-	composer->inline_images_by_url     = g_hash_table_new (g_str_hash, g_str_equal);
-	composer->current_images           = NULL;
-	
-	composer->attachment_bar_visible   = FALSE;
-	composer->send_html                = FALSE;
-	composer->pgp_sign                 = FALSE;
-	composer->pgp_encrypt              = FALSE;
-	composer->smime_sign               = FALSE;
-	composer->smime_encrypt            = FALSE;
-	
-	composer->has_changed              = FALSE;
-	composer->autosaved                = FALSE;
-	
-	composer->redirect                 = FALSE;
-	
-	composer->charset                  = NULL;
-	
-	composer->enable_autosave          = TRUE;
-	composer->autosave_file            = NULL;
-	composer->autosave_fd              = -1;
-}
-
-
-GtkType
-e_msg_composer_get_type (void)
-{
-	static GType type = 0;
-	
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (EMsgComposerClass),
-			NULL, NULL,
-			(GClassInitFunc) class_init,
-			NULL, NULL,
-			sizeof (EMsgComposer),
-			0,
-			(GInstanceInitFunc) init,
-		};
-		
-		type = g_type_register_static (bonobo_window_get_type (), "EMsgComposer", &info, 0);
-	}
-	
-	return type;
-}
-
-static void
-e_msg_composer_load_config (EMsgComposer *composer)
-{
-	GConfClient *gconf;
-	
-	gconf = gconf_client_get_default ();
-	
-	composer->view_from = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/From", NULL);
-	composer->view_replyto = gconf_client_get_bool ( 
-		gconf, "/apps/evolution/mail/composer/view/ReplyTo", NULL);
-	composer->view_cc = gconf_client_get_bool ( 
-		gconf, "/apps/evolution/mail/composer/view/Cc", NULL);
-	composer->view_bcc = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/Bcc", NULL);
-	composer->view_subject = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/Subject", NULL);
-	
-	g_object_unref (gconf);
-}
-
-static int
-e_msg_composer_get_visible_flags (EMsgComposer *composer)
-{
-	int flags = 0;
-	
-	if (composer->view_from)
-		flags |= E_MSG_COMPOSER_VISIBLE_FROM;
-	if (composer->view_replyto)
-		flags |= E_MSG_COMPOSER_VISIBLE_REPLYTO;
-	if (composer->view_cc)
-		flags |= E_MSG_COMPOSER_VISIBLE_CC;
-	if (composer->view_bcc)
-		flags |= E_MSG_COMPOSER_VISIBLE_BCC;
-	if (composer->view_subject)
-		flags |= E_MSG_COMPOSER_VISIBLE_SUBJECT;
-	
-	/*
-	 * Until we have a GUI way, lets make sure that
-	 * even if the user screws up, we will do the right
-	 * thing (screws up == edit the config file manually
-	 * and screw up).
-	 */
-	flags |= E_MSG_COMPOSER_VISIBLE_SUBJECT;	
-	return flags;
-}
-
-
-static void
-map_default_cb (EMsgComposer *composer, gpointer user_data)
-{
-	GtkWidget *widget;
-	BonoboControlFrame *cf;
-	Bonobo_PropertyBag pb = CORBA_OBJECT_NIL;
-	CORBA_Environment ev;
-	const char *subject;
-	char *text;
-	
-	/* If the 'To:' field is empty, focus it (This is ridiculously complicated) */
-	
-	widget = e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (composer->hdrs));
-	cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (widget));
-	pb = bonobo_control_frame_get_control_property_bag (cf, NULL);
-	text = bonobo_pbclient_get_string (pb, "text", NULL);
-	bonobo_object_release_unref (pb, NULL);
-	
-	if (!text || text[0] == '\0') {
-		bonobo_control_frame_control_activate (cf);
-
-		g_free (text);
-		return;
-	}
-	g_free (text);
-	
-	/* If not, check the subject field */
-	
-	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs));
-	
-	if (!subject || subject[0] == '\0') {
-		widget = e_msg_composer_hdrs_get_subject_entry (E_MSG_COMPOSER_HDRS (composer->hdrs));
-		gtk_widget_grab_focus (widget);
-		return;
-	}
-	
-	/* Jump to the editor as a last resort. */
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "grab-focus", &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-msg_composer_destroy_notify (void *data)
-{
-	EMsgComposer *composer = E_MSG_COMPOSER (data);
-	
-	all_composers = g_slist_remove (all_composers, composer);
-}
-
-static int
-composer_key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
-{
-	if (event->keyval == GDK_Escape) {
-		do_exit (E_MSG_COMPOSER (widget));
-		
-		g_signal_stop_emission_by_name (widget, "key-press-event");
-		return TRUE; /* Handled.  */
-	}
-	
-	return FALSE; /* Not handled. */
-}
-
-/* Verbs for non-control entries */
-static BonoboUIVerb entry_verbs [] = {
-	BONOBO_UI_VERB ("EditCut", menu_edit_cut_cb),
-	BONOBO_UI_VERB ("EditCopy", menu_edit_copy_cb),
-	BONOBO_UI_VERB ("EditPaste", menu_edit_paste_cb),
-	BONOBO_UI_VERB ("EditSelectAll", menu_edit_select_all_cb),
-	BONOBO_UI_VERB_END
-};
-
-/* All this snot is so that Cut/Copy/Paste work. */
-static gboolean
-composer_entry_focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
-{
-	EMsgComposer *composer = user_data;
-	BonoboUIContainer *container;
-
-	composer->focused_entry = widget;
-
-	container = bonobo_window_get_ui_container (BONOBO_WINDOW (composer));
-	bonobo_ui_component_set_container (composer->entry_uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (composer->entry_uic, entry_verbs, composer);
-
-	bonobo_ui_component_freeze (composer->entry_uic, NULL);
-
-	bonobo_ui_util_set_ui (composer->entry_uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-composer-entries.xml",
-			       "evolution-composer-entries", NULL);
-	
-	bonobo_ui_component_thaw (composer->entry_uic, NULL);
-	
-	return FALSE;
-}
-
-static gboolean
-composer_entry_focus_out_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
-{
-	EMsgComposer *composer = user_data;
-	
-	g_assert (composer->focused_entry == widget);
-	composer->focused_entry = NULL;
-
-	bonobo_ui_component_unset_container (composer->entry_uic, NULL);
-	
-	return FALSE;
-}
-
-static void
-setup_cut_copy_paste (EMsgComposer *composer)
-{
-	EMsgComposerHdrs *hdrs;
-	GtkWidget *entry;
-	
-	hdrs = (EMsgComposerHdrs *) composer->hdrs;
-	
-	entry = e_msg_composer_hdrs_get_subject_entry (hdrs);
-	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
-	g_signal_connect (entry, "focus_out_event", G_CALLBACK (composer_entry_focus_out_event_cb), composer);
-	
-	entry = e_msg_composer_hdrs_get_reply_to_entry (hdrs);
-	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
-	g_signal_connect (entry, "focus_out_event", G_CALLBACK (composer_entry_focus_out_event_cb), composer);
-}
-
-static void
-composer_settings_update (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, gpointer data)
-{
-	gboolean bool;
-	EMsgComposer *composer = data;
-
-	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/magic_smileys", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
-				    "MagicSmileys", TC_CORBA_boolean, bool,
-				    NULL);
-
-	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/magic_links", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
-				    "MagicLinks", TC_CORBA_boolean, bool,
-				    NULL);
-
-	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/inline_spelling", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
-				   "InlineSpelling", TC_CORBA_boolean, bool,
-				   NULL);
-}
-
-static EMsgComposer *
-create_composer (int visible_mask)
-{
-	EMsgComposer *composer;
-	GtkWidget *vbox;
-	Bonobo_Unknown editor_server;
-	CORBA_Environment ev;
-	GConfClient *gconf;
-	int vis;
-	BonoboControlFrame *control_frame;
-	
-	composer = g_object_new (E_TYPE_MSG_COMPOSER, "win_name", _("Compose a message"), NULL);
-	gtk_window_set_title ((GtkWindow *) composer, _("Compose a message"));
-	
-	all_composers = g_slist_prepend (all_composers, composer);
-	
-	g_signal_connect (composer, "key-press-event",
-			  G_CALLBACK (composer_key_pressed),
-			  NULL);
-	g_signal_connect (composer, "destroy",
-			  G_CALLBACK (msg_composer_destroy_notify),
-			  NULL);
-	
-	gtk_window_set_default_size (GTK_WINDOW (composer),
-				     DEFAULT_WIDTH, DEFAULT_HEIGHT);
-	gnome_window_icon_set_from_file (GTK_WINDOW (composer), EVOLUTION_IMAGESDIR
-					 "/compose-message.png");
-
-	/* DND support */
-	gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,
-			   drop_types, num_drop_types, GDK_ACTION_COPY);
-	g_signal_connect (composer, "drag_data_received",
-			  G_CALLBACK (drag_data_received), NULL);
-	e_msg_composer_load_config (composer);
-	
-	setup_ui (composer);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	
-	vis = e_msg_composer_get_visible_flags (composer);
-	composer->hdrs = e_msg_composer_hdrs_new (composer->uic, visible_mask, vis);
-	if (!composer->hdrs) {
-		e_activation_failure_dialog (GTK_WINDOW (composer),
-					     _("Could not create composer window:\n"
-					       "Unable to activate address selector control."),
-					     SELECT_NAMES_OAFIID,
-					     "IDL:Bonobo/Control:1.0");
-		gtk_object_destroy (GTK_OBJECT (composer));
-		return NULL;
-	}
-	
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
-	gtk_box_set_spacing (GTK_BOX (vbox), 6);
-	gtk_box_pack_start (GTK_BOX (vbox), composer->hdrs, FALSE, FALSE, 0);
-	g_signal_connect (composer->hdrs, "subject_changed",
-			  G_CALLBACK (subject_changed_cb), composer);
-	g_signal_connect (composer->hdrs, "hdrs_changed",
-			  G_CALLBACK (hdrs_changed_cb), composer);
-	g_signal_connect (composer->hdrs, "from_changed",
-			  G_CALLBACK (from_changed_cb), composer);
-	gtk_widget_show (composer->hdrs);
-	
-	prepare_signatures_menu (composer);
-	setup_signatures_menu (composer);
-
-	from_changed_cb(composer->hdrs, composer);
-
-	/* Editor component.  */
-	composer->editor = bonobo_widget_new_control (
-		GNOME_GTKHTML_EDITOR_CONTROL_ID,
-		bonobo_ui_component_get_container (composer->uic));
-	if (!composer->editor) {
-		e_activation_failure_dialog (GTK_WINDOW (composer),
-					     _("Could not create composer window:\n"
-					       "Unable to activate HTML editor component.\n"
-					       "Please make sure you have the correct version\n"
-					       "of gtkhtml and libgtkhtml installed.\n"),
-					     GNOME_GTKHTML_EDITOR_CONTROL_ID,
-					     "IDL:Bonobo/Control:1.0");
-		gtk_object_destroy (GTK_OBJECT (composer));
-		return NULL;
-	}
-
-	control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (composer->editor));
-	bonobo_control_frame_set_autoactivate (control_frame, TRUE);
-	
-	/* let the editor know which mode we are in */
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor), 
-				    "FormatHTML", TC_CORBA_boolean, composer->send_html,
-				    NULL);
-	
-	gconf = gconf_client_get_default ();
-	composer_settings_update (gconf, 0, NULL, composer);
-	gconf_client_add_dir (gconf, "/apps/evolution/mail/composer", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	composer->notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/composer",
-						       composer_settings_update, composer, NULL, NULL);
-	g_object_unref (gconf);
-	
-	editor_server = bonobo_widget_get_objref (BONOBO_WIDGET (composer->editor));
-	
-	/* FIXME: handle exceptions */
-	CORBA_exception_init (&ev);
-	composer->persist_file_interface
-		= Bonobo_Unknown_queryInterface (editor_server, "IDL:Bonobo/PersistFile:1.0", &ev);
-	composer->persist_stream_interface
-		= Bonobo_Unknown_queryInterface (editor_server, "IDL:Bonobo/PersistStream:1.0", &ev);
-	CORBA_exception_free (&ev);
-	
-	gtk_box_pack_start (GTK_BOX (vbox), composer->editor, TRUE, TRUE, 0);
-	
-	/* Attachment editor, wrapped into an EScrollFrame.  We don't
-           show it for now.  */
-	
-	composer->attachment_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
-	composer->attachment_bar = e_msg_composer_attachment_bar_new (NULL);
-	GTK_WIDGET_SET_FLAGS (composer->attachment_bar, GTK_CAN_FOCUS);
-	gtk_container_add (GTK_CONTAINER (composer->attachment_scrolled_window),
-			   composer->attachment_bar);
-	gtk_box_pack_start (GTK_BOX (vbox),
-			    composer->attachment_scrolled_window,
-			    FALSE, FALSE, GNOME_PAD_SMALL);
-	
-	g_signal_connect (composer->attachment_bar, "changed",
-			  G_CALLBACK (attachment_bar_changed_cb), composer);
-	
-	bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);
-	gtk_widget_show (vbox);
-	
-	/* If we show this widget earlier, we lose network transparency. i.e. the
-	   component appears on the machine evo is running on, ignoring any DISPLAY
-	   variable. */
-	gtk_widget_show (composer->editor);
-	
-	e_msg_composer_show_attachments (composer, FALSE);
-	
-	prepare_engine (composer);
-	if (composer->editor_engine == CORBA_OBJECT_NIL) {
-		e_activation_failure_dialog (GTK_WINDOW (composer),
-					     _("Could not create composer window:\n"
-					       "Unable to activate HTML editor component."),
-					     GNOME_GTKHTML_EDITOR_CONTROL_ID,
-					     "IDL:GNOME/GtkHTML/Editor/Engine:1.0");
-		gtk_object_destroy (GTK_OBJECT (composer));
-		return NULL;
-	}
-	
-	setup_cut_copy_paste (composer);
-	
-	g_signal_connect (composer, "map", (GCallback) map_default_cb, NULL);
-	
-	if (am == NULL)
-		am = autosave_manager_new ();
-	
-	autosave_manager_register (am, composer);
-	
-	return composer;
-}
-
-static void
-set_editor_signature (EMsgComposer *composer)
-{
-	EAccountIdentity *id;
-	GSList *signatures;
-	
-	/* printf ("set_editor_signature\n"); */
-	id = E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id;
-	
-	signatures = mail_config_get_signature_list ();
-	
-	composer->signature = g_slist_nth_data (signatures, id->def_signature);
-	composer->auto_signature = id->auto_signature;
-	
-	/* printf ("auto: %d\n", id->auto_signature); */
-	
-	sig_select_item (composer);
-	
-	/* printf ("set_editor_signature end\n"); */
-}
-
-
-/**
- * e_msg_composer_new:
- *
- * Create a new message composer widget.
- * 
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new (void)
-{
-	gboolean send_html;
-	GConfClient *gconf;
-	EMsgComposer *new;
-	
-	gconf = gconf_client_get_default ();
-	send_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/send_html", NULL);
-	g_object_unref (gconf);
-	
-	new = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_MAIL);
-	if (new) {
-		e_msg_composer_set_send_html (new, send_html);
-		set_editor_text (new, "");
-		set_editor_signature (new);
-	}
-	
-	return new;
-}
-
-/**
- * e_msg_composer_new_post:
- *
- * Create a new message composer widget.
- * 
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_post (void)
-{
-	gboolean send_html;
-	GConfClient *gconf;
-	EMsgComposer *new;
-	
-	gconf = gconf_client_get_default ();
-	send_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/send_html", NULL);
-	g_object_unref (gconf);
-	
-	new = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_POST);
-	if (new) {
-		e_msg_composer_set_send_html (new, send_html);
-		set_editor_text (new, "");
-		set_editor_signature (new);
-	}
-	
-	return new;
-}
-
-
-static gboolean
-is_special_header (const char *hdr_name)
-{
-	/* Note: a header is a "special header" if it has any meaning:
-	   1. it's not a X-* header or
-	   2. it's an X-Evolution* header
-	*/
-	if (strncasecmp (hdr_name, "X-", 2))
-		return TRUE;
-	
-	if (!strncasecmp (hdr_name, "X-Evolution", 11))
-		return TRUE;
-	
-	/* we can keep all other X-* headers */
-	
-	return FALSE;
-}
-
-static void
-e_msg_composer_set_pending_body (EMsgComposer *composer, char *text)
-{
-	char *old;
-	
-	old = g_object_get_data ((GObject *) composer, "body:text");
-        g_free (old);
-	g_object_set_data ((GObject *) composer, "body:text", text);
-}
-
-static void
-e_msg_composer_flush_pending_body (EMsgComposer *composer, gboolean apply)
-{
-        char *body;
-	
-	body = g_object_get_data ((GObject *) composer, "body:text");
-	if (body) {
-		if (apply) 
-			set_editor_text (composer, body);
-		
-		g_object_set_data ((GObject *) composer, "body:text", NULL);
-		g_free (body);
-	}
-}	
-
-static void
-add_attachments_handle_mime_part (EMsgComposer *composer, CamelMimePart *mime_part, 
-				  gboolean just_inlines, gboolean related, int depth)
-{
-	CamelContentType *content_type;
-	CamelDataWrapper *wrapper;
-	
-	content_type = camel_mime_part_get_content_type (mime_part);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	
-	if (CAMEL_IS_MULTIPART (wrapper)) {
-		/* another layer of multipartness... */
-		add_attachments_from_multipart (composer, (CamelMultipart *) wrapper, just_inlines, depth + 1);
-	} else if (just_inlines) {
-		if (camel_mime_part_get_content_id (mime_part) ||
-		    camel_mime_part_get_content_location (mime_part))
-			e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
-	} else if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-		/* do nothing */
-	} else if (related && camel_content_type_is (content_type, "image", "*")) {
-		e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
-	} else {
-		if (camel_content_type_is (content_type, "text", "*")) {
-			/* do nothing */
-		} else {
-			e_msg_composer_attach (composer, mime_part);
-		}
-	}
-}
-
-static void
-add_attachments_from_multipart (EMsgComposer *composer, CamelMultipart *multipart,
-				gboolean just_inlines, int depth)
-{
-	/* find appropriate message attachments to add to the composer */
-	CamelMimePart *mime_part;
-	gboolean related;
-	int i, nparts;
-	
-	related = camel_content_type_is (CAMEL_DATA_WRAPPER (multipart)->mime_type, "multipart", "related");
-		
-	if (CAMEL_IS_MULTIPART_SIGNED (multipart)) {
-		mime_part = camel_multipart_get_part (multipart, CAMEL_MULTIPART_SIGNED_CONTENT);
-		add_attachments_handle_mime_part (composer, mime_part, just_inlines, related, depth);
-	} else if (CAMEL_IS_MULTIPART_ENCRYPTED (multipart)) {
-		/* what should we do in this case? */
-	} else {
-		nparts = camel_multipart_get_number (multipart);
-
-		for (i = 0; i < nparts; i++) {
-			mime_part = camel_multipart_get_part (multipart, i);
-			add_attachments_handle_mime_part (composer, mime_part, just_inlines, related, depth);
-		}
-	}
-}
-
-
-/**
- * e_msg_composer_add_message_attachments:
- * @composer: the composer to add the attachments to.
- * @message: the source message to copy the attachments from.
- * @just_inlines: whether to attach all attachments or just add
- * inline images.
- *
- * Walk through all the mime parts in @message and add them to the composer
- * specified in @composer.
- */
-void
-e_msg_composer_add_message_attachments (EMsgComposer *composer, CamelMimeMessage *message,
-					gboolean just_inlines)
-{
-	CamelDataWrapper *wrapper;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	if (!CAMEL_IS_MULTIPART (wrapper))
-		return;
-	
-	/* there must be attachments... */
-	add_attachments_from_multipart (composer, (CamelMultipart *) wrapper, just_inlines, 0);
-}
-
-
-static void
-handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	CamelContentType *content_type;
-	CamelDataWrapper *content;
-	CamelMimePart *mime_part;
-	
-	/* FIXME: make sure this isn't an s/mime signed part?? */
-	e_msg_composer_set_pgp_sign (composer, TRUE);
-	
-	mime_part = camel_multipart_get_part (multipart, CAMEL_MULTIPART_SIGNED_CONTENT);
-	content_type = camel_mime_part_get_content_type (mime_part);
-	
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	
-	if (CAMEL_IS_MULTIPART (content)) {
-		multipart = CAMEL_MULTIPART (content);
-		
-		/* Note: depth is preserved here because we're not
-                   counting multipart/signed as a multipart, instead
-                   we want to treat the content part as our mime part
-                   here. */
-		
-		if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-			/* handle the signed content and configure the composer to sign outgoing messages */
-			handle_multipart_signed (composer, multipart, depth);
-		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-			handle_multipart_encrypted (composer, multipart, depth);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
-			/* this contains the text/plain and text/html versions of the message body */
-			handle_multipart_alternative (composer, multipart, depth);
-		} else {
-			/* there must be attachments... */
-			handle_multipart (composer, multipart, depth);
-		}
-	} else if (camel_content_type_is (content_type, "text", "*")) {
-		e_msg_composer_set_pending_body (composer, em_utils_part_to_html (mime_part));
-	} else {
-		e_msg_composer_attach (composer, mime_part);
-	}
-}
-
-static void
-handle_multipart_encrypted (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	CamelMultipartEncrypted *mpe = (CamelMultipartEncrypted *) multipart;
-	CamelContentType *content_type;
-	CamelCipherContext *cipher;
-	CamelDataWrapper *content;
-	CamelMimePart *mime_part;
-	CamelException ex;
-	
-	/* FIXME: make sure this is a PGP/MIME encrypted part?? */
-	e_msg_composer_set_pgp_encrypt (composer, TRUE);
-	
-	camel_exception_init (&ex);
-	cipher = mail_crypto_get_pgp_cipher_context (NULL);
-	mime_part = camel_multipart_encrypted_decrypt (mpe, cipher, &ex);
-	camel_object_unref (cipher);
-	camel_exception_clear (&ex);
-	
-	if (!mime_part)
-		return;
-	
-	content_type = camel_mime_part_get_content_type (mime_part);
-	
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	
-	if (CAMEL_IS_MULTIPART (content)) {
-		multipart = CAMEL_MULTIPART (content);
-		
-		/* Note: depth is preserved here because we're not
-                   counting multipart/encrypted as a multipart, instead
-                   we want to treat the content part as our mime part
-                   here. */
-		
-		if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-			/* handle the signed content and configure the composer to sign outgoing messages */
-			handle_multipart_signed (composer, multipart, depth);
-		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-			handle_multipart_encrypted (composer, multipart, depth);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
-			/* this contains the text/plain and text/html versions of the message body */
-			handle_multipart_alternative (composer, multipart, depth);
-		} else {
-			/* there must be attachments... */
-			handle_multipart (composer, multipart, depth);
-		}
-	} else if (camel_content_type_is (content_type, "text", "*")) {
-		e_msg_composer_set_pending_body (composer, em_utils_part_to_html (mime_part));
-	} else {
-		e_msg_composer_attach (composer, mime_part);
-	}
-	
-	camel_object_unref (mime_part);
-}
-
-static void
-handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	/* Find the text/html part and set the composer body to it's contents */
-	CamelMimePart *text_part = NULL;
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts; i++) {
-		CamelContentType *content_type;
-		CamelDataWrapper *content;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content_type = camel_mime_part_get_content_type (mime_part);
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-		
-		if (CAMEL_IS_MULTIPART (content)) {
-			CamelMultipart *mp;
-			
-			mp = CAMEL_MULTIPART (content);
-			
-			if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-				/* handle the signed content and configure the composer to sign outgoing messages */
-				handle_multipart_signed (composer, mp, depth + 1);
-			} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-				/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-				handle_multipart_encrypted (composer, mp, depth + 1);
-			} else {
-				/* depth doesn't matter so long as we don't pass 0 */
-				handle_multipart (composer, mp, depth + 1);
-			}
-		} else if (camel_content_type_is (content_type, "text", "html")) {
-			/* text/html is preferable, so once we find it we're done... */
-			text_part = mime_part;
-			break;
-		} else if (camel_content_type_is (content_type, "text", "*")) {
-			/* anyt text part not text/html is second rate so the first
-			   text part we find isn't necessarily the one we'll use. */
-			if (!text_part)
-				text_part = mime_part;
-		} else {
-			e_msg_composer_attach (composer, mime_part);
-		}
-	}
-	
-	if (text_part)
-		e_msg_composer_set_pending_body(composer, em_utils_part_to_html(text_part));
-}
-
-static void
-handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts; i++) {
-		CamelContentType *content_type;
-		CamelDataWrapper *content;
-		CamelMimePart *mime_part;
-
-		mime_part = camel_multipart_get_part (multipart, i);
-		content_type = camel_mime_part_get_content_type (mime_part);
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-		
-		if (CAMEL_IS_MULTIPART (content)) {
-			CamelMultipart *mp;
-			
-			mp = CAMEL_MULTIPART (content);
-			
-			if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-				/* handle the signed content and configure the composer to sign outgoing messages */
-				handle_multipart_signed (composer, mp, depth + 1);
-			} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-				/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-				handle_multipart_encrypted (composer, mp, depth + 1);
-			} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
-				handle_multipart_alternative (composer, mp, depth + 1);
-			} else {
-				/* depth doesn't matter so long as we don't pass 0 */
-				handle_multipart (composer, mp, depth + 1);
-			}
-		} else if (depth == 0 && i == 0) {
-			/* Since the first part is not multipart/alternative, then this must be the body */
-			e_msg_composer_set_pending_body(composer, em_utils_part_to_html(mime_part));
-		} else if (camel_mime_part_get_content_id (mime_part) ||
-			   camel_mime_part_get_content_location (mime_part)) {
-			/* special in-line attachment */
-			e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
-		} else {
-			/* normal attachment */
-			e_msg_composer_attach (composer, mime_part);
-		}
-	}
-}
-
-static void
-set_signature_gui (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-
-	composer->auto_signature = FALSE;
-	composer->signature = NULL;
-
-	CORBA_exception_init (&ev);
-	if (GNOME_GtkHTML_Editor_Engine_searchByData (composer->editor_engine, 1, "ClueFlow", "signature", "1", &ev)) {
-		gchar *str = NULL;
-
-		str = GNOME_GtkHTML_Editor_Engine_getParagraphData (composer->editor_engine, "signature_name", &ev);
-		if (ev._major == CORBA_NO_EXCEPTION && str) {
-			if (!strncmp (str, "name:", 5)) {
-				GSList *list = NULL;
-				char *decoded_signature_name = decode_signature_name (str + 5);
-				
-				list = mail_config_get_signature_list ();
-				if (list && decoded_signature_name)
-					for (; list; list = list->next) {
-						if (!strcmp (decoded_signature_name,
-							     ((MailConfigSignature *) list->data)->name))
-							break;
-					}
-				if (list && decoded_signature_name)
-					composer->signature = (MailConfigSignature *) list->data;
-				else
-					composer->auto_signature = TRUE;
-				g_free (decoded_signature_name);
-			} else if (!strcmp (str, "auto")) {
-				composer->auto_signature = TRUE;
-			}
-		}
-		sig_select_item (composer);
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-static void
-auto_recip_free (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-}
-
-/**
- * e_msg_composer_new_with_message:
- * @message: The message to use as the source
- * 
- * Create a new message composer widget.
- *
- * Note: Designed to work only for messages constructed using Evolution.
- *
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_with_message (CamelMimeMessage *message)
-{
-	const CamelInternetAddress *to, *cc, *bcc;
-	GList *To = NULL, *Cc = NULL, *Bcc = NULL;
-	const char *format, *subject, *postto;
-	EABDestination **Tov, **Ccv, **Bccv;
-	GHashTable *auto_cc, *auto_bcc;
-	CamelContentType *content_type;
-	struct _camel_header_raw *headers;
-	CamelDataWrapper *content;
-	EAccount *account = NULL;
-	char *account_name;
-	EMsgComposer *new;
-	XEvolution *xev;
-	int len, i;
-	
-	postto = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-PostTo");
-	
-	new = create_composer (postto ? E_MSG_COMPOSER_VISIBLE_MASK_POST : E_MSG_COMPOSER_VISIBLE_MASK_MAIL);
-	if (!new)
-		return NULL;
-	
-	if (postto)
-		e_msg_composer_hdrs_set_post_to (E_MSG_COMPOSER_HDRS (new->hdrs), postto);
-	
-	/* Restore the Account preference */
-	account_name = (char *) camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Account");
-	if (account_name) {
-		account_name = g_strdup (account_name);
-		g_strstrip (account_name);
-		
-		account = mail_config_get_account_by_name (account_name);
-	}
-	
-	if (postto == NULL) {
-		auto_cc = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-		auto_bcc = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-		
-		if (account) {
-			CamelInternetAddress *iaddr;
-			
-			/* hash our auto-recipients for this account */
-			if (account->always_cc) {
-				iaddr = camel_internet_address_new ();
-				if (camel_address_decode (CAMEL_ADDRESS (iaddr), account->cc_addrs) != -1) {
-					for (i = 0; i < camel_address_length (CAMEL_ADDRESS (iaddr)); i++) {
-						const char *name, *addr;
-						
-						if (!camel_internet_address_get (iaddr, i, &name, &addr))
-							continue;
-						
-						g_hash_table_insert (auto_cc, g_strdup (addr), GINT_TO_POINTER (TRUE));
-					}
-				}
-				camel_object_unref (iaddr);
-			}
-			
-			if (account->always_bcc) {
-				iaddr = camel_internet_address_new ();
-				if (camel_address_decode (CAMEL_ADDRESS (iaddr), account->bcc_addrs) != -1) {
-					for (i = 0; i < camel_address_length (CAMEL_ADDRESS (iaddr)); i++) {
-						const char *name, *addr;
-						
-						if (!camel_internet_address_get (iaddr, i, &name, &addr))
-							continue;
-						
-						g_hash_table_insert (auto_bcc, g_strdup (addr), GINT_TO_POINTER (TRUE));
-					}
-				}
-				camel_object_unref (iaddr);
-			}
-		}
-		
-		to = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-		cc = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
-		bcc = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_BCC);
-		
-		len = CAMEL_ADDRESS (to)->addresses->len;
-		for (i = 0; i < len; i++) {
-			const char *name, *addr;
-			
-			if (camel_internet_address_get (to, i, &name, &addr)) {
-				EABDestination *dest = eab_destination_new ();
-				eab_destination_set_name (dest, name);
-				eab_destination_set_email (dest, addr);
-				To = g_list_append (To, dest);
-			}
-		}
-		Tov = eab_destination_list_to_vector (To);
-		g_list_free (To);
-		
-		len = CAMEL_ADDRESS (cc)->addresses->len;
-		for (i = 0; i < len; i++) {
-			const char *name, *addr;
-			
-			if (camel_internet_address_get (cc, i, &name, &addr)) {
-				EABDestination *dest = eab_destination_new ();
-				eab_destination_set_name (dest, name);
-				eab_destination_set_email (dest, addr);
-				
-				if (g_hash_table_lookup (auto_cc, addr))
-					eab_destination_set_auto_recipient (dest, TRUE);
-				
-				Cc = g_list_append (Cc, dest);
-			}
-		}
-		
-		Ccv = eab_destination_list_to_vector (Cc);
-		g_hash_table_foreach (auto_cc, auto_recip_free, NULL);
-		g_hash_table_destroy (auto_cc);
-		g_list_free (Cc);
-		
-		len = CAMEL_ADDRESS (bcc)->addresses->len;
-		for (i = 0; i < len; i++) {
-			const char *name, *addr;
-			
-			if (camel_internet_address_get (bcc, i, &name, &addr)) {
-				EABDestination *dest = eab_destination_new ();
-				eab_destination_set_name (dest, name);
-				eab_destination_set_email (dest, addr);
-				
-				if (g_hash_table_lookup (auto_bcc, addr))
-					eab_destination_set_auto_recipient (dest, TRUE);
-				
-				Bcc = g_list_append (Bcc, dest);
-			}
-		}
-		
-		Bccv = eab_destination_list_to_vector (Bcc);
-		g_hash_table_foreach (auto_bcc, auto_recip_free, NULL);
-		g_hash_table_destroy (auto_bcc);
-		g_list_free (Bcc);
-	} else {
-		Tov = NULL;
-		Ccv = NULL;
-		Bccv = NULL;
-	}
-	
-	subject = camel_mime_message_get_subject (message);
-	
-	e_msg_composer_set_headers (new, account_name, Tov, Ccv, Bccv, subject);
-	
-	g_free (account_name);
-	
-	eab_destination_freev (Tov);
-	eab_destination_freev (Ccv);
-	eab_destination_freev (Bccv);
-	
-	/* Restore the format editing preference */
-	format = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Format");
-	if (format) {
-		while (*format && isspace ((unsigned) *format))
-			format++;
-		
-		if (!strcasecmp (format, "text/html"))
-			e_msg_composer_set_send_html (new, TRUE);
-		else
-			e_msg_composer_set_send_html (new, FALSE);
-	}
-	
-	/* Remove any other X-Evolution-* headers that may have been set */
-	xev = mail_tool_remove_xevolution_headers (message);
-	mail_tool_destroy_xevolution (xev);
-	
-	/* set extra headers */
-	headers = CAMEL_MIME_PART (message)->headers;
-	while (headers) {
-		if (!is_special_header (headers->name) ||
-		    !strcasecmp (headers->name, "References") ||
-		    !strcasecmp (headers->name, "In-Reply-To")) {
-			g_ptr_array_add (new->extra_hdr_names, g_strdup (headers->name));
-			g_ptr_array_add (new->extra_hdr_values, g_strdup (headers->value));
-		}
-		
-		headers = headers->next;
-	}
-	
-	/* Restore the attachments and body text */
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	if (CAMEL_IS_MULTIPART (content)) {
-		CamelMultipart *multipart;
-		
-		multipart = CAMEL_MULTIPART (content);
-		content_type = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));
-		
-		if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-			/* handle the signed content and configure the composer to sign outgoing messages */
-			handle_multipart_signed (new, multipart, 0);
-		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-			handle_multipart_encrypted (new, multipart, 0);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
-			/* this contains the text/plain and text/html versions of the message body */
-			handle_multipart_alternative (new, multipart, 0);
-		} else {
-			/* there must be attachments... */
-			handle_multipart (new, multipart, 0);
-		}
-	} else {
-		e_msg_composer_set_pending_body(new, em_utils_part_to_html((CamelMimePart *)message));
-	}
-	
-	/* We wait until now to set the body text because we need to ensure that
-	 * the attachment bar has all the attachments, before we request them.
-	 */	
-	e_msg_composer_flush_pending_body (new, TRUE);
-	
-	set_signature_gui (new);
-	
-	return new;
-}
-
-static void
-disable_editor (EMsgComposer *composer)
-{
-	gtk_widget_set_sensitive (composer->editor, FALSE);
-	gtk_widget_set_sensitive (composer->attachment_bar, FALSE);
-	
-	bonobo_ui_component_set_prop (composer->uic, "/menu/Edit", "sensitive", "0", NULL);
-	bonobo_ui_component_set_prop (composer->uic, "/menu/Format", "sensitive", "0", NULL);
-	bonobo_ui_component_set_prop (composer->uic, "/menu/Insert", "sensitive", "0", NULL);
-}
-
-/**
- * e_msg_composer_new_redirect:
- * @message: The message to use as the source
- * 
- * Create a new message composer widget.
- *
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_redirect (CamelMimeMessage *message, const char *resent_from)
-{
-	EMsgComposer *composer;
-	const char *subject;
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	
-	composer = e_msg_composer_new_with_message (message);
-	subject = camel_mime_message_get_subject (message);
-	
-	composer->redirect = message;
-	camel_object_ref (message);
-	
-	e_msg_composer_set_headers (composer, resent_from, NULL, NULL, NULL, subject);
-	
-	disable_editor (composer);
-	
-	return composer;
-}
-
-
-static GList *
-add_recipients (GList *list, const char *recips, gboolean decode)
-{
-	CamelInternetAddress *cia;
-	const char *name, *addr;
-	int num, i;
-	
-	cia = camel_internet_address_new ();
-	if (decode)
-		num = camel_address_decode (CAMEL_ADDRESS (cia), recips);
-	else
-		num = camel_address_unformat (CAMEL_ADDRESS (cia), recips);
-	
-	for (i = 0; i < num; i++) {
-		if (camel_internet_address_get (cia, i, &name, &addr)) {
-			EABDestination *dest = eab_destination_new ();
-			eab_destination_set_name (dest, name);
-			eab_destination_set_email (dest, addr);
-			
-			list = g_list_append (list, dest);
-		}
-	}
-	
-	return list;
-}
-
-static void
-handle_mailto (EMsgComposer *composer, const char *mailto)
-{
-	EMsgComposerHdrs *hdrs;
-	GList *to = NULL, *cc = NULL, *bcc = NULL;
-	EABDestination **tov, **ccv, **bccv;
-	char *subject = NULL, *body = NULL;
-	char *header, *content, *buf;
-	size_t nread, nwritten;
-	const char *p;
-	int len, clen;
-	CamelURL *url;
-	
-	buf = g_strdup (mailto);
-	
-	/* Parse recipients (everything after ':' until '?' or eos). */
-	p = buf + 7;
-	len = strcspn (p, "?");
-	if (len) {
-		content = g_strndup (p, len);
-		camel_url_decode (content);
-		to = add_recipients (to, content, FALSE);
-		g_free (content);
-	}
-	
-	p += len;
-	if (*p == '?') {
-		p++;
-		
-		while (*p) {
-			len = strcspn (p, "=&");
-			
-			/* If it's malformed, give up. */
-			if (p[len] != '=')
-				break;
-			
-			header = (char *) p;
-			header[len] = '\0';
-			p += len + 1;
-			
-			clen = strcspn (p, "&");
-			
-			content = g_strndup (p, clen);
-			camel_url_decode (content);
-			
-			if (!strcasecmp (header, "to")) {
-				to = add_recipients (to, content, FALSE);
-			} else if (!strcasecmp (header, "cc")) {
-				cc = add_recipients (cc, content, FALSE);
-			} else if (!strcasecmp (header, "bcc")) {
-				bcc = add_recipients (bcc, content, FALSE);
-			} else if (!strcasecmp (header, "subject")) {
-				g_free (subject);
-				if (g_utf8_validate (content, -1, NULL)) {
-					subject = content;
-					content = NULL;
-				} else {
-					subject = g_locale_to_utf8 (content, clen, &nread,
-								    &nwritten, NULL);
-					if (subject) {
-						subject = g_realloc (subject, nwritten + 1);
-						subject[nwritten] = '\0';
-					}
-				}
-			} else if (!strcasecmp (header, "body")) {
-				g_free (body);
-				if (g_utf8_validate (content, -1, NULL)) {
-					body = content;
-					content = NULL;
-				} else {
-					body = g_locale_to_utf8 (content, clen, &nread,
-								 &nwritten, NULL);
-					if (body) {
-						body = g_realloc (body, nwritten + 1);
-						body[nwritten] = '\0';
-					}
-				}
-			} else if (!strcasecmp (header, "attach")) {
-				/* Change file url to absolute path */
-				if (!strncasecmp (content, "file:", 5)) {
-					url = camel_url_new (content, NULL);
-					e_msg_composer_attachment_bar_attach (E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-									      url->path);
-					camel_url_free (url);
-				} else {
-					e_msg_composer_attachment_bar_attach (E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-									      content);
-				}
-			} else if (!strcasecmp (header, "from")) {
-				/* Ignore */
-			} else if (!strcasecmp (header, "reply-to")) {
-				/* ignore */
-			} else {
-				/* add an arbitrary header? */
-				e_msg_composer_add_header (composer, header, content);
-			}
-			
-			g_free (content);
-			
-			p += clen;
-			if (*p == '&') {
-				p++;
-				if (!strcmp (p, "amp;"))
-					p += 4;
-			}
-		}
-	}
-	
-	g_free (buf);
-	
-	tov  = eab_destination_list_to_vector (to);
-	ccv  = eab_destination_list_to_vector (cc);
-	bccv = eab_destination_list_to_vector (bcc);
-	
-	g_list_free (to);
-	g_list_free (cc);
-	g_list_free (bcc);
-	
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	
-	e_msg_composer_hdrs_set_to (hdrs, tov);
-	e_msg_composer_hdrs_set_cc (hdrs, ccv);
-	e_msg_composer_hdrs_set_bcc (hdrs, bccv);
-	
-	eab_destination_freev (tov);
-	eab_destination_freev (ccv);
-	eab_destination_freev (bccv);
-	
-	if (subject) {
-		e_msg_composer_hdrs_set_subject (hdrs, subject);
-		g_free (subject);
-	}
-	
-	if (body) {
-		char *htmlbody;
-		
-		htmlbody = camel_text_to_html (body, CAMEL_MIME_FILTER_TOHTML_PRE, 0);
-		set_editor_text (composer, htmlbody);
-		g_free (htmlbody);
-	}
-}
-
-/**
- * e_msg_composer_new_from_url:
- * @url: a mailto URL
- *
- * Create a new message composer widget, and fill in fields as
- * defined by the provided URL.
- **/
-EMsgComposer *
-e_msg_composer_new_from_url (const char *url)
-{
-	EMsgComposer *composer;
-	
-	g_return_val_if_fail (strncasecmp (url, "mailto:", 7) == 0, NULL);
-	
-	composer = e_msg_composer_new ();
-	if (!composer)
-		return NULL;
-	
-	handle_mailto (composer, url);
-	
-	return composer;
-}
-
-
-/**
- * e_msg_composer_show_attachments:
- * @composer: A message composer widget
- * @show: A boolean specifying whether the attachment bar should be shown or
- * not
- * 
- * If @show is %FALSE, hide the attachment bar.  Otherwise, show it.
- **/
-void
-e_msg_composer_show_attachments (EMsgComposer *composer,
-				 gboolean show)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	show_attachments (composer, show);
-}
-
-
-/**
- * e_msg_composer_set_headers:
- * @composer: a composer object
- * @from: the name of the account the user will send from,
- * or %NULL for the default account
- * @to: the values for the "To" header
- * @cc: the values for the "Cc" header
- * @bcc: the values for the "Bcc" header
- * @subject: the value for the "Subject" header
- *
- * Sets the headers in the composer to the given values.
- **/
-void 
-e_msg_composer_set_headers (EMsgComposer *composer,
-			    const char *from,
-			    EABDestination **to,
-			    EABDestination **cc,
-			    EABDestination **bcc,
-			    const char *subject)
-{
-	EMsgComposerHdrs *hdrs;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	
-	e_msg_composer_hdrs_set_to (hdrs, to);
-	e_msg_composer_hdrs_set_cc (hdrs, cc);
-	e_msg_composer_hdrs_set_bcc (hdrs, bcc);
-	e_msg_composer_hdrs_set_subject (hdrs, subject);
-	e_msg_composer_hdrs_set_from_account (hdrs, from);
-}
-
-
-/**
- * e_msg_composer_set_body_text:
- * @composer: a composer object
- * @text: the HTML text to initialize the editor with
- *
- * Loads the given HTML text into the editor.
- **/
-void
-e_msg_composer_set_body_text (EMsgComposer *composer, const char *text)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	set_editor_text (composer, text);
-	
-	/* set editor text unfortunately kills the signature so we
-           have to re-show it */
-	e_msg_composer_show_sig_file (composer);
-}
-
-
-/**
- * e_msg_composer_set_body:
- * @composer: a composer object
- * @body: the data to initialize the composer with
- * @mime_type: the MIME type of data
- *
- * Loads the given data into the composer as the message body.
- * This function should only be used by the CORBA composer factory.
- **/
-void
-e_msg_composer_set_body (EMsgComposer *composer, const char *body,
-			 const char *mime_type)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	set_editor_text (composer, _("<b>(The composer contains a non-text "
-				     "message body, which cannot be "
-				     "edited.)<b>"));
-	e_msg_composer_set_send_html (composer, FALSE);
-	disable_editor (composer);
-	
-	g_free (composer->mime_body);
-	composer->mime_body = g_strdup (body);
-	g_free (composer->mime_type);
-	composer->mime_type = g_strdup (mime_type);
-
-	if (g_ascii_strncasecmp (composer->mime_type, "text/calendar", 13) == 0) {
-		EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-		if (hdrs->account && hdrs->account->pgp_no_imip_sign)
-			e_msg_composer_set_pgp_sign (composer, FALSE);
-	}
-}
-
-
-/**
- * e_msg_composer_add_header:
- * @composer: a composer object
- * @name: the header name
- * @value: the header value
- *
- * Adds a header with @name and @value to the message. This header
- * may not be displayed by the composer, but will be included in
- * the message it outputs.
- **/
-void
-e_msg_composer_add_header (EMsgComposer *composer, const char *name,
-			   const char *value)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (value != NULL);
-	
-	g_ptr_array_add (composer->extra_hdr_names, g_strdup (name));
-	g_ptr_array_add (composer->extra_hdr_values, g_strdup (value));
-}
-
-
-/**
- * e_msg_composer_attach:
- * @composer: a composer object
- * @attachment: the CamelMimePart to attach
- *
- * Attaches @attachment to the message being composed in the composer.
- **/
-void
-e_msg_composer_attach (EMsgComposer *composer, CamelMimePart *attachment)
-{
-	EMsgComposerAttachmentBar *bar;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	g_return_if_fail (CAMEL_IS_MIME_PART (attachment));
-	
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar);
-	e_msg_composer_attachment_bar_attach_mime_part (bar, attachment);
-}
-
-
-/**
- * e_msg_composer_add_inline_image_from_file:
- * @composer: a composer object
- * @file_name: the name of the file containing the image
- *
- * This reads in the image in @file_name and adds it to @composer
- * as an inline image, to be wrapped in a multipart/related.
- *
- * Return value: the newly-created CamelMimePart (which must be reffed
- * if the caller wants to keep its own reference), or %NULL on error.
- **/
-CamelMimePart *
-e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
-					   const char *file_name)
-{
-	char *mime_type, *cid, *url, *name;
-	CamelStream *stream;
-	CamelDataWrapper *wrapper;
-	CamelMimePart *part;
-	struct stat statbuf;
-	
-	/* check for regular file */
-	if (stat (file_name, &statbuf) < 0 || !S_ISREG (statbuf.st_mode))
-		return NULL;
-	
-	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);
-	if (!stream)
-		return NULL;
-	
-	wrapper = camel_data_wrapper_new ();
-	camel_data_wrapper_construct_from_stream (wrapper, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	mime_type = e_msg_composer_guess_mime_type (file_name);
-	camel_data_wrapper_set_mime_type (wrapper, mime_type ? mime_type : "application/octet-stream");
-	g_free (mime_type);
-	
-	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (wrapper);
-	
-	cid = camel_header_msgid_generate ();
-	camel_mime_part_set_content_id (part, cid);
-	name = g_path_get_basename(file_name);
-	camel_mime_part_set_filename (part, name);
-	g_free(name);
-	camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BASE64);
-	
-	url = g_strdup_printf ("file:%s", file_name);
-	g_hash_table_insert (composer->inline_images_by_url, url, part);
-	
-	url = g_strdup_printf ("cid:%s", cid);
-	g_hash_table_insert (composer->inline_images, url, part);
-	g_free (cid);
-	
-	return part;
-}	
-
-
-/**
- * e_msg_composer_add_inline_image_from_mime_part:
- * @composer: a composer object
- * @part: a CamelMimePart containing image data
- *
- * This adds the mime part @part to @composer as an inline image, to
- * be wrapped in a multipart/related.
- **/
-void
-e_msg_composer_add_inline_image_from_mime_part (EMsgComposer  *composer,
-						CamelMimePart *part)
-{
-	char *url;
-	const char *location, *cid;
-
-	cid = camel_mime_part_get_content_id (part);
-	if (!cid) {
-		camel_mime_part_set_content_id (part, NULL);
-		cid = camel_mime_part_get_content_id (part);
-	}
-	
-	url = g_strdup_printf ("cid:%s", cid);
-	g_hash_table_insert (composer->inline_images, url, part);
-	camel_object_ref (part);
-	
-	location = camel_mime_part_get_content_location (part);
-	if (location) {
-		g_hash_table_insert (composer->inline_images_by_url,
-				     g_strdup (location), part);
-	}
-}
-
-
-/**
- * e_msg_composer_get_message:
- * @composer: A message composer widget
- * 
- * Retrieve the message edited by the user as a CamelMimeMessage.  The
- * CamelMimeMessage object is created on the fly; subsequent calls to this
- * function will always create new objects from scratch.
- * 
- * Return value: A pointer to the new CamelMimeMessage object
- **/
-CamelMimeMessage *
-e_msg_composer_get_message (EMsgComposer *composer, gboolean save_html_object_data)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return build_message (composer, save_html_object_data);
-}
-
-
-CamelMimeMessage *
-e_msg_composer_get_message_draft (EMsgComposer *composer)
-{
-	CamelMimeMessage *msg;
-	EAccount *account;
-	gboolean old_send_html;
-	gboolean old_pgp_sign;
-	gboolean old_pgp_encrypt;
-	gboolean old_smime_sign;
-	gboolean old_smime_encrypt;
-	
-	/* always save drafts as HTML to preserve formatting */
-	old_send_html = composer->send_html;
-	composer->send_html = TRUE;
-	old_pgp_sign = composer->pgp_sign;
-	composer->pgp_sign = FALSE;
-	old_pgp_encrypt = composer->pgp_encrypt;
-	composer->pgp_encrypt = FALSE;
-	old_smime_sign = composer->smime_sign;
-	composer->smime_sign = FALSE;
-	old_smime_encrypt = composer->smime_encrypt;
-	composer->smime_encrypt = FALSE;
-	
-	msg = e_msg_composer_get_message (composer, TRUE);
-	
-	composer->send_html = old_send_html;
-	composer->pgp_sign = old_pgp_sign;
-	composer->pgp_encrypt = old_pgp_encrypt;
-	composer->smime_sign = old_smime_sign;
-	composer->smime_encrypt = old_smime_encrypt;
-	
-	/* Attach account info to the draft. */
-	account = e_msg_composer_get_preferred_account (composer);
-	if (account && account->name)
-		camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Account", account->name);
-	
-	/* build_message() set this to text/html since we set composer->send_html to
-	   TRUE before calling e_msg_composer_get_message() */
-	if (!composer->send_html)
-		camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Format", "text/plain");
-	
-	return msg;
-}
-
-
-static void
-delete_old_signature (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	
-	/* printf ("delete_old_signature\n"); */
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-bod", &ev);
-	if (GNOME_GtkHTML_Editor_Engine_searchByData (composer->editor_engine, 1, "ClueFlow", "signature", "1", &ev)) {
-		/* printf ("found\n"); */
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "select-paragraph", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete", &ev);
-		/* selection-move-right doesn't succeed means that we are already on the end of document */
-		/* if (!rv)
-		   break; */
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "signature", "0", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete-back", &ev);
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-/**
- * e_msg_composer_show_sig:
- * @composer: A message composer widget
- * 
- * Set a signature
- **/
-void
-e_msg_composer_show_sig_file (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	char *html;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	/* printf ("e_msg_composer_show_sig_file\n"); */
-	/* printf ("set sig '%s' '%s'\n", sig_file, composer->sig_file); */
-	
-	composer->in_signature_insert = TRUE;
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_freeze (composer->editor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-position-save", &ev);
-	GNOME_GtkHTML_Editor_Engine_undoBegin (composer->editor_engine, "Set signature", "Reset signature", &ev);
-	
-	delete_old_signature (composer);
-	html = get_signature_html (composer);
-	if (html) {
-		if (!GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (composer->editor_engine, &ev))
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "insert-paragraph", &ev);
-		if (!GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-backward", &ev))
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "insert-paragraph", &ev);
-		else
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-forward", &ev);
-		/* printf ("insert %s\n", html); */
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "orig", "0", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "indent-zero", &ev);
-		GNOME_GtkHTML_Editor_Engine_insertHTML (composer->editor_engine, html, &ev);
-		g_free (html);
-	}
-	
-	GNOME_GtkHTML_Editor_Engine_undoEnd (composer->editor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-position-restore", &ev);
-	GNOME_GtkHTML_Editor_Engine_thaw (composer->editor_engine, &ev);
-	CORBA_exception_free (&ev);
-	composer->in_signature_insert = FALSE;
-	
-	/* printf ("e_msg_composer_show_sig_file end\n"); */
-}
-
-
-/**
- * e_msg_composer_set_send_html:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "Send HTML" flag set
- * 
- * Set the status of the "Send HTML" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_send_html (EMsgComposer *composer,
-			      gboolean send_html)
-{
-	CORBA_Environment ev;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->send_html && send_html)
-		return;
-	
-	if (!composer->send_html && !send_html)
-		return;
-	
-	composer->send_html = send_html;
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "block-redraw", &ev);
-	CORBA_exception_free (&ev);
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/FormatHtml",
-				      "state", composer->send_html ? "1" : "0", NULL);
-	
-	/* let the editor know which mode we are in */
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
-				    "FormatHTML", TC_CORBA_boolean,
-				    composer->send_html, NULL);
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "unblock-redraw", &ev);
-	CORBA_exception_free (&ev);
-}
-
-
-/**
- * e_msg_composer_get_send_html:
- * @composer: A message composer widget
- * 
- * Get the status of the "Send HTML mail" flag.
- * 
- * Return value: The status of the "Send HTML mail" flag.
- **/
-gboolean
-e_msg_composer_get_send_html (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->send_html;
-}
-
-
-/**
- * e_msg_composer_get_preferred_account:
- * @composer: composer
- *
- * Returns the user-specified account (from field).
- */
-EAccount *
-e_msg_composer_get_preferred_account (EMsgComposer *composer)
-{
-	EMsgComposerHdrs *hdrs;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	
-	return hdrs->account;
-}
-
-
-/**
- * e_msg_composer_set_pgp_sign:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "PGP Sign" flag set
- * 
- * Set the status of the "PGP Sign" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_pgp_sign (EMsgComposer *composer, gboolean pgp_sign)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->pgp_sign && pgp_sign)
-		return;
-	if (!composer->pgp_sign && !pgp_sign)
-		return;
-	
-	composer->pgp_sign = pgp_sign;
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecurityPGPSign",
-				      "state", composer->pgp_sign ? "1" : "0", NULL);
-}
-
-
-/**
- * e_msg_composer_get_pgp_sign:
- * @composer: A message composer widget
- * 
- * Get the status of the "PGP Sign" flag.
- * 
- * Return value: The status of the "PGP Sign" flag.
- **/
-gboolean
-e_msg_composer_get_pgp_sign (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->pgp_sign;
-}
-
-
-/**
- * e_msg_composer_set_pgp_encrypt:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "PGP Encrypt" flag set
- * 
- * Set the status of the "PGP Encrypt" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_pgp_encrypt (EMsgComposer *composer, gboolean pgp_encrypt)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->pgp_encrypt && pgp_encrypt)
-		return;
-	if (!composer->pgp_encrypt && !pgp_encrypt)
-		return;
-	
-	composer->pgp_encrypt = pgp_encrypt;
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecurityPGPEncrypt",
-				      "state", composer->pgp_encrypt ? "1" : "0", NULL);
-}
-
-
-/**
- * e_msg_composer_get_pgp_encrypt:
- * @composer: A message composer widget
- * 
- * Get the status of the "PGP Encrypt" flag.
- * 
- * Return value: The status of the "PGP Encrypt" flag.
- **/
-gboolean
-e_msg_composer_get_pgp_encrypt (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->pgp_encrypt;
-}
-
-
-/**
- * e_msg_composer_set_smime_sign:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "S/MIME Sign" flag set
- * 
- * Set the status of the "S/MIME Sign" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_smime_sign (EMsgComposer *composer, gboolean smime_sign)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->smime_sign && smime_sign)
-		return;
-	if (!composer->smime_sign && !smime_sign)
-		return;
-	
-	composer->smime_sign = smime_sign;
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecuritySMimeSign",
-				      "state", composer->smime_sign ? "1" : "0", NULL);
-}
-
-
-/**
- * e_msg_composer_get_smime_sign:
- * @composer: A message composer widget
- * 
- * Get the status of the "S/MIME Sign" flag.
- * 
- * Return value: The status of the "S/MIME Sign" flag.
- **/
-gboolean
-e_msg_composer_get_smime_sign (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->smime_sign;
-}
-
-
-/**
- * e_msg_composer_set_smime_encrypt:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "S/MIME Encrypt" flag set
- * 
- * Set the status of the "S/MIME Encrypt" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_smime_encrypt (EMsgComposer *composer, gboolean smime_encrypt)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->smime_encrypt && smime_encrypt)
-		return;
-	if (!composer->smime_encrypt && !smime_encrypt)
-		return;
-	
-	composer->smime_encrypt = smime_encrypt;
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecuritySMimeEncrypt",
-				      "state", composer->smime_encrypt ? "1" : "0", NULL);
-}
-
-
-/**
- * e_msg_composer_get_smime_encrypt:
- * @composer: A message composer widget
- * 
- * Get the status of the "S/MIME Encrypt" flag.
- * 
- * Return value: The status of the "S/MIME Encrypt" flag.
- **/
-gboolean
-e_msg_composer_get_smime_encrypt (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->smime_encrypt;
-}
-
-
-/**
- * e_msg_composer_get_view_from:
- * @composer: A message composer widget
- * 
- * Get the status of the "View From header" flag.
- * 
- * Return value: The status of the "View From header" flag.
- **/
-gboolean
-e_msg_composer_get_view_from (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_from;
-}
-
-
-/**
- * e_msg_composer_set_view_from:
- * @composer: A message composer widget
- * @state: whether to show or hide the From selector
- *
- * Controls the state of the From selector
- */
-void
-e_msg_composer_set_view_from (EMsgComposer *composer, gboolean view_from)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_from && view_from) ||
-	    (!composer->view_from && !view_from))
-		return;
-	
-	composer->view_from = view_from;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewFrom",
-				      "state", composer->view_from ? "1" : "0", NULL);
-	
-	gconf = gconf_client_get_default ();
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/From", view_from, NULL);
-	g_object_unref (gconf);
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-/**
- * e_msg_composer_get_view_replyto:
- * @composer: A message composer widget
- * 
- * Get the status of the "View Reply-To header" flag.
- * 
- * Return value: The status of the "View Reply-To header" flag.
- **/
-gboolean
-e_msg_composer_get_view_replyto (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_replyto;
-}
-
-
-/**
- * e_msg_composer_set_view_replyto:
- * @composer: A message composer widget
- * @state: whether to show or hide the Reply-To selector
- *
- * Controls the state of the Reply-To selector
- */
-void
-e_msg_composer_set_view_replyto (EMsgComposer *composer, gboolean view_replyto)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_replyto && view_replyto) ||
-	    (!composer->view_replyto && !view_replyto))
-		return;
-	
-	composer->view_replyto = view_replyto;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewReplyTo",
-				      "state", composer->view_replyto ? "1" : "0", NULL);
-	
-	gconf = gconf_client_get_default ();
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/ReplyTo", view_replyto, NULL);
-	g_object_unref (gconf);
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-/**
- * e_msg_composer_get_view_cc:
- * @composer: A message composer widget
- * 
- * Get the status of the "View CC header" flag.
- * 
- * Return value: The status of the "View CC header" flag.
- **/
-gboolean
-e_msg_composer_get_view_cc (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_cc;
-}
-
-
-/**
- * e_msg_composer_set_view_cc:
- * @composer: A message composer widget
- * @state: whether to show or hide the cc view
- *
- * Controls the state of the CC display
- */
-void
-e_msg_composer_set_view_cc (EMsgComposer *composer, gboolean view_cc)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_cc && view_cc) ||
-	    (!composer->view_cc && !view_cc))
-		return;
-	
-	composer->view_cc = view_cc;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewCC",
-				      "state", composer->view_cc ? "1" : "0", NULL);
-	
-	gconf = gconf_client_get_default ();
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/Cc", view_cc, NULL);
-	g_object_unref (gconf);
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-/**
- * e_msg_composer_get_view_bcc:
- * @composer: A message composer widget
- * 
- * Get the status of the "View BCC header" flag.
- * 
- * Return value: The status of the "View BCC header" flag.
- **/
-gboolean
-e_msg_composer_get_view_bcc (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_bcc;
-}
-
-
-/**
- * e_msg_composer_set_view_bcc:
- * @composer: A message composer widget
- * @state: whether to show or hide the bcc view
- *
- * Controls the state of the BCC display
- */
-void
-e_msg_composer_set_view_bcc (EMsgComposer *composer, gboolean view_bcc)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_bcc && view_bcc) ||
-	    (!composer->view_bcc && !view_bcc))
-		return;
-	
-	composer->view_bcc = view_bcc;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewBCC",
-				      "state", composer->view_bcc ? "1" : "0", NULL);
-	
-	gconf = gconf_client_get_default ();
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/Bcc", view_bcc, NULL);
-	g_object_unref (gconf);
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-EABDestination **
-e_msg_composer_get_recipients (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-
-	return composer->hdrs ? e_msg_composer_hdrs_get_recipients (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-EABDestination **
-e_msg_composer_get_to (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->hdrs ? e_msg_composer_hdrs_get_to (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-EABDestination **
-e_msg_composer_get_cc (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->hdrs ? e_msg_composer_hdrs_get_cc (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-EABDestination **
-e_msg_composer_get_bcc (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->hdrs ? e_msg_composer_hdrs_get_bcc (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-const char *
-e_msg_composer_get_subject (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->hdrs ? e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-
-/**
- * e_msg_composer_guess_mime_type:
- * @file_name: filename
- *
- * Returns the guessed mime type of the file given by #file_name.
- **/
-char *
-e_msg_composer_guess_mime_type (const char *file_name)
-{
-	GnomeVFSFileInfo *info;
-	GnomeVFSResult result;
-	
-	info = gnome_vfs_file_info_new ();
-	result = gnome_vfs_get_file_info (file_name, info,
-					  GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-					  GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-	if (result == GNOME_VFS_OK) {
-		char *type;
-		
-		type = g_strdup (gnome_vfs_file_info_get_mime_type (info));
-		gnome_vfs_file_info_unref (info);
-		return type;
-	} else {
-		gnome_vfs_file_info_unref (info);
-		return NULL;
-	}
-}
-
-
-/**
- * e_msg_composer_set_changed:
- * @composer: An EMsgComposer object.
- *
- * Mark the composer as changed, so before the composer gets destroyed
- * the user will be prompted about unsaved changes.
- **/
-void
-e_msg_composer_set_changed (EMsgComposer *composer)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->has_changed = TRUE;
-}
-
-
-/**
- * e_msg_composer_unset_changed:
- * @composer: An EMsgComposer object.
- *
- * Mark the composer as unchanged, so no prompt about unsaved changes
- * will appear before destroying the composer.
- **/
-void
-e_msg_composer_unset_changed (EMsgComposer *composer)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->has_changed = FALSE;
-}
-
-gboolean
-e_msg_composer_is_dirty (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	gboolean rv;
-	
-	CORBA_exception_init (&ev);
-	rv = composer->has_changed
-		|| (GNOME_GtkHTML_Editor_Engine_hasUndo (composer->editor_engine, &ev) &&
-		    !GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "is-saved", &ev));
-	CORBA_exception_free (&ev);
-
-	return rv;
-}
-
-/**
- * e_msg_composer_set_autosaved:
- * @composer: An EMsgComposer object.
- *
- * Mark the composer as autosaved, so before the composer gets destroyed
- * the user will be prompted about unsaved changes.
- **/
-void
-e_msg_composer_set_autosaved (EMsgComposer *composer)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	composer->autosaved = TRUE;
-}
-
-
-/**
- * e_msg_composer_unset_autosaved:
- * @composer: An EMsgComposer object.
- *
- * Mark the composer as unautosaved, so no prompt about unsaved changes
- * will appear before destroying the composer.
- **/
-void
-e_msg_composer_unset_autosaved (EMsgComposer *composer)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->autosaved = FALSE;
-}
-
-gboolean
-e_msg_composer_is_autosaved (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	return composer->autosaved;
-}
-
-void
-e_msg_composer_set_enable_autosave  (EMsgComposer *composer, gboolean enabled)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->enable_autosave = enabled;
-}
-
-static char *
-next_word (const char *s, const char **sr)
-{
-	if (!s || !*s)
-		return NULL;
-	else {
-		const char *begin;
-		gunichar uc;
-		gboolean cited;
-		
-		do {
-			begin = s;
-			cited = FALSE;
-			uc = g_utf8_get_char (s);
-			if (uc == 0)
-				return NULL;
-			s  = g_utf8_next_char (s);
-		} while (!html_selection_spell_word (uc, &cited) && !cited && s);
-		
-		/* we are at beginning of word */
-		if (s && *s) {
-			gboolean cited_end;
-			
-			cited_end = FALSE;
-			uc = g_utf8_get_char (s);
-			
-			/* go to end of word */
-			while (html_selection_spell_word (uc, &cited_end) || (!cited && cited_end)) {
-				cited_end = FALSE;
-				s  = g_utf8_next_char (s);
-				uc = g_utf8_get_char (s);
-				if (uc == 0)
-					break;
-			}
-			*sr = s;
-			return s ? g_strndup (begin, s - begin) : g_strdup (begin);
-		} else
-			return NULL;
-	}
-}
-
-
-void
-e_msg_composer_ignore (EMsgComposer *composer, const char *str)
-{
-	CORBA_Environment ev;
-	char *word;
-	
-	if (!str)
-		return;
-	
-	CORBA_exception_init (&ev);
-	while ((word = next_word (str, &str))) {
-		/* printf ("ignore word %s\n", word); */
-		GNOME_GtkHTML_Editor_Engine_ignoreWord (composer->editor_engine, word, &ev);
-		g_free (word);
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-void
-e_msg_composer_drop_editor_undo (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_dropUndo (composer->editor_engine, &ev);
-	CORBA_exception_free (&ev);
-}
-
-
-gboolean
-e_msg_composer_request_close_all (void)
-{
-	GSList *p, *pnext;
-
-	for (p = all_composers; p != NULL; p = pnext) {
-		pnext = p->next;
-		do_exit (E_MSG_COMPOSER (p->data));
-	}
-
-	if (all_composers == NULL)
-		return TRUE;
-	else
-		return FALSE;
-}
-
-void
-e_msg_composer_check_autosave(GtkWindow *parent)
-{
-	if (am == NULL)
-		am = autosave_manager_new();
-
-	if (am->ask) {
-		am->ask = FALSE;
-		autosave_manager_query_load_orphans (am, parent);
-		am->ask = TRUE;
-	}
-}