This commit was manufactured by cvs2svn to create tag 'WITH_LIBEFS'.WITH_LIBEFS

svn path=/tags/WITH_LIBEFS/; revision=3727

39 files changed, 0 insertions, 11117 deletions

diff --git a/mail/.cvsignore b/mail/.cvsignore
deleted file mode 100644
index 63d45eccce..0000000000
--- a/mail/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-Mail-stubs.c
-Mail-skels.c
-Mail-common.c
-Mail.h
-evolution-mail
-evolution-mail.pure
-test-mail
-test-sources
-test-thread
\ No newline at end of file
diff --git a/mail/ChangeLog b/mail/ChangeLog
deleted file mode 100644
index a2bddf1427..0000000000
--- a/mail/ChangeLog
+++ /dev/null
@@ -1,1667 +0,0 @@
-2000-06-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Improved the
-	code to separate the imap namespace from the folder name.
-
-2000-06-23  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* component-factory.c: Include e-util/e-setup.h for the
-	prototype of evolution_dir; prototype create_news_storage.
-	(real_create_imap_storage, real_create_news_storage): New
-	functions moving the camel stuff into the async callback.
-	(create_imap_storage, create_news_storage): Chopped in
-	half to move camel stuff as above.
-
-	* mail-ops.c: Include "mail-threads.h" for threading protos.
-	(real_fetch_mail, real_send_mail, real_expunge_folder): 
-	New functions moving the camel stuff into the async callback.
-	(async_mail_exception_dialog): A version of mail_exception_dialog
-	to be called from the async handlers (just calls mail_op_error())
-	(fetch_mail, expunge_folder, composer_send_cb): Cut in half to
-	move camel stuff as above.
-	(cleanup_send_mail): Clean up after the async real_send_mail
-	with the gtk_object_destroys et al.
-
-	* mail-threads.c: Instead of hiding the progress bar, make it
-	zip back and forth constantly.
-	(progress_timeout): New func. Timeout called to make the pbar
-	shimmy.
-	(timeout_toggle): New func. Turn on and off the shimmy effect.
-	(check_cond): New func. Make sure that the GCond for modal
-	operation is initialized before mail_op_{error,get_password}.
-	(show_error_clicked, read_msg, get_password_clicked): Move
-	over to timeout_toggle.
-	(mail_op_error,mail_op_get_password): Add check_cond() call.
-
-	* main.c: (main) Call g_thread_init.
-
-	* session.c: Change auth_callback stuff over to assume that it's
-	being called async. Note: no real good way to tell if this is
-	the case or not.
-	(request_callback): ifdef'ed out
-	(evolution_auth_callback): Use mail_op_get_password.
-	
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Now should
-	correctly get the selected folder from the given URL.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): add handling for
-	loading "news:" folders.
-
-	* component-factory.c (create_news_storage): add a root for news
-	source.
-	(owner_set_cb): call create_news_storage.
-
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Updated to
-	prepend url-> path if it exists for that imap store.
-
-	* component-factory.c (create_imap_storage): Modified to not
-	prepend a hard-coded namespace.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-ops.c (fetch_mail_cleanup): new function, passed as arg to
-	mail_operation_try.
-	(fetch_mail): add cleanup func arg.
-
-2000-06-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed ml_value_at to return "" instead of NULL
-	in some cases.
-
-2000-06-22  Peter Williams  <peterw@curious-george.helixcode.com>
-	* Makefile.am: Add GNOME_EXTRA_LIBS so that we get libgthread
-	in our LIBS for evolution-mail.
-	
-	* mail-threads.c: Make the dialog boxes for error and
-	question non-modal. They're modal relative to the dispatch
-	thread, but before they would also eg lock up the toolbar
-	buttons (while the menus, managed by another process, were
-	active -- a weird effect).
-	
-2000-06-22  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* mail-threads.[ch]: Extra argument to mail_operation_try:
-	'cleanup', a function to be called in the main thread after
-	the dispatcher thread exits. gtk_object_destroy's et al may
-	attempt to unmap windows so we can't do them in the dispatcher
-	thread :-(
-
-	* test-thread.c: Updated with demo of new argument working.
-
-2000-06-22  Peter Williams  <peterw@helixcode.com>
-
-	* test-thread.c (op_5): New tests for the get_password
-	hook.
-
-	* mail-threads.[ch]: New hook, mail_op_get_password, for
-	getting a user response from an async operation. The operation
-	blocks while waiting for the response. A big whole mutex 
-	condition threading blocking dealie to make sure that it 
-	works.
-
-	Also the error hook creates a dialog again, which also needs
-	to block its caller while we wait for the user to press ok.
-
-2000-06-22  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (various functions): Prettify the UI
-	so that the progress bar doesn't become all huge 'n stuff.
-	(mail_operation_try): Now save the operation's description,
-	so that we can display it later as the default message.
-	(read_msg): When the operation starts set the label to its
-	UI-friendly name.
-	(dispatch_func): Free the saved prettyname.
-
->>>>>>> 1.221
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Removed an erroneous comment.
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (create_transport_page): Make this not crash if
-	you don't have a transport configured.
-	
-	* message-list.c: Update received date to work like sent date.
-
-2000-06-21  Peter Williams  <peterw@helixcode.com>
-
-	* mail-thread.{c,h}: New files -- a simple API for executing
-	the major mail ops (fetch_mail etc) asynchronously, allowing
-	the operations to send messages and update a progress bar.
-
-	* test-thread.{c,h}: Tests the mail-thread API.
-
-	* Makefile.am: add mail-thread.[ch] to evolution_mail_SOURCES
-	and declare the test_thread noinst_PROGRAM.
-
-2000-06-21  Peter Williams  <peterw@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Include "e-setup.h" to
-	get the prototype for evolution_dir.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (create_imap_storage): Oops. Should
-	have checked for a NULL sources.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (mark_msg_seen): Quick hack to prevent a NULL
-	pointer dereference. Things need to be cleaned up a bit more here
-	though.
-
-	* mail-sources.c: Oops. This should have been removed a long time
-	ago.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Working on getting 
-	this to work :)
-
-	* component-factory.c (create_imap_storage): Should now correctly
-	construct the folder path allowing the selection of a folder.
-
-2000-06-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Declare `evolution_dir'.
-	Ugly, ugly, ugly, but I am not sure where it should go instead.
-
-2000-06-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (ask_confirm_for_empty_subject): New function to ask
-	confirmation for an empty subject line.
-	(composer_send_cb): Use it if the subject is empty and only send
-	the message if the user confirms.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (create_imap_storage): Now creates the IMAP
-	storage (listing subfolders and such)
-
-2000-06-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (find_preferred_alternative): add an option to
-	prefer text/plain.
-	(reply_body): add an option to prefer text/plain
-	(mail_generate_reply): Check the mail sending preferences, and
-	generate a text/plain reply if the user prefers to send plain text
-	(and we have a text/plain part to generate a reply from).
-
-2000-06-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (providers_config_new): Should now correctly display
-	the Transport page (made it set the optionmenu correctly, before it
-	would only set SMTP).
-	(create_transport_page): Updated to set the page info to sendmail/smtp
-	based on the url.
-	(create_service_page): Had to add some code to set data on some objects
-	so I could grab the objects I needed to modify in the above function.
-
-2000-06-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): started to add
-	code to load an IMAP folder.
-	
-	* component-factory.c: Started to add a create_imap_storage 
-	method so that we can eventually have our IMAP store displayed 
-	in the tree view.
-	(create_vfolder_storage): Renamed from
-	create_test_storage().
-	(owner_set_cb): Updated.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_set_folder): Prevent double-freeing
-	action on summary_table and uid_rowmap.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (ml_set_value_at): Implement clicking on the
-	envelope icon to set read/unread. Based on a patch by clahey.
-	(select_msg): keep the timeout id for the "seen" flagging in the
-	message_list structure, so ml_set_value_at can clear it so it
-	doesn't re-mark a message seen after you click it unseen.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_row): new function to do a uid to
-	row mapping.
-	(mark_msg_seen, select_msg, message_changed,
-	message_list_set_folder): Update for Camel flag changes.
-	(on_cursor_change_cmd): Rename "row_to_select" to "selected_row",
-	and keep a "selected_uid" as well.
-
-	* mail-ops.c (composer_send_cb): Update for Camel flag changes,
-	and fix some memory-handling bugs. (Free the post_send_data when
-	the composer is destroyed, not when the user clicks "send", which
-	could happen never, or more than once.)
-	(delete_msg): Update for Camel flag changes, and fix the "holding
-	down the delete key skips some messages" bug.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): 
-	* component-factory.c (owner_unset_cb): 
-	* message-list.c (message_list_set_folder): Update for CamelFolder
-	changes.
-
-	* folder-browser.c (folder_browser_clear_search): New function to
-	revert back to non-searching mode.
-
-	* mail-ops.c (fetch_mail): Use folder_browser_clear_search.
-
-	* mail-display.c (on_url_requested): if the document requests an
-	unknown URL, it's not an error; just ignore the URL.
-
-	* mail-ops.c (fetch_mail): If there's no new mail, tell the user.
-
-2000-06-14  Radek Doulik  <rodo@helixcode.com>
-
-	* main.c (main): call gtkhtmllib_init here
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (on_SourceConfigDialogButton_clicked): Make sure source
-	is always pointing to something, so a blank is not written to the config file
-	on close.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (SHELL_OBJS): Removed.
-	(evolution_mail_LDADD): Use `libeshell.a'.  Also use
-	`top_builddir' consistently.
-
-2000-06-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Got rid of sources_max_row and identities_max_row
-	as they are not really needed (just use clist->rows)
-	(on_cmdSourcesEdit_clicked): Modified to make 'source'
-	point to the data being edited.
-	(on_cmdSourcesAdd_clicked): Adds a new clist item and selects it so the
-	editor knows where to stick the data when it's done.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* message-list.c: Removed the ETableModel thaw handler.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_set_uri): Return the result of
-	folder_browser_load_folder.
-	(get_prop, set_prop, folder_browser_properties_init): Remove. No
-	longer needed.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	Add a "uri" argument, return NULL if setting it fails.
-	(folder_browser_factory_new_control): Remove property bag stuff.
-	(folder_browser_factory_init, folder_browser_factory): Remove
-	this, since we're using the component factory now.
-
-	* component-factory.c (create_view): Update for
-	folder_browser_factory_new_control change and return NOTFOUND as
-	appropriate.
-
-	* main.c (main): Don't call folder_browser_factory_init.
-
-	* mail-format.c (mail_generate_reply): Fix the subject generation
-	so we don't get "Re:  Re:". This is working around something that
-	may later be declared a misfeature in Camel.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (create_folder): New stub implementation for
-	the folder creation function in the EvolutionShellComponent we
-	expose [it simply returns success all the time].
-	(factory_fn): Pass this function to `evolution_shell_component_new'.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): Add a serial number to
-	FolderBrowser.
-
-	* folder-browser-factory.c (control_activate, control_deactivate):
-	Include fb serial number in the name of the Bonobo toolbar to
-	prevent problems with disappearing toolbars. This is a kludge and
-	should go away.
-
-
-	* mail-ops.c (expunge_folder): display error from
-	camel_folder_expunge if there is one.
-
-	* message-list.c (select_row): install an idle function to
-	select the row rather than doing it directly. Ugh. What a
-	kludge, but at least it works now.
-
-	* session.c (evolution_auth_callback): Update for
-	CamelAuthCallback changes. (Uncache passwords when asked to.)
-
-	* mail-ops.c (fetch_mail): close and expunge the source folder
-	after copying it to a local folder.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (create_view): Updated to match the changes
-	to the definition of `EvolutionShellComponentCreateFn'.  If @type
-	is not "mail", return an "unsupported type" error.
-	(factory_fn): Pass NULL for the `remove_folder' and
-	`create_folder' functions.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Redo things a bit so that whitespace-only
-	text parts aren't displayed. (In particular, so that
-	whitespace-only subparts of multipart/mixed aren't displayed as
-	separate (empty) parts.)
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): 
-	* folder-browser.c (folder_browser_load_folder): Update for folder
-	creation/existence changes.
-
-	* message-list.c (message_list_set_folder): Remove the code to
-	create the folder if it doesn't exist, since we don't want to do
-	that.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (composer_send_cb): Leave the composer window around
-	if the message doesn't get sent.
-
-2000-06-05  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (etable_key): Allow "GDK_KP_Delete", a keypad
-	delete key, to delete a message.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* session.c (evolution_auth_callback): Remember passwords between
-	calls.
-	(forget_passwords): Callback for "Forget Passwords" menu item.
-
-	* folder-browser-factory.c (control_activate): 
-	(control_deactivate): Add "Forget Passwords" menu item.
-
-	* mail.h, mail-ops.c: fix some function prototypes
-
-	* folder-browser.c (etable_key): Add "Delete" = delete message.
-
-	* mail-format.c (mail_generate_forward): Update for new composer
-	attachment interface.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (providers_config_new): Added a new notebook
-	page that allowed for mail format (text/plain or 
-	multipart/alternative)
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (filter_date): If the date in the summary is 0,
-	output "?".
-
-	* component-factory.c (create_view): keep a GList of folder
-	browsers created
-	(owner_unset_cb): Go through the list and close each folder before
-	exiting so they sync their summary state, etc to disk.
-
-	* mail-ops.c (fetch_mail): Use camel_service_connect, not
-	connect_with_url, since we already passed the URL into
-	camel_session_get_store.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Use camel_folder_free_summary instead of
-	g_ptr_array_free.  Unref the folder when we're done with it.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* session.c: Revert removal of e_setup_base_dir.
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (my_folder_browser_init): Connect to ETable's
-	key_press signal.
-	(etable_key): scroll mail on space/backspace.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Made sent column as wide as from column.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (on_cmdSourcesAdd_clicked): Changed identity_row
-	to source_row as this is a Sources clist we are dealing with and
-	not an identity clist
-	(on_cmdSourcesEdit_clicked): same
-	(on_cmdSourcesDelete_clicked): again, same
-	(on_cmdSourcesEdit_clicked): Source editor now fills in data from
-	the clist
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Add a date column.	
-	(COL_SENT_WIDTH_MIN): Make this wider.
-	(ml_value_at): return the sent date (as a time_t) for COL_SENT.
-	(Fix COL_TO too while I'm here.) 
-	(ml_duplicate_value, ml_free_value, ml_initialize_value,
-	ml_value_is_empty): COL_SENT is numeric now.
-	(message_list_init_renderers): Create a date renderer (using
-	text_filter to translate the time_t into a string).
-	(message_list_init_header): Use render_date for COL_SENT.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* session.c: Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_generate_forward): Fix forwarding to work
-	for people other than me. :) [Although apparently it doesn't
-	really.]
-
-	* mail-ops.c (delete_msg): Add a quick hack to move the selection
-	down a row when you delete a message.
-
-	* mail-format.c (handle_message_rfc822): use <blockquote> rather
-	than <center><table border=1 width=95%> to frame the embedded
-	message. If <pre> text in the subtable won't fit in the 95% width,
-	GtkHTML will write past the border of the table (and
-	<blockquote><table border=1> causes creeping updates so it's not
-	usable for now).
-	
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_init): Turn off the grid in our
-	ETable.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_headers): Oops. This needs to take a
-	message argument because we might be writing headers for an
-	embedded message/rfc822 subpart rather than the root document.
-
-2000-06-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Config dialogs are completed.
-	(service_acceptable): Fixed a segfault caused by duplicate 
-	camel_exception_free()
-	(providers_config_new): Identity and Source clists are now filled in
-	when the dialog is created as well as the Transport page
-
-	* folder-browser-factory.c: Renamed Tool/ menu items
-	Vfolder was changed to Virtual Folder and
-	Configure Camel Providers was changed to Mail Configuration
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Link with
-	`libemiscwidgets.a'.
-
-	* mail-display.c (mail_display_new): Use an EScrollFrame instead
-	of a GtkScrolledWindow.
-	(mail_display_set_message): Likewise.
-
-	* mail-display.h: Replace the GtkScrolledWindow with an
-	EScrollFrame.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (owner_unset_cb): Quit when the shell exits.
-	This is a kludge, but a pretty necessary one until the refcounting
-	bugs that keep the component from exiting properly are fixed.
-
-2000-05-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Partially implemented the source
-	configuration, seems to segfault due to a destroyed
-	gnome dialog being destroyed again in the method
-	on_SourceConfigDialogButton_clicked()
-
-2000-05-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (free_url, handle_text_enriched,
-	get_url_for_icon): Fix up memory management of x-evolution-data
-	URLs so the URLs and/or their data don't get freed while there are
-	still references to them.
-
-	* message-list.c (message_list_init_header): redo the (unused)
-	online status column to no longer refer to pixmaps that no longer
-	exist.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Put the toolbar
-	into a frame to make it look like standard GNOME toolbars.  Also,
-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
-	evil things when its moved to the left or the right of the window.
-
-2000-05-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Configuration dialog now allows 
-	adding/editing/deleting of Identities (which leaves
-	adding/editing/deleting of sources left to implement).
-	The data is also saved when the dialog is exited via 
-	the OK button.
-
-2000-05-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_format_mime_message): Initialize the "urls"
-	hash table stored on the message and store cid and other URLs
-	there rather than as object data on the message.
-	(get_cid): rewrite this a bunch
-	(handle_text_enriched): move the code from write_iframe_string()
-	into here, since it's the only place that actually needs it.
-	(handle_text_html): simplify this a lot. We can use a cid: URL
-	here rather than x-evolution-data.
-	(get_url_for_icon): New routine to return URLs for icons, and
-	cache the results, so we don't have to keep re-reading the icon
-	files (and so we can't be spoofed into reading non-icon files).
-	(handle_mystery, handle_audio): use get_url_for_icon.
-
-	* mail-display.c (save_data): move the CamelMimePart filename
-	extracting code from get_cid to here.
-	(on_link_clicked, on_object_requested): Update for cid: changes.
-	(on_url_requested): Kill off the kludgy, exploitable x-gnome-icon
-	URL schema, update cid and x-evolution-data to match
-	mail-format.c.
-
-	It should now be easier to implement RFC 2557 (Content-Location,
-	etc), but that RFC still pretty much sucks.
-
-2000-05-30  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Redo this back to the old way: a single GtkHTML
-	with various things inline in it. (Gets rid of flicker, simplifies
-	some scrolling, selecting, and printing issues.)
-	(handle_text_enriched, handle_text_html): Use <iframe>s for these,
-	to protect the rest of the document from their possibily invalid
-	HTML.
-	(handle_via_bonobo): Use (new-and-improved) <object> tags for
-	this, moving most of the work back into mail-display.c
-
-	* mail-display.c (on_object_requested): Move the Bonobo embedding
-	code back here again (reorganized a bit).
-	(on_url_requested): add x-evolution-data handler, for iframe
-	bodies.
-	(mail_html_new, mail_html_end): removed
-	(mail_display_set_message, mail_display_new): Update for NWO.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (search_set): Properly encode the search string.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail.h: Added a prototype for providers_config_new() which
-	is the constructor for the configuration dialog window
-
-	* mail-config.c: Added set_service_url() which is basically
-	the reverse of get_service_url().
-	Implemented on_cmdCamelServicesOK_clicked() - The configuration
-	window will now remember the Sendmail/SMTP data that the user
-	had entered in the previous session.
-	Removed on_cmdCamelServicesApply_clicked() - No need for this.
-
-2000-05-30  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_changed): call
-	e_table_model_row_changed, not e_table_model_changed so we do less
-	work, and don't lose the current selection.
-	(select_msg): Set up a timer to mark the displayed message as
-	"seen" if it's selected for longer than 1.5 seconds (a number
-	pulled out of Matt's butt).
-	(ml_value_at): Use the MESSAGE_STATUS column for read/unread as
-	well as deleted.
-
-	* message-list.c: use the "new" tigert pixmaps rather than the
-	older ones. Includes a "replied to" icon (which is used now), but
-	no "deleted" icon (although we have the strikeout renderer for
-	that now).
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Added bold for unread messages.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail.h: Added a prototype for providers_config()
-	which is the callback for a new menu item that
-	will construct a configuration dialog for the camel
-	providers and identities and display it
-
-	* mail-config.c: Added some code to construct the 
-	new providers dialog and a bunch of callbacks (most 
-	of which are not yet useful)
-
-	* mail-ops.c: Added the code for the providers_confi()
-	callback
-
-	* folder-browser-factory.c: Added the 
-	"Tools/Camel Providers Configuration ..." menu item
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Switched to using "cursor_change" signal instead
-	of "row_selection" for switching messages.  Select the first row
-	(still doesn't work because of ETable.)  Adapt to some small
-	ETable changes.  Set drawfocus to FALSE.
-
-2000-05-29  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Hardcode the
-	vfolder source to just the inbox (so at least it returns
-	something).
-
-	* component-factory.c (create_test_storage): Create a vfolder dir
-	first, and put the folders in that.
-	(create_test_storage): Create the storage as VFolders, not
-	"storage_name" :)
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (error_dialog): helper function since we need to
-	set "modal" on the dialogs returned by gnome_error_dialog to make
-	them work when popped up from the modal Druid.
-	(service_acceptable): New function to check if the info entered on
-	a store/transport page actually checks out.
-	(mail_config_druid): Connect to the "next" signal on the store and
-	transport pages and don't let the user continue if the data is
-	bad and "check this before continuing" is checked. Also, only
-	display sources/transports in the "mail" domain. (Ie, not
-	"vfolder".)
-
-	* mail-format.c (write_recipients_to_stream): Use `foo@bar' rather
-	than `<foo@bar>' for recipient with no name.
-
-	* mail-ops.c (fetch_mail): don't put up an error message if the
-	user cancels the password dialog.
-
-2000-05-27  Not Zed  <NotZed@HelixCode.com>
-
-	* Makefile.am (SHELL_OBJS): Include mail storage so we can
-	initialise folders.
-
-	* component-factory.c (create_test_storage): Parses vfolder
-	defintions and adds them to the storage.  Definetly needs more
-	work.
-
-	* folder-browser-factory.c (control_activate): Add the VFolder
-	druid menu item.
-	(control_deactivate): And remove it.
-
-	* mail-ops.c (vfolder_editor_clicked): For editing vfolder
-	definitions (rather like filters, oddly enough :).  Tries to
-	update the shell but it doesn't seem to work properly - requires a
-	mail component restart to take effect.
-
-	* folder-browser.c (folder_browser_load_folder): Handle vfolder:
-	urls' appropriately and map to camel.  Still needs a way to tell
-	the vfolder what folders to search! (all vfolders come up empty!).
-
-2000-05-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Added a COL_DELETED and made it
-	the strikeout column for both text renderers.
-
-2000-05-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Various improvements:
-
-	(call_handler_function, etc): Add a "mime_type" argument to the
-	handlers, so that if a part is tagged as
-	"application/octet-stream", and we figure out that it's really
-	something else, the handler we call can know what that something
-	else is.
-
-	(handle_text_enriched): Small fixes to make this not do
-	text/enriched-specific syntax in text/richtext or vice versa.
-
-	(handle_mystery): Allow for mystery data that can't even be saved
-	to disk. (ie, unrecognized external-body). Let the caller specify
-	the URL to use.
-
-	(handle_message_external_body): New function to deal with
-	message/external-body parts. Generates URLs for anon-ftp,
-	local-file, and URL access-types, and a more-useful-than-before
-	descriptive message for other types.
-
-	(handle_audio, handle_undisplayable): Use gnome_mime_get_value to
-	try to get a description of the MIME type to display to the user
-	rather than the raw form. (This will only work if the user has
-	recent gnome-vfs installed. [If they don't, it works just like
-	it used to.])
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (handle_text_html): Fix a bug (security/stability)
-	in its usage of mail_html_write.
-
-	* mail-ops.c (composer_send_cb, reply): set CAMEL_MESSAGE_ANSWERED
-	on a message after a successful reply.
-
-	* message-list.c (folder_changed): free the summary with
-	camel_folder_free_summary rather than g_ptr_array_free.
-
-	* mail-format.c (handle_via_bonobo): Update for PersistStream
-	changes
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Initialize the component factory.
-
-	* Makefile.am (evolution_mail_LDADD): Link with
-	`evolution-shell-component.o' from the shell directory.
-
-	* evolution-mail.oafinfo: Updated with the
-	Evolution::ShellComponent OAFIID.
-
-	* evolution-mail.gnorba: Updated with the
-	Evolution::ShellComponent GOAD ID.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	New function; code moved out from `folder_browser_factory'.
-	(folder_browser_factory): Use it.
-
-	* component-factory.c: New.
-	* component-factory.h: New.
-
-2000-05-24  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (composer_send_cb): connect to and disconnect from
-	the transport.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added libepaned.a.
-	
-	* folder-browser.c: Switched from GtkPaned to EPaned.
-
-2000-05-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Don't link to `evolution-service-repository.o'
-	anymore.
-
-	* folder-browser-factory.c: Don't use crufty service-repository
-	anymore.
-
-2000-05-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (get_message_info): Made static.
-	(ml_initialize_value): Return NULL to placate compiler.
-
-	* folder-browser.c (folder_browser_gui_init): Add cast.
-
-	* mail-display.c (mail_html_new): Don't pass an empty URL to
-	`gtk_html_begin()' anymore.
-
-	* mail-config.c (put_html): Don't pass an empty URL to
-	`gtk_html_begin()' anymore.
-
-	* mail-display.h: Updated for the new GtkHTML API that uses
-	`GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.
-	* mail-display.c: Likewise.
-	* mail-config.c: Likewise.
-	* mail-format.c: Likewise.
-
-2000-05-19  NotZed  <NotZed@HelixCode.com>
-
-	* mail-format.c: Fixes for stream stuff.
-
-	* mail-display.c (save_data_cb): Remove exception stuff on streams.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Added initialize_value and value_is_empty
-	callbacks.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory): Remove
-	development_warning (moved to shell)
-
-	* message-list.c (select_msg): Update for camel_folder_get_uids
-	(folder_changed, message_list_set_folder): Update for
-	camel_folder_get_summary
-
-	* mail-ops.c (fetch_mail): Update for camel_folder_get_uids
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* mail-component.c: This seems to be cruft. Nuke it.
-
-	* mail-display.c (save_data_cb, save_data, on_url_requested):
-	* mail-format.c (handle_text_plain_flowed, handle_text_html):
-	Use camel_data_wrapper_write_to_stream rather than
-	camel_data_wrapper_get_output_stream.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (filter_edit): Function to bring up the filter editor.
-	(filter_druid_clicked): Save/close dialogue.
-	(fetch_mail): Apply filters to incoming mail ... *hold breath*
-	If we are coming from a non-indexed/searchable/etc source, then
-	copy it to an mbox first.  When copying mail from an mbox source,
-	dont remove it aftewards, open it for append, so partially
-	filtered mail isn't lost.
-
-	* Makefile.am (evolution_mail_LDADD): Added libfilter.
-	(INCLUDES): Add EVOLUTION_DATADIR, and fix matt's brokeneditor(tm)
-	for putting spaces instead of tabs in.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-format.c: Removed usage of bonobo_object_destroy.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Updated to work with new ETable resizing.
-
-2000-05-12  NotZed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (fetch_mail): Use 6 X's to mkstemp, as required by
-	the man page, just a temp fix, this should probably change to a
-	known filename.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Now that we depend
-	on current gnome-libs we can make the toolbar detachable again.
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Left-justify the
-	message.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Made this dialog
-	have fewer buttons.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): New development
-	warning text from Nat.
-
-2000-05-10  Larry Ewing  <lewing@helixcode.com>
-
-	* mail-config.c (html_new): only set the default background color
-	if style is not NULL.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed folder-browser-factory.h since it doesn't
-	exist.  Added mail-display.h, mail-types.h, pixmaps.h.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Remove "File->mail"
-	menuitem.
-
-	* mail-config.c (mail_config_druid): Fill in "blah blah blah".
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): make this a
-	little less kludgy. Use gnome_error_dialog rather than printf on
-	errors.
-
-	* mail-ops.c (fetch_mail): Fix to work with the new shell stuff...
-	sorta. Will need more fixing later when the new shell framework is
-	more done.
-
-	* mail-config.c (finish): Call gnome_config_sync so the data
-	actually gets written.
-
-2000-05-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (save_data_cb):
-	(on_url_requested): Update for CamelStream CamelException changes.
-
-	* mail-format.c: Pass NULL for a CamelException in a bunch of
-	places... the user will see that the data is not being displayed,
-	and there's not a lot we can do, and none of these things should
-	be failing anyway. Maybe fix this later.
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* message-list.c (ml_value_at): Size moved to message info, rather
-	than content info structure.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (select_msg): unref the message after displaying
-	it.
-
-	* mail-format.c (get_data_wrapper_text):
-	(handle_text_plain_flowed): 
-	(handle_via_bonobo): Replace camel_stream_close calls.
-
-2000-05-07  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser-factory.c: Changed a toolbar button from saying
-	"New mail" (which suggests you might be composing new mail) to
-	"Get mail".
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory): Don't
-	hardcode "inbox" here.
-
-	* folder-browser.c (folder_browser_set_uri): Don't hardcode
-	"inbox" here either.
-	(folder_browser_load_folder): Create a new store according to the
-	folder browser's URI, and load the mbox file from that store.
-	Parts of this are temporary.
-
-	* session.c, mail.h: There is no longer a global store, just a
-	global session.
-
-	* mail-config.c, mail-ops.c: Update for default_session -> session
-	change. fetch_mail is currently broken.
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c: New code to configure identity, mail source, and
-	mail transport.
-	(mail_config_druid): A druid using the config widgets. (Only
-	allows configuration of a single identity, source, and transport.)
-
-	* mail-ops.c (check_configured): New function to make sure the
-	user has configured stuff, and call the	druid if not.
-	(fetch_mail, send_msg, send_to_url, reply, forward_msg): Call
-	check_configured
-	(composer_send_cb): Make this pass the message to a CamelTransport
-	rather than just printing it to stdout.
-
-	* folder-browser-factory.c (development_warning): Add a warning
-	about sending mail, since you can do that now.
-
-2000-05-06  Chris Toshok  <toshok@HelixCode.com>
-
-	* .cvsignore: ignore evolution-mail.pure
-
-	* Makefile.am: add support for building evolution-mail.pure
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* mail.h: consolidate mail-format.h, mail-identify.h, mail-ops.h,
-	main.h and session.h into this new file. There's no reason to have
-	a .h for every .c.
-
-2000-05-05  Anders Carlsson  <andersca@gnu.org>
-
-	* test-mail.c (create_container): Use the OAFIID when using an 
-	OAF-enabled build of bonobo.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_set_folder): Get the whole message
-	summary right away.
-	(folder_changed): And if we change too.
-	(ml_row_count): Use the match count or summary table length as the
-	row count.
-	(get_message_info): Use array references to lookup message summary
-	info.  For the search result list, use the summary_search_cache to
-	cache the info lookup.
-	(message_list_init): Allocate the summary search cache.
-	(message_list_destroy): Free the summary search cache and the
-	summary table, if there is one to free.
-	(message_list_set_search): Save the match count, and clear the
-	summary search cache for reuse.
-	(folder_changed): Re-retrieve the summary list if the folder has
-	changed.
-	(message_list_set_folder): Retrieve the summary list when opening
-	the folder.
-
-2000-05-03  Jason Leach  <leach@wam.umd.edu>
-
-	* Makefile.am (evolution_mail_LDADD): s/-lunicode/$(UNICODE_LIBS)/
-	in the LDADD section.
-
-2000-05-03  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_recipients_to_stream, write_headers): Make
-	the "Cc:" field optional again. (Before, we could check if
-	camel_mime_message_get_recipients returned NULL, but now we need
-	to actually look into the returned CamelInternetAddress object.)
-
-2000-05-03  Larry Ewing  <lewing@helixcode.com>
-
-	* folder-browser.c (folder_browser_gui_init): comment out the
-	changed signal for now.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-02  Larry Ewing  <lewing@helixcode.com>
-
-	* message-list.c (message_list_set_search): only free search if it
-	is not NULL.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (folder_browser_gui_init): Connect the changed
-	signal to search, so it searched immediately?
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* pixmaps.h: Added envelope-deleted state.
-
-	* folder-browser-factory.c: Setup callback for actual delete op.
-	(control_activate): Setup a tool menu item to expnge deleted
-	messages.
-
-	* mail-ops.c (delete_msg): Toggle the delete flag on a message.
-	(expunge_folder): New function to expunge deleted messages from
-	the current folder.
-
-	* folder-browser.c (folder_browser_gui_init): A hackish little
-	quick-search entry.
-	(search_activate): Perform a quick-search on the folder subject
-	only.
-	(folder_browser_gui_init): Add an option meny to the search line.	
-	(create_option_menu): Build the option menu from a table.
-	(search_set): Build a search from another string whent he option
-	menu or text item is changed.  5 search options are defined so
-	far.
-
-	* message-list.c (get_message_info): If there is an active search,
-	then get the data from that ... use this instead of
-	_get_message_info().
-	(ml_row_count): If we have an active search, get the info from its
-	result.
-	(select_msg): Changed to use get_message_info, so searches work.
-	(ml_value_at): And same here.
-	(message_list_init_renderers): Added a 3rd state to message_status
-	= deleted.
-	(ml_value_at): Show the message state as deleted, if it is marked
-	for deletion.
-	(folder_changed): When the folder changes, update the display.
-	(message_list_set_folder): Connect to the folder_changed event
-	here.
-	(message_changed): Callback to update the display when the message
-	changes.
-	(select_msg): And connect to the message_changed signal so we know
-	when it cahgnes.
-	(message_list_set_search): Save the search string.
-	(folder_changed): If the folder changes, re-run the search,
-	otherwise we may end up with invalid entries in the display.
-
-	* mail-display.c: Include missing errno.h.
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_providers_init): This is no longer necessary.
-
-	* mail-ops.c (fetch_mail): Remove kludge to load remote provider,
-	as camel can do it by itself now.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_link_clicked): Handle clicks on "cid" URLs by
-	popping up a "Save Attachment" dialog.
-
-	* mail-format.c (get_cid): if the part has a Content-Disposition
-	with a filename specified, record (a sanitized version of) that on
-	the wrapper when creating the cid reference, so the "save
-	attachment" code can use it later.
-	(handle_mystery): fix a bug in the cid generation here.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (lookup_handler, etc): Improve the builtin vs
-	bonobo selection code.
-	(handle_mystery): Include name and Content-Description in the
-	"mystery data" info, when available
-	(handle_unknown_type): Call mail_identify_mime_part before
-	giving up.
-	(handle_undisplayable): Split out of handle_unknown_type now
-	that handle_unknown_type can try alternate viewers.
-	(handle_via_bonobo): Fall back to handle_undisplayable if the
-	bonobo control fails.
-
-	* mail-identify.c (mail_identify_mime_part): New function to
-	attempt to identify a MIME part that we can't identify based on
-	Content-Type alone.
-
-	* mail-display.c (on_url_requested): redo the mystery data icon
-	display stuff less kludgily.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_recipients_to_stream, write_headers,
-	mail_generate_reply): Update (minimally) for Camel recipient
-	changes.
-
-2000-04-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (init_bonobo): Don't call `init_corba()' and don't get
-	any args.
-	(init_corba) [!USING_OAF]: Fix args.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c: New macro `CONTROL_FACTORY_ID', which
-	is #defined to a different value according to whether we are
-	`USING_OAF' or not.
-	(folder_browser_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* test-mail.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(main): Use `init_corba()'.
-
-	* main.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(init_bonobo): Use `init_corba()'.
-
-	* Makefile.am: Install OAF stuff if `USING_OAF'.  Add
-	`-I$(datadir)/idl' to the `orbit-idl' command-line so that we can
-	use Bonobo IDL files installed under our prefix as well.  Also,
-	use `$(ORBIT_IDL)' instead of hardcoded `orbit-idl'.
-
-	* evolution-mail.oafinfo: New file.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Move text_to_html to e-util.
-
-	* mail-ops.c (send_to_url): New routine. Thin wrapper for
-	e_msg_composer_new_from_url.
-
-	* mail-display.c (on_link_clicked): print a warning for news or
-	nntp URLs (which we'll deal with some day), and call send_to_url
-	for mailto URLs.
-
-	* mail-format.c (text_to_html): Improve URL conversion code.
-	Recognize https, recognize "www\..*" without a prefixed "http://".
-	Properly escape &, <, >, etc in URL strings. Don't be fooled by
-	"mailto:", "http://", etc with no following data.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (text_to_html): Reorganize a bit and add a new
-	flag, TEXT_TO_HTML_CONVERT_URLS to recognize and wrap URLs
-	in text.
-
-	* mail-display.c (mail_html_new): Add link_clicked signal handler.
-	(on_link_clicked): Use gnome_url_show to launch a browser.
-
-	* mail-format.c: update for CamelStream changes. Update for
-	CamelMimeBodyPart -> CamelMimePart
-
-2000-04-25  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c, mail-format.c: Redo large chunks of this. The
-	mail display now consists of a vbox in a scrolled window, in which
-	we put multiple GtkHTML objects. This means broken HTML in one
-	part can't corrupt other parts. The headers now scroll with the
-	body. Unrecognized attachments look prettier, but still don't do
-	anything, and will probably be changed later. We can also now
-	display nested message/rfc822 parts and multipart/alternatives
-	with multipart subparts. Oh, and text/{richtext,enriched}, since
-	we had all these ancient sample messages that use it and the lack
-	of support annoyed me. :)
-
-	Bonobo embeddables are broken right now, but I don't think that's
-	my fault.
-
-	* mail-format.c (reply_body): Fix some bugs that crept into reply
-	generation. This needs a lot more work to deal correctly with
-	complicated bodies.
-	(setup_function_table): pass unknown text subtypes to
-	handle_text_plain.
-	(handle_multipart_appledouble): new handler. Just ignores the
-	first (application/applefile) part and tries to display the
-	second part. Since the second part is usually
-	application/octet-stream, this doesn't work very well still
-	usually.
-	(reply_body): Make this deal better with multiparts.
-
-	* mail-format.c, mail-display.c: Now that we're not limited to
-	a single GtkHTML for the display, there's no reason to embed
-	Bonobo objects for unrecognized content-types in GtkHTML rather
-	than embedded them into the vbox directly. So do that.
-
-	Meanwhile, fix up the handler-selection code so that we can
-	declare which built-in handlers are more desirable than external
-	handlers and which are less. (Of course, eventually we'll want
-	this to be customizable.) Add some cleverness to
-	handle_multipart_alternative as well so it doesn't accept an
-	alternative which we can display generically over one we can
-	display specifically.
-
-	* mail-format.c (text_to_html): add a convert_space_hack flag,
-	which turns N spaces into N-1 &nbsp;s and a space.
-	(handle_text_plain): Check for "format=flowed" in the
-	Content-Type.
-	(handle_text_plain_flowed): Spinoff of handle_text_plain to deal
-	with RFC 2646 flowed text. (All the examples I can find of it
-	are generated by Eudora, but it's a pretty cool idea that ought
-	to be used more widely.)
-
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c: rename "send" to "send_msg", to avoid
-	name clash with the tcp function. Connect the "forward" button.
-
-	* mail-ops.c: rename "send" to "send_msg", to avoid name clash
-	with the tcp function. Add forward_msg function.
-
-	* mail-format.c (mail_generate_forward): support function for
-	forward_msg. Pretty much a big kludge right now, pending the
-	attachment/attachment-bar changes.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_url_requested): Change cid expectations to
-	match current camel reality.
-
-	* main.c (main): call glade_gnome_init, for composer.
-
-	* folder-browser-factory.c: move msg_composer_cb and
-	msg_composer_send_cb to mail-ops. Attach send, reply, and "reply
-	to all" buttons.
-
-	* mail-ops.c (composer_send_cb, send): moved from
-	folder-browser-factory.c.
-	(reply_to_sender, reply_to_all): new functions to do replies.
-
-	* mail-format.c (text_to_html): Add an "add_pre" flag, to make
-	it wrap the output in <pre></pre>.
-	(mail_generate_reply): New function to create a composer and build
-	a reply in it.
-
-2000-04-21  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_url_requested): deal with cid: URLs.
-	(find_cid): helper routine for above. (This could be much better.)
-	(mail_display_init): connect url_requested signal
-
-	* mail-format.c (handle_multipart_related): Make this work.
-
-	* mail-display.c (mail_display_set_message): ref the message we
-	display, since we're going to unref it when we remove it. Fixes a
-	bug that showed up with the new camel code, but it's not obvious
-	if it's due to a bug or a feature in the new code.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Add libibex.la to link.
-
-	* message-list.h: Removed folder summary.
-
-	* message-list.c: Dont include folder-summary anymore.
-	(select_msg): Changed to use folder, not summary in
-	summary_get_message_info().  God this code is grotty.
-	(ml_value_at): Ditto.
-	(ml_value_at): Changed to use new interface.  Hmm, this returns a
-	static variable, that seems wrong.
-	(message_list_set_folder): Remove folder summary.
-	(ml_row_count): Oops, remove some debug i put there.
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c: update for bonobo change, and remove a
-	now-unused variable.
-
-2000-04-17  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (on_row_selection_idle): new function, actually
-	calls select_msg.
-	(on_row_selection_cmd): register an idle instead of calling
-	select_msg directly.  this fixes the lag before the row is
-	selected - selection is instantaneous now, with message loading
-	happening afterward.
-
-	* message-list.h: add row_to_select and an idle_id to the message
-	list to make the select_msg call happen in an idle func.
-
-	* message-list.c (message_list_init_renderers): no more
-	e_cell_set_editable.  this info always comes from the model.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.[ch]: Moved from camel/camel-formatter, and changed
-	slightly. (More to come.)
-
-	* html-stream.[ch]: No longer necessary. mail-format uses
-	GtkHTMLStreamHandles directly.
-
-	* mail-display.[ch]: update for new message formatting code.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): use
-	gnome_app_fill_toolbar_with_data, so we get the beautiful gnome
-	toolbar.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Fix up the
-	warning message a bit.
-	(folder_browser_factory): Make the warning bypassable.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* main.c (main): Call e_cursors_init.
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): use camel_movemail when fetching mail
-	from an mbox store. This leaves behind temp files for now,
-	because CamelMboxFolder::delete is too confused to use, and NotZed
-	is rewriting CamelMboxFolder, so I'm not going to bother to try to
-	fix it.
-
-	* mail-ops.c: Add some #includes for the non-HAVE_MKSTEMP case
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): set folder_browser->uri
-	to NULL, so that we know when to free it.
-
-2000-04-07  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c (states_pixmaps): Add more beautiful art from
-	Miggue, the Diego Rivera of the next millenium.
-	(message_list_init_header): Use the beautiful art.
-
-	* pixmaps: Miguel rediscovers the "transparent" concept.
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (folder_browser_destroy): Unref the shell
-	interface that we have a handle to.
-
-	* folder-browser-factory.c (control_destroy_cb): New function;
-	destroys a folder-browser when its control is destroyed.
-	(folder_browser_factory): Hook up to the above.
-
-2000-04-07  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: new file, for toolbar/menu callbacks
-	(fetch_mail): fetch mail. Doesn't do mbox locking. Many kludges.
-
-	* folder-browser-factory.c (control_activate): use new fetch_mail
-	function as the callback for the "New mail" icon. Rename check_cb
-	to random_cb.
-
-	* Makefile.am: don't build test-sources since the version in
-	CVS doesn't do much and once I've fixed it it won't be a separate
-	program. Add mail-ops.[ch].
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c: Stick pixmaps here.
-
-	* mail-display.c (embeddable_destroy_cb): Replaced C++ comments
-	with C comments.
-
-	* message-list.c (load_internal_images): New function, loads images.
-	(message_list_init_renderers): Load images, fix previous attempt
-	at loading images. 
-
-	* Makefile.am (dist-hook): Added distribution of pixmaps.
-
-	* pixmaps: New directory, used to hold the XPMs we ship with. 
-
-	* pixmaps/envelope-closed.xpm, pixmaps/envelope-open.xpm: Tigert's
-	envelopes incorporated.
-
-2000-03-31  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c (ml_value_at): Fix miss-used variable. 
-
-2000-04-01  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser.c (folder_browser_properties_init): update to
-	new property  (folder_browser_property_changed): kill.
-	(get_prop, set_prop): do the donkey work + make properly RW.
-
-2000-03-31  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_set_shell):
-	* folder-browser.c (folder_browser_new):
-	* message-list.c (on_row_selection_cmd, select_msg,
-	message_list_init, message_list_set_folder):
-
-	remove debugging printf()s that no longer seem useful
-
-2000-03-29  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): build a toolbar.
-	(control_deactivate): and hide it.
-
-2000-03-27  Chris Toshok <toshok@helixcode.com>
-	* mail-display.c: quiet warnings when building in ../po
-
-2000-03-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* folder-browser-factory.c (folder_browser_set_shell): Memory leak
-	fix. 
-
-2000-03-25  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (select_msg, ml_value_at): update for summary
-	changes. Hey, neat, it really does make it more efficient.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* .cvsignore: Updated .cvsignore.
-
-2000-03-21  Matt Loper  <matt@helixcode.com>
-
-	* mail-display.c: Minor cleanup & commenting.
-
-	* folder-browser-factory.c: Minor cleanup & warning elimination.
-
-2000-03-21  bertrand  <bertrand@helixcode.com>
-
-	* message-list.c (ml_value_at): display message size
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Properly ref & sink the table and header models.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-sources.c: First cut at a mail source selection wizard.
-	Basically a rigged demo at this point. Doesn't use camel to get
-	its information, and is not yet complete or integrated with the
-	mail component. Did I mention that the code is ugly?
-
-2000-03-13  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_set_shell): 
-	for testing and demonstration purpose, immediately 
-	register a fake service.
-
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory_init): 
-	name change.
-	(control_activate_cb): when the control is activated, 
-	it merges its own UI with the remote UIHandler.
-	(control_add_menu): sample menu merging.
-	(folder_browser_factory): connect the control "activate" signal.
-
-	* evolution-mail.gnorba: 
-	name changes
-
-	* folder-browser.h: added a reference to an 
-	Evolution::Shell object. 
-
-	* folder-browser-factory.c (folder_browser_set_shell): 
-	(folder_browser_control_add_service_repository_interface): 
-	(folder_browser_factory): the folder-browser control now
-	implements the Evolution/ServiceRepository interface.
-
-2000-03-07  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): 
-	added a warning so that the user knows that this 
-	version may crash his mails.
-
-2000-03-05  bertrand  <bertrand@helixcode.com>
-
-	* message-list.h: include a referrence to the parent 
-	folder browser.
-
-	* message-list.c (ml_value_at): use the message summary 
-	from the 
-
-	* html-stream.c (html_stream_close): when the stream 
-	is closed, set the html stream to NULL
-	(html_stream_write): don't write anything if the 
-	html handle does not exist. 
-	(html_stream_reset): implemented. close the current 
-	html handle and begins a new html parser. 
-
-	* session.c (session_store_new): use static exception
-	here. 
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Added a prototype message listing.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Set up the column headers properly.
-
-	* folder-browser.c: Show the folder_browser widget.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Define ml_duplicate_value and ml_free_value
-	correctly.
-	
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Use g_int_compare and g_str_compare as we should
-	be instead of g_int_equal and g_str_equal.
-	
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* test-mail.c (main): replace the bonobo-active/gtk-main
-	by bonobo-main.
-	Include Gnorba headers.
-	(main): don't call the container creation routine 
-	before we entered the main loop. Use idle for that.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Change this to use the ETable widget itself
-	instead of building it from all the parts.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Ref the table columns since we unref them at the
-	end.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add `$(top_srcdir)'.  Also, the
-	`top_srcdir' includes must come first everything else to avoid
-	including installed headers instead of our fresh ones.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Fixed references to eutil.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed to match new e_table_simple interface.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_set_folder): update for CamelFolder
-	changes
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed this to not use the "x" and "y"
-	arguments to e-table-item.
-
-2000-02-23  Matt Loper  <matt@helixcode.com>
-
-	* message-list.c (message_list_set_folder): Check 'desc'riptions
-	of exceptions.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* message-list.c (message_list_set_folder): 
-	fix to show a sample correct implementation. 
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: added -lunicode to evolution_mail_LDADD.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_store_new): Pass a CamelAuthCallback
-	(evolution_auth_callback) to camel_session_new.
-	
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_store_new): Update session_store_new to
-	deal with the fact that camel_session_get_store takes a
-	CamelException now. Doesn't actually do anything with the
-	exception yet, because nothing else does yet either.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added test-mail.
-
-2000-02-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* folder-browser.c (folder_browser_load_folder): New routine,
-	loads a camel folder.
-	(folder_browser_set_uri): redo.
-
-	* session.c: new file.  Implements SessionStores to keep track of
-	a Session/Store tuple.  
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* html-stream.c (html_stream_new): Second param of gtk_html_begin
-	should be "", not NULL.
-	(html_stream_new): gtk_html_parse() is deprecated, so the call was
-	removed.
-
-	* html-stream.h: HTMLStreamClass's parent changed to
-	CamelStreamClass, not CamelStream.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Add the e-text directory to the includes list.
-
-	* message-list.c: Change the call to e_cell_text_new, since
-	there's an added argument.
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added libetext as libetable depends on it.
-
-2000-02-08  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* Makefile.am: Changed the order of the compilation so the CORBA stuff
-	was made before it was needed.
-
-2000-01-19  Miguel de Icaza  <miguel@gnu.org>
-
-	* Started work on the mail display engine.
-
-	* html-stream.c, html-stream.h: New files, they are CamelStreams
-	used to write to the GtkHTML widget. 
-
diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in
deleted file mode 100644
index 2be622f3f6..0000000000
--- a/mail/GNOME_Evolution_Mail.oaf.in
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder factory component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45"
-            type="factory"
-            location="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder display component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution mail component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling mail."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/mail/GNOME_Evolution_Mail.oafinfo b/mail/GNOME_Evolution_Mail.oafinfo
deleted file mode 100644
index 2be622f3f6..0000000000
--- a/mail/GNOME_Evolution_Mail.oafinfo
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder factory component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45"
-            type="factory"
-            location="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder display component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution mail component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling mail."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/mail/Mail.idl b/mail/Mail.idl
deleted file mode 100644
index 1d12a39c5c..0000000000
--- a/mail/Mail.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * mail.idl: Mail interfaces for Evolution
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- * 
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module Evolution {
-	
-	interface MessageList : Bonobo::Unknown {
-		
-		void select_message (in long message_number);
-		void open_message   (in long message_number);
-	};
-	
-	/*
-	 * FolderBrowser object.
-	 *
-	 * configuration of this widget is done trough 
-	 * Bonobo Properties
-	 */
-	interface FolderBrowser : Bonobo::Unknown {
-		MessageList get_message_list ();
-	};
-};
-
diff --git a/mail/Makefile.am b/mail/Makefile.am
deleted file mode 100644
index e1c0bbbc97..0000000000
--- a/mail/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-bin_PROGRAMS =	evolution-mail test-mail test-thread
-
-providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
-
-#imagesdir = $(datadir)/images/evolution
-#images_DATA = e-attchmt.png
-#EXTRA_DIST = $(image_DATA)
-
-INCLUDES = \
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/camel				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"	\
-	-DG_LOG_DOMAIN=\"evolution-mail\"
-
-EVOLUTION_MAIL_CORBA_GENERATED = \
-	Mail.h			\
-	Mail-common.c		\
-	Mail-skels.c		\
-	Mail-stubs.c
-
-# FIXME Is there any way around having to do this?
-CAMEL_OBJS_EXTRA =					\
-	$(top_builddir)/camel/providers/vee/libcamelvee.la
-
-evolution_mail_SOURCES =		\
-	$(EVOLUTION_MAIL_CORBA_GENERATED)	\
-	component-factory.c		\
-	component-factory.h		\
-	folder-browser.c		\
-	folder-browser.h		\
-	folder-browser-factory.c	\
-	mail-config.c			\
-	mail-display.c			\
-	mail-display.h			\
-	mail-format.c			\
-	mail-identify.c			\
-	mail-ops.c			\
-	mail-threads.c			\
-	mail-threads.h			\
-	mail-types.h			\
-	main.c				\
-	message-list.c			\
-	message-list.h			\
-	session.c			\
-	mail.h				\
-	pixmaps.h
-
-
-evolution_mail_LDADD = 					\
-	$(top_builddir)/shell/libeshell.a		\
-	$(top_builddir)/composer/libcomposer.la		\
-	$(top_builddir)/widgets/e-paned/libepaned.a	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a	\
-	$(top_builddir)/widgets/e-table/libetable.a	\
-	$(top_builddir)/widgets/e-text/libetext.a	\
-	$(CAMEL_OBJS_EXTRA)				\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/filter/libfilter.la		\
-	$(BONOBO_HTML_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)				\
-	$(PTHREAD_LIB)					\
-	$(UNICODE_LIBS)
-
-test_mail_SOURCES = \
-	test-mail.c
-
-test_mail_LDADD = \
-	$(BONOBO_HTML_GNOME_LIBS)
-
-test_thread_SOURCES =	\
-	mail-threads.c	\
-	mail-threads.h	\
-	test-thread.c
-
-test_thread_LDADD = 			\
-	$(BONOBO_VFS_GNOME_LIBS)	\
-	$(PTHREAD_LIB)
-
-test_thread_CFLAGS = -g
-
-GOAD_FILES = evolution-mail.gnorba
-OAF_FILES = evolution-mail.oafinfo
-
-if USING_OAF
-oafdir = $(datadir)/oaf
-oaf_DATA = $(OAF_FILES)
-else
-gnorbadir = $(sysconfdir)/CORBA/servers
-gnorba_DATA = $(GOAD_FILES)
-endif
-
-$(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl 
-	$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Mail.idl
-
-EXTRA_DIST = Mail.idl $(GOAD_FILES) $(OAF_FILES)
-
-dist-hook:
-	-mkdir $(distdir)/pixmaps
-	cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-mail.pure
-
-evolution-mail.pure: evolution-mail
-	@rm -f evolution-mail.pure
-	$(PLINK) $(evolution_mail_LDFLAGS) $(evolution_mail_OBJECTS) $(evolution_mail_LDADD) $(LIBS)
-
-endif
-
diff --git a/mail/component-factory.c b/mail/component-factory.c
deleted file mode 100644
index a48ac18379..0000000000
--- a/mail/component-factory.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "camel.h"
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-component.h"
-#include "folder-browser.h"
-#include "mail.h"		/* YUCK FIXME */
-#include "mail-threads.h"
-#include "e-util/e-gui-utils.h"
-#include "e-util/e-setup.h"
-
-#include "filter/filter-driver.h"
-#include "component-factory.h"
-
-static void create_vfolder_storage (EvolutionShellComponent *shell_component);
-static void create_imap_storage (EvolutionShellComponent *shell_component);
-static void real_create_imap_storage( gpointer user_data );
-static void create_news_storage (EvolutionShellComponent *shell_component);
-static void real_create_news_storage( gpointer user_data );
-
-#ifdef USING_OAF
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-#else
-#define COMPONENT_FACTORY_ID "evolution-shell-component-factory:evolution-mail"
-#endif
-
-static BonoboGenericFactory *factory = NULL;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "mail", "evolution-inbox.png" },
-	{ NULL, NULL }
-};
-
-static GList *browsers;
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *folder_type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-	GtkWidget *folder_browser_widget;
-
-	if (g_strcasecmp (folder_type, "mail") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = folder_browser_factory_new_control (physical_uri);
-	if (!control)
-		return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-
-	folder_browser_widget = bonobo_control_get_widget (control);
-
-	g_assert (folder_browser_widget != NULL);
-	g_assert (IS_FOLDER_BROWSER (folder_browser_widget));
-
-	browsers = g_list_prepend (browsers, folder_browser_widget);
-
-	/* dum de dum, hack to let the folder browser know the storage its in */
-	gtk_object_set_data (GTK_OBJECT (folder_browser_widget), "e-storage",
-			     gtk_object_get_data(GTK_OBJECT (shell_component), "e-storage"));
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-
-	/* FIXME: Implement.  */
-
-	CORBA_exception_init (&ev);
-
-	Evolution_ShellComponentListener_report_result (listener, Evolution_ShellComponentListener_OK, &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      Evolution_Shell shell_interface,
-	      gpointer user_data)
-{
-	g_print ("evolution-mail: Yeeeh! We have an owner!\n");	/* FIXME */
-
-	create_vfolder_storage (shell_component);
-	create_imap_storage (shell_component);
-	create_news_storage (shell_component);
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component, gpointer user_data)
-{
-	FolderBrowser *fb;
-
-	/* Sync each open folder. We should do more cleanup than this,
-	 * but then, we shouldn't be just exiting here either. FIXME.
-	 */
-	while (browsers) {
-		fb = browsers->data;
-		camel_folder_sync (fb->folder, FALSE, NULL);
-		browsers = browsers->next;
-	}
-
-	gtk_main_quit ();
-}
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory, void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types,
-							 create_view,
-							 create_folder,
-							 NULL,
-							 NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize Evolution's mail component."));
-		exit (1);
-	}
-}
-
-static void
-create_vfolder_storage (EvolutionShellComponent *shell_component)
-{
-	Evolution_Shell corba_shell;
-	EvolutionStorage *storage;
-	
-	corba_shell = evolution_shell_component_get_owner (shell_component);
-	if (corba_shell == CORBA_OBJECT_NIL) {
-		g_warning ("We have no shell!?");
-		return;
-	}
-    
-	storage = evolution_storage_new ("VFolders");
-	if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {
-		g_warning ("Cannot register storage");
-		return;
-	}
-
-	/* save the storage for later */
-	gtk_object_set_data(GTK_OBJECT (shell_component), "e-storage", storage);
-
-	/* this is totally not the way we want to do this - but the
-	   filter stuff needs work before we can remove it */
-	{
-		FilterDriver *fe;
-		int i, count;
-		char *user, *system;
-
-		fe = filter_driver_new();
-		user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-		system = g_strdup_printf("%s/evolution/vfoldertypes.xml", EVOLUTION_DATADIR);
-		filter_driver_set_rules(fe, system, user);
-		g_free(user);
-		g_free(system);
-		count = filter_driver_rule_count(fe);
-
-		for (i = 0; i < count; i++) {
-			struct filter_option *fo;
-			GString *query;
-			struct filter_desc *desc = NULL;
-			char *desctext, descunknown[64];
-			char *name;
-
-			fo = filter_driver_rule_get(fe, i);
-			if (fo == NULL)
-				continue;
-			query = g_string_new("");
-			if (fo->description)
-				desc = fo->description->data;
-			if (desc)
-				desctext = desc->data;
-			else {
-				sprintf(descunknown, "vfolder-%p", fo);
-				desctext = descunknown;
-			}
-			g_string_sprintf(query, "vfolder:%s/vfolder/%s?", evolution_dir, desctext);
-			filter_driver_expand_option(fe, query, NULL, fo);
-			name = g_strdup_printf("/%s", desctext);
-			printf("Adding new vfolder: %s\n", query->str);
-			evolution_storage_new_folder (storage, name,
-						      "mail",
-						      query->str,
-						      desctext);
-			g_string_free(query, TRUE);
-			g_free(name);
-		}
-		gtk_object_unref(GTK_OBJECT (fe));
-	}
-}
-
-struct create_info_s {
-	EvolutionStorage *storage;
-	char *source;
-};
-
-static void
-create_imap_storage (EvolutionShellComponent *shell_component)
-{
-	Evolution_Shell corba_shell;
-	EvolutionStorage *storage;
-	char *cpath, *source, *server, *p;
-	struct create_info_s *ii;
-
-	cpath = g_strdup_printf ("=%s/config=/mail/source", evolution_dir);
-	source = gnome_config_get_string (cpath);
-	g_free (cpath);
-
-	if (!source || strncasecmp (source, "imap://", 7))
-		return;
-	
-	corba_shell = evolution_shell_component_get_owner (shell_component);
-	if (corba_shell == CORBA_OBJECT_NIL) {
-		g_warning ("We have no shell!?");
-		g_free (source);
-		return;
-	}
-
-	if (!(server = strchr (source, '@'))) {
-		g_free (source);
-		return;
-	}
-	
-	server++;
-	for (p = server; *p && *p != '/'; p++);
-
-	server = g_strndup (server, (gint)(p - server));
-	
-	storage = evolution_storage_new (server);
-	g_free (server);
-
-	if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {
-		g_warning ("Cannot register storage");
-		g_free (source);
-		return;
-	}
-
-	/* save the storage for later */
-	gtk_object_set_data (GTK_OBJECT (shell_component), "e-storage", storage);
-
-	ii = g_new( struct create_info_s, 1 );
-	ii->storage = storage;
-	ii->source = g_strdup( source );
-	mail_operation_try( "Create IMAP Storage", real_create_imap_storage, g_free, ii );
-
-	/* Note the g_free as our cleanup function deleting the ii struct when we're done */
-}
-
-static void
-real_create_imap_storage( gpointer user_data )
-{	
-	CamelException *ex;
-	EvolutionStorage *storage;
-	char *p, *source;
-	CamelStore *store;
-	CamelFolder *folder;
-	GPtrArray *lsub;
-	int i, max;
-	struct create_info_s *ii;
-
-	ii = (struct create_info_s *) user_data;
-	storage = ii->storage;
-	source = ii->source;
-
-	mail_op_hide_progressbar();
-	mail_op_set_message( "Connecting to IMAP service..." );
-
-	ex = camel_exception_new ();
-	
-	store = camel_session_get_store (session, source, ex);
-	if (!store) {
-		goto cleanup;
-	}
-	
-	camel_service_connect (CAMEL_SERVICE (store), ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		goto cleanup;
-	}
-
-	mail_op_set_message( "Connected. Examining folders..." );
-
-	folder = camel_store_get_root_folder (store, ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		goto cleanup;
-	}
-
-	/* we need a way to set the namespace */
-	lsub = camel_folder_get_subfolder_names (folder, ex);
-
-	p = g_strdup_printf ("%s/INBOX", source);
-	evolution_storage_new_folder (storage, "/INBOX", "mail", p, "description");
-
-	max = lsub->len;
-	for (i = 0; i < max; i++) {
-		char *path, *buf;
-
-		path = g_strdup_printf ("/%s", (char *)lsub->pdata[i]);
-		buf = g_strdup_printf ("%s/%s", source, path);
-		g_print ("Adding %s\n", path);
-
-		mail_op_set_message( "Adding %s", path );
-
-		evolution_storage_new_folder (storage, path, "mail", buf, "description");
-	}
-
- cleanup:
-	g_free( ii->source );
-	if( camel_exception_is_set( ex ) )
-		mail_op_error( "%s", camel_exception_get_description( ex ) );
-	camel_exception_free (ex);
-}
-
-static void
-create_news_storage (EvolutionShellComponent *shell_component)
-{
-	Evolution_Shell corba_shell;
-	EvolutionStorage *storage;
-	char *cpath, *source, *server, *p;
-	struct create_info_s *ni;
-
-	cpath = g_strdup_printf ("=%s/config=/news/source", evolution_dir);
-	source = gnome_config_get_string (cpath);
-	g_free (cpath);
-
-	if (!source || strncasecmp (source, "news://", 7))
-		return;
-	
-	corba_shell = evolution_shell_component_get_owner (shell_component);
-	if (corba_shell == CORBA_OBJECT_NIL) {
-		g_warning ("We have no shell!?");
-		g_free (source);
-		return;
-	}
-
-	server = source + 7;
-	for (p = server; *p && *p != '/'; p++);
-
-	server = g_strndup (server, (gint)(p - server));
-	
-	storage = evolution_storage_new (server);
-	g_free (server);
-
-	if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {
-		g_warning ("Cannot register storage");
-		g_free (source);
-		return;
-	}
-
-	/* save the storage for later */
-	gtk_object_set_data (GTK_OBJECT (shell_component), "e-storage", storage);
-
-	ni = g_new( struct create_info_s, 1 );
-	ni->storage = storage;
-	ni->source = g_strdup( source );
-	mail_operation_try( "Create News Storage", real_create_news_storage, g_free, ni );
-
-	/* again note the g_free cleanup func */
-}
-
-static void
-real_create_news_storage( gpointer user_data )
-{	
-	EvolutionStorage *storage;
-	char *source;
-	CamelStore *store;
-	CamelFolder *folder;
-	CamelException *ex;
-	GPtrArray *lsub;
-	int i, max;
-	struct create_info_s *ni;
-
-	ni = (struct create_info_s *) user_data;
-	storage = ni->storage;
-	source = ni->source;
-
-	mail_op_hide_progressbar();
-	mail_op_set_message( "Connecting to news service..." );
-
-	ex = camel_exception_new ();
-	
-	store = camel_session_get_store (session, source, ex);
-	if (!store) {
-		goto cleanup;
-	}
-	
-	camel_service_connect (CAMEL_SERVICE (store), ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		goto cleanup;
-	}
-
-	mail_op_set_message( "Connected. Examining folders..." );
-
-	folder = camel_store_get_root_folder (store, ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		goto cleanup;
-	}
-
-	/* we need a way to set the namespace */
-	lsub = camel_folder_get_subfolder_names (folder, ex);
-
-	max = lsub->len;
-	for (i = 0; i < max; i++) {
-		char *path, *buf;
-
-		path = g_strdup_printf ("/%s", (char *)lsub->pdata[i]);
-		buf = g_strdup_printf ("%s%s", source, path);
-		g_print ("Adding %s\n", path);
-
-		mail_op_set_message( "Adding %s", path );
-
-		/* FIXME: should be s,"mail","news",? */
-		evolution_storage_new_folder (storage, path, "mail", buf, "description");
-	}
-
- cleanup:
-	g_free( ni->source );
-	if( camel_exception_is_set( ex ) )
-		mail_op_error( "%s", camel_exception_get_description( ex ) );
-	camel_exception_free (ex);
-}
diff --git a/mail/component-factory.h b/mail/component-factory.h
deleted file mode 100644
index 1f5a33f407..0000000000
--- a/mail/component-factory.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef COMPONENT_FACTORY_H
-#define COMPONENT_FACTORY_H
-
-void  component_factory_init  (void);
-
-#endif
diff --git a/mail/e-attchmt.png b/mail/e-attchmt.png
deleted file mode 100644
index b4bac8db67..0000000000
--- a/mail/e-attchmt.png
+++ /dev/null
diff --git a/mail/evolution-mail.gnorba b/mail/evolution-mail.gnorba
deleted file mode 100644
index b799a57aa2..0000000000
--- a/mail/evolution-mail.gnorba
+++ /dev/null
@@ -1,23 +0,0 @@
-[control-factory:evolution-mail]
-type=exe
-repo_id=IDL:GNOME/GenericFactory:1.0
-description=Evolution mail folder factory component.
-location_info=evolution-mail
-
-[control:evolution-mail]
-type=factory
-repo_id=IDL:BonoboControl/evolution-mail:1.0 IDL:GNOME/Control:1.0
-description=Evolution mail folder display component.
-location_info=control-factory:evolution-mail
-
-[evolution-shell-component-factory:evolution-mail]
-type=exe
-repo_id=IDL:GNOME/GenericFactory:1.0
-description=Factory for the Evolution mail component.
-location_info=evolution-mail
-
-[evolution-shell-component:evolution-mail]
-type=factory
-repo_id=IDL:Evolution/ShellComponent:1.0
-description=Evolution component for handling mail.
-location_info=evolution-shell-component-factory:evolution-mail
diff --git a/mail/evolution-mail.oafinfo b/mail/evolution-mail.oafinfo
deleted file mode 100644
index 2be622f3f6..0000000000
--- a/mail/evolution-mail.oafinfo
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder factory component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45"
-            type="factory"
-            location="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder display component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution mail component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling mail."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
deleted file mode 100644
index 794f44d96d..0000000000
--- a/mail/folder-browser-factory.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * folder-browser-factory.c: A Bonobo Control factory for Folder Browsers
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h> 
-#include "e-util/e-util.h"
-#include "e-util/e-gui-utils.h"
-#include "folder-browser.h"
-#include "mail.h"
-#include "shell/Evolution.h"
-
-#ifdef USING_OAF
-#define CONTROL_FACTORY_ID "OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2"
-#else
-#define CONTROL_FACTORY_ID "control-factory:evolution-mail"
-#endif
-
-static void
-random_cb (GtkWidget *button, gpointer user_data)
-{
-	printf ("Yow! I am called back!\n");
-}
-
-static GnomeUIInfo gnome_toolbar [] = {
-	GNOMEUIINFO_ITEM_STOCK (N_("Get mail"), N_("Check for new mail"), fetch_mail, GNOME_STOCK_PIXMAP_MAIL_RCV),
-	GNOMEUIINFO_ITEM_STOCK (N_("Send"), N_("Send a new message"), send_msg, GNOME_STOCK_PIXMAP_MAIL_SND),
-	GNOMEUIINFO_ITEM_STOCK (N_("Find"), N_("Find messages"), random_cb, GNOME_STOCK_PIXMAP_SEARCH),
-
-	GNOMEUIINFO_SEPARATOR,
-
-	GNOMEUIINFO_ITEM_STOCK (N_("Reply"), N_("Reply to the sender of this message"), reply_to_sender, GNOME_STOCK_PIXMAP_MAIL_RPL),
-	GNOMEUIINFO_ITEM_STOCK (N_("Reply to All"), N_("Reply to all recipients of this message"), reply_to_all, GNOME_STOCK_PIXMAP_MAIL_RPL),
-
-	GNOMEUIINFO_ITEM_STOCK (N_("Forward"), N_("Forward this message"), forward_msg, GNOME_STOCK_PIXMAP_MAIL_FWD),
-
-	GNOMEUIINFO_SEPARATOR,
-
-	GNOMEUIINFO_ITEM_STOCK (N_("Print"), N_("Print the selected message"), random_cb, GNOME_STOCK_PIXMAP_PRINT),
-
-	GNOMEUIINFO_ITEM_STOCK (N_("Delete"), N_("Delete this message"), delete_msg, GNOME_STOCK_PIXMAP_TRASH),
-
-	GNOMEUIINFO_END
-};
-
-static void
-control_activate (BonoboControl *control, BonoboUIHandler *uih,
-		  FolderBrowser *fb)
-{
-	Bonobo_UIHandler  remote_uih;
-	BonoboControl *toolbar_control;
-	GtkWidget *toolbar, *toolbar_frame, *folder_browser;
-	char *toolbar_name = g_strdup_printf ("/Toolbar%d", fb->serial);
-
-	remote_uih = bonobo_control_get_remote_ui_handler (control);
-	bonobo_ui_handler_set_container (uih, remote_uih);		
-
-	folder_browser = bonobo_control_get_widget (control);
-
-	bonobo_ui_handler_menu_new_item (uih, "/Tools/Expunge", N_("_Expunge"),
-					 NULL, -1,
-					 BONOBO_UI_HANDLER_PIXMAP_STOCK,
-					 GNOME_STOCK_PIXMAP_TRASH,
-					 0, 0, expunge_folder, folder_browser);
-
-	bonobo_ui_handler_menu_new_item (uih, "/Tools/Filter Druid ...", N_("_Filter Druid ..."),
-					 NULL, -1,
-					 BONOBO_UI_HANDLER_PIXMAP_NONE,
-					 0,
-					 0, 0, filter_edit, folder_browser);
-
-	bonobo_ui_handler_menu_new_item (uih, "/Tools/Virtual Folder Druid ...", N_("_Virtual Folder Druid ..."),
-					 NULL, -1,
-					 BONOBO_UI_HANDLER_PIXMAP_NONE,
-					 0,
-					 0, 0, vfolder_edit, folder_browser);
-
-	bonobo_ui_handler_menu_new_item (uih, "/Tools/Mail Configuration ...", N_("_Mail Configuration ..."),
-					 NULL, -1,
-					 BONOBO_UI_HANDLER_PIXMAP_NONE,
-					 0,
-					 0, 0, providers_config, NULL);
-	
-	bonobo_ui_handler_menu_new_item (uih, "/Tools/Forget Passwords", N_("Forget _Passwords"),
-					 NULL, -1,
-					 BONOBO_UI_HANDLER_PIXMAP_NONE,
-					 0,
-					 0, 0, forget_passwords, NULL);
-	
-	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,
-				   GTK_TOOLBAR_BOTH);
-
-	gnome_app_fill_toolbar_with_data (GTK_TOOLBAR (toolbar),
-					  gnome_toolbar,
-					  NULL, folder_browser);
-
-	gtk_widget_show_all (toolbar);
-
-	toolbar_frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (toolbar_frame), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (toolbar_frame), toolbar);
-	gtk_widget_show (toolbar_frame);
-
-	gtk_widget_show_all (toolbar_frame);
-
-	toolbar_control = bonobo_control_new (toolbar_frame);
-	bonobo_ui_handler_dock_add (uih, toolbar_name,
-				    bonobo_object_corba_objref (BONOBO_OBJECT (toolbar_control)),
-				    GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL,
-				    GNOME_DOCK_TOP,
-				    1, 1, 0);
-	g_free (toolbar_name);
-}
-
-static void
-control_deactivate (BonoboControl *control, BonoboUIHandler *uih,
-		    FolderBrowser *fb)
-{
-	char *toolbar_name = g_strdup_printf ("/Toolbar%d", fb->serial);
-
-	bonobo_ui_handler_menu_remove (uih, "/File/Mail");
-	bonobo_ui_handler_menu_remove (uih, "/Tools/Expunge");
-	bonobo_ui_handler_menu_remove (uih, "/Tools/Filter Druid ...");
-	bonobo_ui_handler_menu_remove (uih, "/Tools/Virtual Folder Druid ...");
-	bonobo_ui_handler_menu_remove (uih, "/Tools/Mail Configuration ...");
-	bonobo_ui_handler_menu_remove (uih, "/Tools/Forget Passwords");
-	bonobo_ui_handler_dock_remove (uih, toolbar_name);
-	g_free (toolbar_name);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     gpointer user_data)
-{
-	BonoboUIHandler  *uih;
-
-	uih = bonobo_control_get_ui_handler (control);
-	g_assert (uih);
-
-	if (activate)
-		control_activate (control, uih, user_data);
-	else
-		control_deactivate (control, uih, user_data);
-}
-
-static void
-control_destroy_cb (BonoboControl *control,
-		    gpointer       user_data)
-{
-	GtkWidget *folder_browser = user_data;
-
-	gtk_object_destroy (GTK_OBJECT (folder_browser));
-}
-
-BonoboControl *
-folder_browser_factory_new_control (const char *uri)
-{
-	BonoboControl *control;
-	GtkWidget *folder_browser;
-
-	folder_browser = folder_browser_new ();
-	if (folder_browser == NULL)
-		return NULL;
-
-	if (!folder_browser_set_uri (FOLDER_BROWSER (folder_browser), uri)) {
-		gtk_object_sink (GTK_OBJECT (folder_browser));
-		return NULL;
-	}
-
-	gtk_widget_show (folder_browser);
-	
-	control = bonobo_control_new (folder_browser);
-	
-	if (control == NULL){
-		gtk_object_destroy (GTK_OBJECT (folder_browser));
-		return NULL;
-	}
-	
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    control_activate_cb, folder_browser);
-
-	gtk_signal_connect (GTK_OBJECT (control), "destroy",
-			    control_destroy_cb, folder_browser);	
-
-	return control;
-}
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
deleted file mode 100644
index 17b7df578c..0000000000
--- a/mail/folder-browser.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * folder-browser.c: Folder browser top level component
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gnome.h>
-#include "e-util/e-util.h"
-#include "e-util/e-sexp.h"
-#include "folder-browser.h"
-#include "mail.h"
-#include "message-list.h"
-#include <widgets/e-paned/e-vpaned.h>
-
-#define PARENT_TYPE (gtk_table_get_type ())
-
-static GtkObjectClass *folder_browser_parent_class;
-
-
-static void
-folder_browser_destroy (GtkObject *object)
-{
-	FolderBrowser *folder_browser = FOLDER_BROWSER (object);
-	
-	if (folder_browser->shell) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		Bonobo_Unknown_unref (folder_browser->shell, &ev);
-		CORBA_exception_free (&ev);
-	}
-	
-	if (folder_browser->uri)
-		g_free (folder_browser->uri);
-
-	if (folder_browser->folder)
-		gtk_object_unref (GTK_OBJECT (folder_browser->folder));
-	
-	if (folder_browser->message_list)
-		bonobo_object_unref (BONOBO_OBJECT (folder_browser->message_list));
-
-	folder_browser_parent_class->destroy (object);
-}
-
-static void
-folder_browser_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = folder_browser_destroy;
-
-	folder_browser_parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static gboolean
-folder_browser_load_folder (FolderBrowser *fb, const char *name)
-{
-	char *store_name, *msg;
-	CamelStore *store;
-	CamelFolder *new_folder = NULL;
-	CamelException *ex;
-
-	ex = camel_exception_new ();
-
-	if (!strncmp (name, "vfolder:", 8)) {
-		char *query, *newquery;
-		store_name = g_strdup (name);
-		query = strchr (store_name, '?');
-		if (query) {
-			*query++ = 0;
-		} else {
-			query = "";
-		}
-		newquery = g_strdup_printf("mbox?%s", query);
-		store = camel_session_get_store (session, store_name, ex);
-
-		if (store) {
-			new_folder = camel_store_get_folder (store, newquery, TRUE, ex);
-			/* FIXME: do this properly rather than hardcoding */
-#warning "Find a way not to hardcode vfolder source"
-			{
-				CamelStore *st;
-				char *stname;
-				CamelFolder *source_folder;
-				extern char *evolution_dir;
-				
-				stname = g_strdup_printf("mbox://%s/local/Inbox", evolution_dir);
-				st = camel_session_get_store (session, stname, ex);
-				g_free (stname);
-				if (st) {
-					source_folder = camel_store_get_folder (st, "mbox", FALSE, ex);
-					if (source_folder) {
-						camel_vee_folder_add_folder (new_folder, source_folder);
-					}
-				}
-			}
-		}
-		g_free (newquery);
-		g_free (store_name);
-
-	} else if (!strncmp (name, "imap:", 5)) {
-		char *service, *ptr;
-		
-		fprintf (stderr, "\n****** name = %s ******\n", name);
-		service = g_strdup_printf ("%s/", name);
-		for (ptr = service + 7; *ptr && *ptr != '/'; ptr++);
-		ptr++;
-		*ptr = '\0';
-		fprintf (stderr, "****** service = %s ******\n", service);
-		store = camel_session_get_store (session, service, ex);
-		g_free (service);
-		if (store) {
-			CamelURL *url = CAMEL_SERVICE (store)->url;
-			char *folder_name;
-
-			for (ptr = (char *)(name + 7); *ptr && *ptr != '/'; ptr++);
-			if (*ptr == '/') {
-				if (url && url->path) {
-					fprintf (stderr, "namespace = %s\n", url->path + 1);
-					ptr += strlen (url->path) + 1;
-				}
-
-				if (*ptr == '/')
-					ptr++;
-				/*for ( ; *ptr && *ptr == '/'; ptr++);*/
-
-				folder_name = g_strdup (ptr);
-				
-				fprintf (stderr, "getting folder: %s\n", folder_name);
-				new_folder = camel_store_get_folder (store, folder_name, TRUE, ex);
-				g_free (folder_name);
-			}
-		}
-	} else if (!strncmp(name, "news:", 5)) {
-		store = camel_session_get_store (session, name, ex);
-		if (store) {
-			const char *folder_name;
-
-			folder_name = name + 5;
-
-			new_folder = camel_store_get_folder (store, folder_name, FALSE, ex);
-		}
-	} else if (!strncmp (name, "file:", 5)) {
-		/* Change "file:" to "mbox:". */
-		store_name = g_strdup_printf ("mbox:%s", name + 5);
-		store = camel_session_get_store (session, store_name, ex);
-		g_free (store_name);
-		if (store) {
-			new_folder = camel_store_get_folder (store, "mbox", FALSE, ex);
-		}
-	} else {
-		char *msg;
-
-		msg = g_strdup_printf ("Can't open URI %s", name);
-		gnome_error_dialog (msg);
-		g_free (msg);
-		camel_exception_free (ex);
-		return FALSE;
-	}
-	
-	if (store)
-		gtk_object_unref (GTK_OBJECT (store));
-
-	if (camel_exception_get_id (ex)) {
-		msg = g_strdup_printf ("Unable to get folder %s: %s\n", name,
-				       camel_exception_get_description (ex));
-		gnome_error_dialog (msg);
-		camel_exception_free (ex);
-		if (new_folder)
-			gtk_object_unref(GTK_OBJECT (new_folder));
-		return FALSE;
-	}
-	
-	if (fb->folder)
-		gtk_object_unref (GTK_OBJECT (fb->folder));
-	
-	fb->folder = new_folder;
-	
-	message_list_set_folder (fb->message_list, new_folder);
-
-	return TRUE;
-}
-
-#define EQUAL(a,b) (strcmp (a,b) == 0)
-
-gboolean
-folder_browser_set_uri (FolderBrowser *folder_browser, const char *uri)
-{
-	if (folder_browser->uri)
-		g_free (folder_browser->uri);
-
-	folder_browser->uri = g_strdup (uri);
-	return folder_browser_load_folder (folder_browser, folder_browser->uri);
-}
-
-void
-folder_browser_set_message_preview (FolderBrowser *folder_browser, gboolean show_message_preview)
-{
-	if (folder_browser->preview_shown == show_message_preview)
-		return;
-
-	g_warning ("FIXME: implement me");
-}
-
-static char * search_options[] = {
-	"Body or subject contains",
-	"Body contains",
-	"Subject contains",
-	"Body does not contain",
-	"Subject does not contain",
-	NULL
-};
-
-/* %s is replaced by the whole search string in quotes ...
-   possibly could split the search string into words as well ? */
-static char * search_string[] = {
-	"(or (body-contains %s) (match-all (header-contains \"Subject\" %s)))",
-	"(body-contains %s)",
-	"(match-all (header-contains \"Subject\" %s)",
-	"(match-all (not (body-contains %s)))",
-	"(match-all (not (header-contains \"Subject\" %s)))"
-};
-
-static void
-search_set(FolderBrowser *fb)
-{
-	GtkWidget *widget;
-	GString *out;
-	char *str;
-	int index;
-	char *text;
-
-	text = gtk_entry_get_text((GtkEntry *)fb->search_entry);
-
-	if (text == NULL || text[0] == 0) {
-		message_list_set_search (fb->message_list, NULL);
-		return;
-	}
-
-	widget = gtk_menu_get_active (GTK_MENU(GTK_OPTION_MENU(fb->search_menu)->menu));
-	index = (int)gtk_object_get_data((GtkObject *)widget, "search_option");
-	if (index > sizeof(search_string)/sizeof(search_string[0]))
-		index = 0;
-	str = search_string[index];
-
-	out = g_string_new("");
-	while (*str) {
-		if (str[0] == '%' && str[1]=='s') {
-			str+=2;
-			e_sexp_encode_string(out, text);
-		} else {
-			g_string_append_c(out, *str);
-			str++;
-		}
-	}
-	message_list_set_search (fb->message_list, out->str);
-	g_string_free(out, TRUE);
-}
-
-static void
-search_menu_deactivate(GtkWidget *menu, FolderBrowser *fb)
-{
-	search_set(fb);
-}
-
-static GtkWidget *
-create_option_menu (char **menu_list, int item, void *data)
-{
-	GtkWidget *omenu;
-	GtkWidget *menu;
-	int i = 0;
-       
-	omenu = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-	while (*menu_list){
-		GtkWidget *entry;
-
-		entry = gtk_menu_item_new_with_label (*menu_list);
-		gtk_widget_show (entry);
-		gtk_object_set_data((GtkObject *)entry, "search_option", (void *)i);
-		gtk_menu_append (GTK_MENU (menu), entry);
-		menu_list++;
-		i++;
-	}
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), item);
-	gtk_widget_show (omenu);
-
-	gtk_signal_connect (GTK_OBJECT (menu), 
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (search_menu_deactivate), data);
-
-	return omenu;
-}
-
-static void
-search_activate(GtkEntry *entry, FolderBrowser *fb)
-{
-	search_set(fb);
-}
-
-void
-folder_browser_clear_search (FolderBrowser *fb)
-{
-	gtk_entry_set_text (GTK_ENTRY (fb->search_entry), "");
-	gtk_option_menu_set_history (GTK_OPTION_MENU (fb->search_menu), 0);
-	message_list_set_search (fb->message_list, NULL);
-}
-
-static int
-etable_key (ETable *table, int row, int col, GdkEvent *ev, FolderBrowser *fb)
-{
-	if (ev->key.state != 0)
-		return FALSE;
-
-	if (ev->key.keyval == GDK_space || ev->key.keyval == GDK_BackSpace) {
-		GtkAdjustment *vadj;
-
-		vadj = e_scroll_frame_get_vadjustment (fb->mail_display->scroll);
-		if (ev->key.keyval == GDK_BackSpace) {
-			if (vadj->value > vadj->lower + vadj->page_size)
-				vadj->value -= vadj->page_size;
-			else
-				vadj->value = vadj->lower;
-		} else {
-			if (vadj->value < vadj->upper - 2 * vadj->page_size)
-				vadj->value += vadj->page_size;
-			else
-				vadj->value = vadj->upper - vadj->page_size;
-		}
-
-		gtk_adjustment_value_changed (vadj);
-		return TRUE;
-	} else if (ev->key.keyval == GDK_Delete ||
-		   ev->key.keyval == GDK_KP_Delete) {
-		delete_msg (NULL, fb);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-folder_browser_gui_init (FolderBrowser *fb)
-{
-	GtkWidget *hbox, *label;
-
-	/*
-	 * The panned container
-	 */
-	fb->vpaned = e_vpaned_new ();
-	gtk_widget_show (fb->vpaned);
-
-	gtk_table_attach (
-		GTK_TABLE (fb), fb->vpaned,
-		0, 1, 1, 3,
-		GTK_FILL | GTK_EXPAND,
-		GTK_FILL | GTK_EXPAND,
-		0, 0);
-
-	/* quick-search entry */
-	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_widget_show(hbox);
-	fb->search_entry = gtk_entry_new();
-	gtk_widget_show(fb->search_entry);
-	gtk_signal_connect(GTK_OBJECT (fb->search_entry), "activate", search_activate, fb);
-	/* gtk_signal_connect(fb->search_entry, "changed", search_activate, fb); */
-	label = gtk_label_new("Search");
-	gtk_widget_show(label);
-	fb->search_menu = create_option_menu(search_options, 0, fb);
-	gtk_box_pack_end((GtkBox *)hbox, fb->search_entry, FALSE, FALSE, 3);
-	gtk_box_pack_end((GtkBox *)hbox, fb->search_menu, FALSE, FALSE, 3);
-	gtk_box_pack_end((GtkBox *)hbox, label, FALSE, FALSE, 3);
-	gtk_table_attach (
-		GTK_TABLE (fb), hbox,
-		0, 1, 0, 1,
-		GTK_FILL | GTK_EXPAND,
-		0,
-		0, 0);
-
-	fb->message_list_w = message_list_get_widget (fb->message_list);
-	e_paned_add1 (E_PANED (fb->vpaned), fb->message_list_w);
-	gtk_widget_show (fb->message_list_w);
-
-	e_paned_add2 (E_PANED (fb->vpaned), GTK_WIDGET (fb->mail_display));
-	e_paned_set_position (E_PANED (fb->vpaned), 200);
-
-	gtk_widget_show (GTK_WIDGET (fb->mail_display));
-	gtk_widget_show (GTK_WIDGET (fb));
-
-}
-
-static void
-folder_browser_init (GtkObject *object)
-{
-}
-
-static void
-my_folder_browser_init (GtkObject *object)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (object);
-
-	/*
-	 * Setup parent class fields.
-	 */ 
-	GTK_TABLE (fb)->homogeneous = FALSE;
-	gtk_table_resize (GTK_TABLE (fb), 1, 2);
-
-	/*
-	 * Our instance data
-	 */
-	fb->message_list = MESSAGE_LIST (message_list_new (fb));
-	fb->mail_display = MAIL_DISPLAY (mail_display_new (fb));
-
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->etable),
-			    "key_press", GTK_SIGNAL_FUNC (etable_key), fb);
-
-	folder_browser_gui_init (fb);
-}
-
-GtkWidget *
-folder_browser_new (void)
-{
-	static int serial;
-	FolderBrowser *folder_browser = gtk_type_new (folder_browser_get_type ());
-
-	my_folder_browser_init (GTK_OBJECT (folder_browser));
-	folder_browser->uri = NULL;
-	folder_browser->serial = serial++;
-
-	return GTK_WIDGET (folder_browser);
-}
-
-
-E_MAKE_TYPE (folder_browser, "FolderBrowser", FolderBrowser, folder_browser_class_init, folder_browser_init, PARENT_TYPE);
-
-
-
-
diff --git a/mail/folder-browser.h b/mail/folder-browser.h
deleted file mode 100644
index ae16b64153..0000000000
--- a/mail/folder-browser.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-
-#ifndef _FOLDER_BROWSER_H_
-#define _FOLDER_BROWSER_H_
-
-#include "mail-types.h"
-#include <gtk/gtktable.h>
-#include "camel/camel-stream.h"
-#include <bonobo/bonobo-property-bag.h>
-#include "message-list.h"
-#include "mail-display.h"
-#include "shell/Evolution.h"
-
-
-#define FOLDER_BROWSER_TYPE        (folder_browser_get_type ())
-#define FOLDER_BROWSER(o)          (GTK_CHECK_CAST ((o), FOLDER_BROWSER_TYPE, FolderBrowser))
-#define FOLDER_BROWSER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), FOLDER_BROWSER_TYPE, FolderBrowserClass))
-#define IS_FOLDER_BROWSER(o)       (GTK_CHECK_TYPE ((o), FOLDER_BROWSER_TYPE))
-#define IS_FOLDER_BROWSER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), FOLDER_BROWSER_TYPE))
-
-
-struct  _FolderBrowser {
-	GtkTable parent;
-
-	BonoboPropertyBag *properties;
-
-	Evolution_Shell shell;
-
-	/* This is a kludge for the toolbar problem. */
-	int serial;
-
-	/*
-	 * The current URI being displayed by the FolderBrowser
-	 */
-	char        *uri;
-	CamelFolder *folder;
-	
-	MessageList *message_list;
-	GtkWidget   *message_list_w;
-	MailDisplay *mail_display;
-	GtkWidget   *vpaned;
-	GtkWidget   *search_menu;
-	GtkWidget   *search_entry;
-
-	gboolean     preview_shown;
-
-};
-
-
-typedef struct {
-	GtkTableClass parent_class;
-} FolderBrowserClass;
-
-
-
-
-GtkType        folder_browser_get_type (void);
-GtkWidget     *folder_browser_new      (void);
-gboolean       folder_browser_set_uri  (FolderBrowser *folder_browser,
-					const char *uri);
-void           folder_browser_set_message_preview (FolderBrowser *folder_browser,
-						   gboolean show_message_preview);
-void           folder_browser_clear_search (FolderBrowser *fb);
-
-#endif /* _FOLDER_BROWSER_H_ */
diff --git a/mail/mail-config.c b/mail/mail-config.c
deleted file mode 100644
index 56ed19824a..0000000000
--- a/mail/mail-config.c
+++ /dev/null
@@ -1,2129 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-config.c: Mail configuration dialogs/wizard. */
-
-/* 
- * Authors: 
- *  Dan Winship <danw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-#include <config.h>
-#include <pwd.h>
-
-#include <gnome.h>
-#include <gtkhtml/gtkhtml.h>
-
-#include "mail.h"
-#include "e-util/e-html-utils.h"
-#include "e-util/e-setup.h"
-
-struct service_type {
-	CamelProvider *provider;
-	CamelService *service;
-	GList *authtypes;
-};
-
-struct identity_record {
-	char *name, *address, *organization, *sigfile;
-};
-
-static char *username = NULL;
-
-/* private prototypes - these are ugly, rename some of them? */
-static void html_size_req (GtkWidget *widget, GtkRequisition *requisition);
-static GtkWidget *html_new (gboolean white);
-static void put_html (GtkHTML *html, char *text);
-static void error_dialog (GtkWidget *parent_finder, const char *fmt, ...);
-static void identity_note_doneness (GtkObject *page, gpointer user_data);
-static void prepare_identity (GnomeDruidPage *page, gpointer arg1, gpointer user_data);
-static gboolean identity_next (GnomeDruidPage *page, gpointer arg1, gpointer user_data);
-static void destroy_identity (GtkObject *table, gpointer idrecp);
-static void create_identity_page (GtkWidget *vbox, struct identity_record *idrec);
-static void service_note_doneness (GtkObject *page, gpointer user_data);
-static void prepare_service (GnomeDruidPage *page, gpointer arg1, gpointer user_data);
-static void auth_menuitem_activate (GtkObject *menuitem, GtkHTML *html);
-static void fill_auth_menu (GtkOptionMenu *optionmenu, GtkHTML *html, GList *authtypes);
-static char *get_service_url (GtkObject *table);
-static void set_service_url (GtkObject *table, char *url_str);
-static void autodetect_cb (GtkWidget *button, GtkObject *table);
-static gboolean service_acceptable (GtkNotebook *notebook);
-static gboolean service_next (GnomeDruidPage *page, gpointer arg1, gpointer user_data);
-static void destroy_service (GtkObject *notebook, gpointer urlp);
-static void add_row (GtkWidget *table, int row, const char *label_text, const char *tag, int flag);
-static GtkWidget *create_source (struct service_type *st);
-static GtkWidget *create_transport (struct service_type *st);
-static void stype_menuitem_activate (GtkObject *menuitem, GtkObject *table);
-static void create_service_page (GtkWidget *vbox, const char *label_text, GList *services,
-				 GtkWidget *(*create_service)(struct service_type *),
-				 char **urlp);
-static void create_source_page (GtkWidget *vbox, GList *sources, char **urlp);
-static void create_transport_page (GtkWidget *vbox, GList *transports, char **urlp);
-static GList *add_service (GList *services, CamelProviderType type, CamelProvider *prov);
-static GdkImlibImage *load_image (const char *name);
-static void prepare_first (GnomeDruidPage *page, GnomeDruid *druid, gpointer user_data);
-static void cancel (GnomeDruid *druid, gpointer window);
-static void finish (GnomeDruidPage *page, gpointer arg1, gpointer window);
-static void on_cmdIdentityAdd_clicked (GtkWidget *widget, gpointer user_data);
-static void on_cmdIdentityEdit_clicked (GtkWidget *widget, gpointer user_data);
-static void on_cmdIdentityDelete_clicked (GtkWidget *widget, gpointer user_data);
-static void on_cmdSourcesAdd_clicked (GtkWidget *widget, gpointer user_data);
-static void on_cmdSourcesEdit_clicked (GtkWidget *widget, gpointer user_data);
-static void on_cmdSourcesDelete_clicked (GtkWidget *widget, gpointer user_data);
-static void on_cmdCamelServicesOK_clicked (GtkButton *button, gpointer user_data);
-static void on_cmdCamelServicesCancel_clicked (GtkButton *button, gpointer user_data);
-
-
-
-/* HTML Helpers */
-
-static void
-html_size_req (GtkWidget *widget, GtkRequisition *requisition)
-{
-	requisition->height = GTK_LAYOUT (widget)->height;
-}
-
-/* Returns a GtkHTML which is already inside a GtkScrolledWindow. If
- * @white is TRUE, the GtkScrolledWindow will be inside a GtkFrame.
- */
-static GtkWidget *
-html_new (gboolean white)
-{
-	GtkWidget *html, *scrolled, *frame;
-	GtkStyle *style;
-
-	html = gtk_html_new ();
-	GTK_LAYOUT (html)->height = 0;
-	gtk_signal_connect (GTK_OBJECT (html), "size_request",
-			    GTK_SIGNAL_FUNC (html_size_req), NULL);
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	style = gtk_rc_get_style (html);
-	if (style) {
-		gtk_html_set_default_background_color (GTK_HTML (html),
-						       white ? &style->white :
-						       &style->bg[0]);
-	}
-	gtk_widget_set_sensitive (html, FALSE);
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_NEVER);
-	gtk_container_add (GTK_CONTAINER (scrolled), html);
-
-	if (white) {
-		frame = gtk_frame_new (NULL);
-		gtk_frame_set_shadow_type (GTK_FRAME (frame),
-					   GTK_SHADOW_ETCHED_IN);
-		gtk_container_add (GTK_CONTAINER (frame), scrolled);
-		gtk_widget_show_all (frame);
-	} else
-		gtk_widget_show_all (scrolled);
-
-	return html;
-}
-
-static void
-put_html (GtkHTML *html, char *text)
-{
-	GtkHTMLStream *handle;
-
-	text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL);
-	handle = gtk_html_begin (html);
-	gtk_html_write (html, handle, "<HTML><BODY>", 12);
-	gtk_html_write (html, handle, text, strlen (text));
-	gtk_html_write (html, handle, "</BODY></HTML>", 14);
-	g_free (text);
-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-}
-
-
-/* Error helper */
-static void
-error_dialog (GtkWidget *parent_finder, const char *fmt, ...)
-{
-	GtkWidget *parent, *dialog;
-	char *msg;
-	va_list ap;
-
-	parent = gtk_widget_get_ancestor (parent_finder, GTK_TYPE_WINDOW);
-
-	ap = va_start (ap, fmt);
-	msg = g_strdup_vprintf (fmt, ap);
-	va_end (ap);
-
-	dialog = gnome_error_dialog_parented (msg, GTK_WINDOW (parent));
-	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	g_free (msg);
-}
-
-
-/* Identity page */
-
-static void
-identity_note_doneness (GtkObject *page, gpointer user_data)
-{
-	GtkWidget *exit_button;
-	GtkEntry *entry;
-	char *data;
-
-	if (!(exit_button = gtk_object_get_data (page, "exit_button")))
-		exit_button = gtk_object_get_data (page, "ok_button");
-
-	entry = gtk_object_get_data (page, "name");
-	data = gtk_entry_get_text (entry);
-	if (data && *data) {
-		entry = gtk_object_get_data (page, "addr");
-		data = gtk_entry_get_text (entry);
-	}
-
-	gtk_widget_set_sensitive (exit_button, data && *data);
-}
-
-static void
-prepare_identity (GnomeDruidPage *page, gpointer arg1, gpointer user_data)
-{
-	identity_note_doneness (user_data, NULL);
-}
-
-static gboolean
-identity_next (GnomeDruidPage *page, gpointer arg1, gpointer user_data)
-{
-	GtkObject *box = user_data;
-	GtkEntry *addr = gtk_object_get_data (box, "addr");
-	char *data, *at;
-
-	/* FIXME: we need more sanity checking than this. */
-
-	data = gtk_entry_get_text (addr);
-	at = strchr (data, '@');
-	if (!at || !strchr (at + 1, '.')) {
-		error_dialog (GTK_WIDGET (page), "Email address must be "
-			      "of the form \"user@domain\".");
-		return TRUE;
-	}
-
-	g_free (username);
-	username = g_strndup (data, at - data);
-
-	return FALSE;
-}
-
-static void
-destroy_identity (GtkObject *table, gpointer idrecp)
-{
-	struct identity_record *idrec = idrecp;
-	GtkWidget *entry;
-
-	entry = gtk_object_get_data (table, "name");
-	idrec->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-
-	entry = gtk_object_get_data (table, "addr");
-	idrec->address = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-
-	entry = gtk_object_get_data (table, "org");
-	idrec->organization = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-
-	entry = gtk_object_get_data (table, "sig");
-	idrec->sigfile = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-}
-
-static void
-create_identity_page (GtkWidget *vbox, struct identity_record *idrec)
-{
-	GtkWidget *html, *table;
-	GtkWidget *name, *addr, *org, *sig;
-	GtkWidget *name_entry, *addr_entry, *org_entry, *sig_entry;
-	GtkWidget *hsep;
-	char *user;
-	struct passwd *pw = NULL;
-
-	html = html_new (FALSE);
-	put_html (GTK_HTML (html),
-		  _("Enter your name and email address to be used in "
-		    "outgoing mail. You may also, optionally, enter the "
-		    "name of your organization, and the name of a file "
-		    "to read your signature from."));
-	gtk_box_pack_start (GTK_BOX (vbox), html->parent, FALSE, TRUE, 0);
-
-	table = gtk_table_new (5, 2, FALSE);
-	gtk_widget_set_name (table, "table");
-	gtk_table_set_row_spacings (GTK_TABLE (table), 10);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-	gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
-	gtk_signal_connect (GTK_OBJECT (vbox), "destroy",
-			    GTK_SIGNAL_FUNC (destroy_identity), idrec);
-
-	name = gtk_label_new (_("Full name:"));
-	gtk_table_attach (GTK_TABLE (table), name, 0, 1, 0, 1,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (name), 1, 0.5);
-
-	name_entry = gtk_entry_new ();
-	gtk_table_attach (GTK_TABLE (table), name_entry, 1, 2, 0, 1,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_object_set_data (GTK_OBJECT (vbox), "name", name_entry);
-
-	if (!idrec || !idrec->name) {
-		user = getenv ("USER");
-		if (user)
-			pw = getpwnam (user);
-		else
-			pw = getpwuid (getuid ());
-	}
-	if ((idrec && idrec->name) || (pw && pw->pw_gecos && *pw->pw_gecos)) {
-		char *name;
-
-		if (idrec && idrec->name)
-			name = g_strdup (idrec->name);
-		else
-			name = g_strndup (pw->pw_gecos, strcspn (pw->pw_gecos, ","));
-		gtk_entry_set_text (GTK_ENTRY (name_entry), name);
-		g_free (name);
-	}
-
-	addr = gtk_label_new (_("Email address:"));
-	gtk_table_attach (GTK_TABLE (table), addr, 0, 1, 1, 2,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (addr), 1, 0.5);
-
-	addr_entry = gtk_entry_new ();
-	if (idrec && idrec->address)
-		gtk_entry_set_text (GTK_ENTRY (addr_entry), idrec->address);
-	gtk_table_attach (GTK_TABLE (table), addr_entry, 1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_object_set_data (GTK_OBJECT (vbox), "addr", addr_entry);
-
-	gtk_signal_connect_object (GTK_OBJECT (name_entry), "changed",
-				   GTK_SIGNAL_FUNC (identity_note_doneness),
-				   GTK_OBJECT (vbox));
-	gtk_signal_connect_object (GTK_OBJECT (addr_entry), "changed",
-				   GTK_SIGNAL_FUNC (identity_note_doneness),
-				   GTK_OBJECT (vbox));
-
-	hsep = gtk_hseparator_new ();
-	gtk_table_attach (GTK_TABLE (table), hsep, 0, 2, 2, 3,
-			  GTK_FILL, 0, 0, 8);
-
-	org = gtk_label_new (_("Organization:"));
-	gtk_table_attach (GTK_TABLE (table), org, 0, 1, 3, 4,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (org), 1, 0.5);
-
-	org_entry = gtk_entry_new ();
-	if (idrec && idrec->organization)
-		gtk_entry_set_text (GTK_ENTRY (org_entry), idrec->organization);
-	gtk_table_attach (GTK_TABLE (table), org_entry, 1, 2, 3, 4,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_object_set_data (GTK_OBJECT (vbox), "org", org_entry);
-
-	sig = gtk_label_new (_("Signature file:"));
-	gtk_table_attach (GTK_TABLE (table), sig, 0, 1, 4, 5,
-			  GTK_FILL, GTK_FILL, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (sig), 1, 0);
-
-	sig_entry = gnome_file_entry_new (NULL, _("Signature File"));
-	if (idrec && idrec->sigfile)
-		gtk_entry_set_text (GTK_ENTRY (sig_entry), idrec->sigfile);
-	gtk_table_attach (GTK_TABLE (table), sig_entry, 1, 2, 4, 5,
-			  GTK_FILL, 0, 0, 0);
-	gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sig_entry),
-					   g_get_home_dir ());
-	gtk_object_set_data (GTK_OBJECT (vbox), "sig",
-			     gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (sig_entry)));
-
-	gtk_widget_show_all (table);
-}
-
-
-/* Source/Transport pages */
-
-static void
-service_note_doneness (GtkObject *page, gpointer user_data)
-{
-	GtkObject *box;
-	GtkWidget *button;
-	GtkEntry *entry;
-	char *data;
-	gboolean sensitive = TRUE;
-
-	entry = gtk_object_get_data (page, "server_entry");
-	if (entry) {
-		data = gtk_entry_get_text (entry);
-		if (!data || !*data)
-			sensitive = FALSE;
-	}
-
-	if (sensitive) {
-		entry = gtk_object_get_data (page, "user_entry");
-		if (entry) {
-			data = gtk_entry_get_text (entry);
-			if (!data || !*data)
-				sensitive = FALSE;
-		}
-	}
-
-	if (sensitive) {
-		entry = gtk_object_get_data (page, "path_entry");
-		if (entry) {
-			data = gtk_entry_get_text (entry);
-			if (!data || !*data)
-				sensitive = FALSE;
-		}
-	}
-
-	button = gtk_object_get_data (page, "autodetect");
-	if (button)
-		gtk_widget_set_sensitive (button, sensitive);
-
-	box = gtk_object_get_data (page, "box");
-	
-	if (!(button = gtk_object_get_data (box, "exit_button")))
-		button = gtk_object_get_data (box, "ok_button");
-
-	if (button)
-		gtk_widget_set_sensitive (button, sensitive);
-}
-
-static void
-prepare_service (GnomeDruidPage *page, gpointer arg1, gpointer user_data)
-{
-	GtkObject *box = user_data;
-	GtkNotebook *notebook = gtk_object_get_data (box, "notebook");
-	GtkWidget *table;
-	GtkEntry *entry;
-
-	table = gtk_notebook_get_nth_page (notebook,
-					   gtk_notebook_get_current_page (notebook));
-
-	if (username) {
-		char *data = NULL;
-
-		entry = gtk_object_get_data (GTK_OBJECT (table), "user_entry");
-		if (entry) {
-			data = gtk_entry_get_text (entry);
-			if (!data || !*data)
-				gtk_entry_set_text (entry, username);
-		}
-	}
-
-	service_note_doneness (GTK_OBJECT (table), NULL);
-}
-
-static void
-auth_menuitem_activate (GtkObject *menuitem, GtkHTML *html)
-{
-	CamelServiceAuthType *authtype;
-
-	authtype = gtk_object_get_data (menuitem, "authtype");
-	put_html (html, authtype->description);
-}
-
-static void
-fill_auth_menu (GtkOptionMenu *optionmenu, GtkHTML *html, GList *authtypes)
-{
-	CamelServiceAuthType *authtype;
-	GtkWidget *menu, *item, *firstitem = NULL;
-
-	menu = gtk_menu_new ();
-	gtk_option_menu_set_menu (optionmenu, menu);
-	for (; authtypes; authtypes = authtypes->next) {
-		authtype = authtypes->data;
-		item = gtk_menu_item_new_with_label (_(authtype->name));
-		if (!firstitem)
-			firstitem = item;
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_object_set_data (GTK_OBJECT (item), "authtype", authtype);
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (auth_menuitem_activate),
-				    html);
-	}
-	gtk_widget_show_all (menu);
-	gtk_option_menu_set_history (optionmenu, 0);
-	if (firstitem)
-		auth_menuitem_activate (GTK_OBJECT (firstitem), html);
-}
-
-static char *
-get_service_url (GtkObject *table)
-{
-	CamelURL *url;
-	GtkEditable *editable;
-	GtkOptionMenu *auth_optionmenu;
-	char *url_str;
-
-	url = g_new0 (CamelURL, 1);
-	url->protocol = g_strdup (gtk_object_get_data (table, "protocol"));
-	editable = gtk_object_get_data (table, "user_entry");
-	if (editable)
-		url->user = gtk_editable_get_chars (editable, 0, -1);
-	editable = gtk_object_get_data (table, "server_entry");
-	if (editable)
-		url->host = gtk_editable_get_chars (editable, 0, -1);
-	editable = gtk_object_get_data (table, "path_entry");
-	if (editable)
-		url->path = gtk_editable_get_chars (editable, 0, -1);
-
-	auth_optionmenu = gtk_object_get_data (table, "auth_optionmenu");
-	if (auth_optionmenu) {
-		GtkWidget *menu, *item;
-		CamelServiceAuthType *authtype;
-
-		menu = gtk_option_menu_get_menu (auth_optionmenu);
-		if (menu) {
-			item = gtk_menu_get_active (GTK_MENU (menu));
-			authtype = gtk_object_get_data (GTK_OBJECT (item),
-							"authtype");
-			if (*authtype->authproto)
-				url->authmech = g_strdup (authtype->authproto);
-		}
-	}
-
-	url_str = camel_url_to_string (url, FALSE);
-	camel_url_free (url);
-	return url_str;
-}
-
-static void
-set_service_url (GtkObject *table, char *url_str)
-{
-	CamelURL *url;
-	GtkEditable *editable;
-	GtkOptionMenu *auth_optionmenu;
-	CamelException *ex;
-
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (url_str != NULL);
-
-	ex = camel_exception_new ();
-	
-	url = camel_url_new (url_str, ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		camel_exception_free (ex);
-		return;
-	}
-
-	editable = gtk_object_get_data (table, "user_entry");
-	if (editable && url)
-		gtk_entry_set_text (GTK_ENTRY (editable), url->user);
-
-	editable = gtk_object_get_data (table, "server_entry");
-	if (editable && url)
-		gtk_entry_set_text (GTK_ENTRY (editable), url->host);
-
-	editable = gtk_object_get_data (table, "path_entry");
-	if (editable && url)
-		gtk_entry_set_text (GTK_ENTRY (editable), url->path);
-
-        /* How are we gonna do this? */
-	auth_optionmenu = gtk_object_get_data (table, "auth_optionmenu");
-	if (auth_optionmenu) {
-#if 0
-		GtkWidget *menu, *item;
-		CamelServiceAuthType *authtype;
-
-		menu = gtk_option_menu_get_menu (auth_optionmenu);
-		if (menu) {
-			item = gtk_menu_get_active (GTK_MENU (menu));
-			authtype = gtk_object_get_data (GTK_OBJECT (item),
-							"authtype");
-			if (*authtype->authproto)
-				url->authmech = g_strdup (authtype->authproto);
-		}
-#endif
-	}
-
-	camel_exception_free (ex);
-	camel_url_free (url);
-}
-
-static void
-autodetect_cb (GtkWidget *button, GtkObject *table)
-{
-	char *url;
-	CamelException *ex;
-	CamelService *service;
-	GList *authtypes;
-	GtkHTML *html;
-	GtkOptionMenu *optionmenu;
-	int type;
-
-	type = GPOINTER_TO_UINT (gtk_object_get_data (table, "service_type"));
-	url = get_service_url (table);
-
-	ex = camel_exception_new ();
-	service = camel_session_get_service (session, url, type, ex);
-	g_free (url);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)
-		goto error;
-
-	authtypes = camel_service_query_auth_types (service, ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)
-		goto error;
-
-	html = gtk_object_get_data (table, "auth_html");
-	optionmenu = gtk_object_get_data (table, "auth_optionmenu");
-	fill_auth_menu (optionmenu, html, authtypes);
-	camel_exception_free (ex);
-	return;
-
- error:
-	error_dialog (button, "Could not detect supported authentication "
-		      "types:\n%s", camel_exception_get_description (ex));
-	camel_exception_free (ex);
-}
-
-static gboolean
-service_acceptable (GtkNotebook *notebook)
-{
-	char *url;
-	GtkWidget *table;
-	GtkToggleButton *check;
-	int page, type;
-	CamelService *service;
-	CamelException *ex;
-	gboolean ok;
-
-	page = gtk_notebook_get_current_page (notebook);
-	table = gtk_notebook_get_nth_page (notebook, page);
-	check = gtk_object_get_data (GTK_OBJECT (table), "check");
-
-	if (!check || !gtk_toggle_button_get_active (check))
-		return TRUE;
-
-	type = GPOINTER_TO_UINT (gtk_object_get_data (GTK_OBJECT (table),
-						      "service_type"));
-	url = get_service_url (GTK_OBJECT (table));
-
-	ex = camel_exception_new ();
-	camel_exception_clear (ex);
-	service = camel_session_get_service (session, url, type, ex);
-	g_free (url);
-
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)
-		goto error;
-
-	ok = camel_service_connect (service, ex);
-
-	if (ok) {
-		camel_service_disconnect (service, ex);
-		gtk_object_unref (GTK_OBJECT (service));
-		camel_exception_free (ex);
-		return TRUE;
-	}
-
-	gtk_object_unref (GTK_OBJECT (service));
-
- error:
-	error_dialog (GTK_WIDGET (notebook), camel_exception_get_description (ex));
-	camel_exception_free (ex);
-	return FALSE;
-}
-
-static gboolean
-service_next (GnomeDruidPage *page, gpointer arg1, gpointer user_data)
-{
-	return !service_acceptable (user_data);
-}
-
-static void
-destroy_service (GtkObject *notebook, gpointer urlp)
-{
-	char **url = urlp;
-	GtkWidget *table;
-	int page;
-
-	page = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
-	table = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), page);
-	*url = get_service_url (GTK_OBJECT (table));
-}
-
-static void
-add_row (GtkWidget *table, int row, const char *label_text,
-	 const char *tag, int flag)
-{
-	GtkWidget *label, *entry;
-
-	label = gtk_label_new (label_text);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-	entry = gtk_entry_new ();
-	gtk_table_attach (GTK_TABLE (table), entry, 1, 3, row, row + 1,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_signal_connect_object (GTK_OBJECT (entry), "changed",
-				   GTK_SIGNAL_FUNC (service_note_doneness),
-				   GTK_OBJECT (table));
-	gtk_object_set_data (GTK_OBJECT (table), tag, entry);
-}
-
-static GtkWidget *
-create_source (struct service_type *st)
-{
-	GtkWidget *table;
-	GtkWidget *auth, *auth_optionmenu, *auth_html;
-	GtkWidget *autodetect;
-	int row, service_flags;
-
-	table = gtk_table_new (5, 3, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-	gtk_object_set_data (GTK_OBJECT (table), "protocol",
-			     st->provider->protocol);
-	gtk_object_set_data (GTK_OBJECT (table), "service_type",
-			     GUINT_TO_POINTER (CAMEL_PROVIDER_STORE));
-
-	row = 0;
-	service_flags = st->service->url_flags & ~CAMEL_SERVICE_URL_NEED_AUTH;
-
-	if (service_flags & CAMEL_SERVICE_URL_NEED_HOST) {
-		add_row (table, row, _("Server:"), "server_entry",
-			 CAMEL_SERVICE_URL_NEED_HOST);
-		row++;
-	}
-
-	if (service_flags & CAMEL_SERVICE_URL_NEED_USER) {
-		add_row (table, row, _("Username:"), "user_entry",
-			 CAMEL_SERVICE_URL_NEED_USER);
-		row++;
-	}
-
-	if (service_flags & CAMEL_SERVICE_URL_NEED_PATH) {
-		add_row (table, row, _("Path:"), "path_entry",
-			 CAMEL_SERVICE_URL_NEED_PATH);
-		row++;
-	}
-
-	if (st->authtypes) {
-		auth = gtk_label_new (_("Authentication:"));
-		gtk_table_attach (GTK_TABLE (table), auth, 0, 1,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-		gtk_misc_set_alignment (GTK_MISC (auth), 1, 0.5);
-
-		auth_optionmenu = gtk_option_menu_new ();
-		gtk_table_attach (GTK_TABLE (table), auth_optionmenu, 1, 2,
-				  row, row + 1, GTK_FILL | GTK_EXPAND,
-				  0, 0, 0);
-		gtk_object_set_data (GTK_OBJECT (table), "auth_optionmenu",
-				     auth_optionmenu);
-
-		autodetect = gtk_button_new_with_label (_("Detect supported types..."));
-		gtk_table_attach (GTK_TABLE (table), autodetect, 2, 3,
-				  row, row + 1, 0, 0, 0, 0);
-		gtk_widget_set_sensitive (autodetect, FALSE);
-		gtk_signal_connect (GTK_OBJECT (autodetect), "clicked",
-				    GTK_SIGNAL_FUNC (autodetect_cb), table);
-		gtk_object_set_data (GTK_OBJECT (table), "autodetect",
-				     autodetect);
-
-		auth_html = html_new (TRUE);
-		gtk_table_attach (GTK_TABLE (table), auth_html->parent->parent,
-				  0, 3, row + 1, row + 2,
-				  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-		gtk_object_set_data (GTK_OBJECT (table), "auth_html",
-				     auth_html);
-
-		fill_auth_menu (GTK_OPTION_MENU (auth_optionmenu),
-				GTK_HTML (auth_html), st->authtypes);
-
-		row += 2;
-	}
-
-	if (row != 0) {
-		GtkWidget *check;
-
-		check = gtk_check_button_new_with_label (
-			_("Test these values before continuing"));
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
-		gtk_table_attach (GTK_TABLE (table), check, 0, 3,
-				  row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
-		gtk_object_set_data (GTK_OBJECT (table), "check", check);
-		row += 1;
-	}
-
-	gtk_table_resize (GTK_TABLE (table), row, 3);
-	gtk_widget_show_all (table);
-
-	return table;
-}
-
-static GtkWidget *
-create_transport (struct service_type *st)
-{
-	GtkWidget *table;
-	GtkWidget *auth, *auth_optionmenu, *auth_html;
-	GtkWidget *autodetect;
-	int row, service_flags;
-
-	table = gtk_table_new (5, 3, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-	gtk_object_set_data (GTK_OBJECT (table), "protocol",
-			     st->provider->protocol);
-	gtk_object_set_data (GTK_OBJECT (table), "service_type",
-			     GUINT_TO_POINTER (CAMEL_PROVIDER_TRANSPORT));
-
-	row = 0;
-	service_flags = st->service->url_flags & ~CAMEL_SERVICE_URL_NEED_AUTH;
-
-	if (service_flags & CAMEL_SERVICE_URL_NEED_HOST) {
-		add_row (table, row, _("Server:"), "server_entry",
-			 CAMEL_SERVICE_URL_NEED_HOST);
-		row++;
-	}
-
-	if (st->authtypes) {
-		auth = gtk_label_new (_("Authentication:"));
-		gtk_table_attach (GTK_TABLE (table), auth, 0, 1,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-		gtk_misc_set_alignment (GTK_MISC (auth), 1, 0.5);
-
-		auth_optionmenu = gtk_option_menu_new ();
-		gtk_table_attach (GTK_TABLE (table), auth_optionmenu, 1, 2,
-				  row, row + 1, GTK_FILL | GTK_EXPAND,
-				  0, 0, 0);
-		gtk_object_set_data (GTK_OBJECT (table), "auth_optionmenu",
-				     auth_optionmenu);
-
-		autodetect = gtk_button_new_with_label (_("Detect supported types..."));
-		gtk_table_attach (GTK_TABLE (table), autodetect, 2, 3,
-				  row, row + 1, 0, 0, 0, 0);
-		gtk_widget_set_sensitive (autodetect, FALSE);
-		gtk_object_set_data (GTK_OBJECT (table), "autodetect",
-				     autodetect);
-
-		auth_html = html_new (TRUE);
-		gtk_table_attach (GTK_TABLE (table), auth_html->parent->parent,
-				  0, 3, row + 1, row + 2,
-				  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
-		fill_auth_menu (GTK_OPTION_MENU (auth_optionmenu),
-				GTK_HTML (auth_html), st->authtypes);
-
-		row += 2;
-	}
-
-	if (row != 0) {
-		GtkWidget *check;
-
-		check = gtk_check_button_new_with_label (
-			_("Test these values before continuing"));
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
-		gtk_table_attach (GTK_TABLE (table), check, 0, 3,
-				  row, row + 1, GTK_FILL | GTK_EXPAND,
-				  GTK_FILL, 0, 0);
-		gtk_object_set_data (GTK_OBJECT (table), "check", check);
-		row += 1;
-	}
-
-	gtk_table_resize (GTK_TABLE (table), row, 3);
-	gtk_widget_show_all (table);
-
-	return table;
-}
-
-static void
-stype_menuitem_activate (GtkObject *menuitem, GtkObject *table)
-{
-	GtkHTML *html;
-	char *text;
-	int page;
-	GtkNotebook *notebook;
-
-	text = gtk_object_get_data (menuitem, "description");
-	html = gtk_object_get_data (table, "html");
-	put_html (html, text);
-
-	page = GPOINTER_TO_UINT (gtk_object_get_data (menuitem, "page"));
-	notebook = gtk_object_get_data (table, "notebook");
-	gtk_notebook_set_page (notebook, page);
-	service_note_doneness (GTK_OBJECT (gtk_notebook_get_nth_page (notebook,
-								      page)),
-			       NULL);			       
-}
-
-/* Create the mail source/transport page. */
-static void
-create_service_page (GtkWidget *vbox, const char *label_text, GList *services,
-		     GtkWidget *(*create_service)(struct service_type *),
-		     char **urlp)
-{
-	GtkWidget *hbox, *stype, *stype_optionmenu, *stype_menu;
-	GtkWidget *menuitem, *first_menuitem = NULL;
-	GtkWidget *stype_html, *notebook, *service;
-	int page;
-	GList *s;
-
-	hbox = gtk_hbox_new (FALSE, 8);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
-
-	stype = gtk_label_new (label_text);
-	gtk_box_pack_start (GTK_BOX (hbox), stype, FALSE, FALSE, 0);
-	gtk_misc_set_alignment (GTK_MISC (stype), 1, 0.5);
-
-	stype_optionmenu = gtk_option_menu_new ();
-	gtk_object_set_data (GTK_OBJECT (vbox), "stype_optionmenu", stype_optionmenu);
-	gtk_box_pack_start (GTK_BOX (hbox), stype_optionmenu, TRUE, TRUE, 0);
-	stype_menu = gtk_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (stype_optionmenu), stype_menu);
-
-	stype_html = html_new (TRUE);
-	gtk_object_set_data (GTK_OBJECT (vbox), "html", stype_html);
-	gtk_box_pack_start (GTK_BOX (vbox), stype_html->parent->parent,
-			    TRUE, TRUE, 0);
-
-	notebook = gtk_notebook_new ();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
-	gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
-	gtk_object_set_data (GTK_OBJECT (vbox), "notebook", notebook);
-	gtk_signal_connect (GTK_OBJECT (notebook), "destroy",
-			    GTK_SIGNAL_FUNC (destroy_service), urlp);
-
-	for (s = services, page = 0; s; s = s->next, page++) {
-		struct service_type *st = s->data;
-
-		menuitem = gtk_menu_item_new_with_label (_(st->provider->name));
-		if (!first_menuitem)
-			first_menuitem = menuitem;
-		gtk_object_set_data (GTK_OBJECT (vbox), st->provider->name, menuitem);
-		gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-				    GTK_SIGNAL_FUNC (stype_menuitem_activate),
-				    vbox);
-		gtk_menu_append (GTK_MENU (stype_menu), menuitem);
-
-		service = (*create_service) (st);
-		gtk_notebook_append_page (GTK_NOTEBOOK (notebook), service, NULL);
-		gtk_object_set_data (GTK_OBJECT (service), "box", vbox);
-
-		gtk_object_set_data (GTK_OBJECT (menuitem), "page",
-				     GUINT_TO_POINTER (page));
-		gtk_object_set_data (GTK_OBJECT (menuitem), "description",
-				     st->provider->description);
-	}
-
-	stype_menuitem_activate (GTK_OBJECT (first_menuitem), GTK_OBJECT (vbox));
-	gtk_option_menu_set_history (GTK_OPTION_MENU (stype_optionmenu), 0);
-
-	gtk_widget_show_all (vbox);
-}
-
-static void
-create_source_page (GtkWidget *vbox, GList *sources, char **urlp)
-{
-	GtkWidget *html;
-
-	html = html_new (FALSE);
-	put_html (GTK_HTML (html),
-		  _("Select the kind of mail server you have, and enter "
-		    "the relevant information about it.\n\nIf the server "
-		    "requires authentication, you can click the "
-		    "\"Detect supported types...\" button after entering "
-		    "the other information."));
-	gtk_box_pack_start (GTK_BOX (vbox), html->parent, FALSE, TRUE, 0);
-
-	create_service_page (vbox, "Mail source type:", sources,
-			     create_source, urlp);
-}
-
-static void
-create_transport_page (GtkWidget *vbox, GList *transports, char **urlp)
-{
-	GtkWidget *html, *optionmenu, *menuitem;
-
-	html = html_new (FALSE);
-	put_html (GTK_HTML (html),
-		  _("Select the method you would like to use to deliver your mail."));
-	gtk_box_pack_start (GTK_BOX (vbox), html->parent, FALSE, TRUE, 0);
-
-	create_service_page (vbox, "Mail transport type:", transports,
-			     create_transport, urlp);
-
-	optionmenu = gtk_object_get_data (GTK_OBJECT (vbox), "stype_optionmenu");
-
-	if (*urlp && !strncasecmp(*urlp, "sendmail", 8)) {
-		menuitem = gtk_object_get_data (GTK_OBJECT (vbox), "Sendmail");
-		gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 1);
-	} else {
-		menuitem = gtk_object_get_data (GTK_OBJECT (vbox), "SMTP");
-		gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 0);
-	}
-
-	stype_menuitem_activate (GTK_OBJECT (menuitem), GTK_OBJECT (vbox));
-}
-
-
-/* Generic stuff */
-
-static GList *
-add_service (GList *services, CamelProviderType type, CamelProvider *prov)
-{
-	CamelService *service;
-	CamelException *ex;
-	char *url;
-	struct service_type *st;
-
-	ex = camel_exception_new ();
-
-	url = g_strdup_printf ("%s:", prov->protocol);
-	service = camel_session_get_service (session, url, type, ex);
-	g_free (url);
-	if (!service) {
-		camel_exception_free (ex);
-		return services;
-	}
-
-	st = g_new (struct service_type, 1);
-	st->provider = prov;
-	st->service = service;
-	st->authtypes = camel_service_query_auth_types (st->service, ex);
-	camel_exception_free (ex);
-
-	return g_list_append (services, st);
-}
-
-static GdkImlibImage *
-load_image (const char *name)
-{
-	char *path;
-	GdkImlibImage *image;
-
-	path = g_strdup_printf ("/usr/local/share/images/evolution/%s", name);
-	image = gdk_imlib_load_image (path);
-	g_free (path);
-
-	return image;
-}
-
-static void
-prepare_first (GnomeDruidPage *page, GnomeDruid *druid, gpointer user_data)
-{
-	gnome_druid_set_buttons_sensitive (druid, TRUE, TRUE, TRUE);
-}
-
-static struct identity_record idrec;
-static char *source = NULL, *transport = NULL;
-static gboolean format = FALSE;
-
-static void
-cancel (GnomeDruid *druid, gpointer window)
-{
-	gtk_window_set_modal (window, FALSE);
-	gtk_widget_destroy (window);
-	gtk_main_quit ();
-}
-
-static void
-write_config (void)
-{
-	char *path;
-
-	/* According to the API docs, there's an easier way to do this,
-	 * except that it doesn't work. Anyway, this will be replaced
-	 * by GConf eventually. FIXME.
-	 */
-
-	path = g_strdup_printf ("=%s/config=/mail/configured", evolution_dir);
-	gnome_config_set_bool (path, TRUE);
-	g_free (path);
-
-	path = g_strdup_printf ("=%s/config=/mail/id_name", evolution_dir);
-	gnome_config_set_string (path, idrec.name);
-	g_free (path);
-
-	path = g_strdup_printf ("=%s/config=/mail/id_addr", evolution_dir);
-	gnome_config_set_string (path, idrec.address);
-	g_free (path);
-
-	path = g_strdup_printf ("=%s/config=/mail/id_org", evolution_dir);
-	gnome_config_set_string (path, idrec.organization);
-	g_free (path);
-
-	path = g_strdup_printf ("=%s/config=/mail/id_sig", evolution_dir);
-	gnome_config_set_string (path, idrec.sigfile);
-	g_free (path);
-
-	path = g_strdup_printf ("=%s/config=/mail/source", evolution_dir);
-	gnome_config_set_string (path, source);
-	g_free (path);
-
-	path = g_strdup_printf ("=%s/config=/mail/transport", evolution_dir);
-	gnome_config_set_string (path, transport);
-	g_free (path);
-
-	path = g_strdup_printf ("=%s/config=/mail/msg_format", evolution_dir);
-	gnome_config_set_string (path, format ? "alternative" : "plain");
-	g_free (path);
-
-	gnome_config_sync ();
-}
-
-static void
-finish (GnomeDruidPage *page, gpointer arg1, gpointer window)
-{
-	cancel (arg1, window);
-	write_config();
-}
-
-void
-mail_config_druid (void)
-{
-	GnomeDruid *druid;
-	GtkWidget *page, *window;
-	GnomeDruidPageStandard *dpage;
-	GList *providers, *p, *sources, *transports;
-	GdkImlibImage *mail_logo, *identity_logo;
-	GdkImlibImage *source_logo, *transport_logo;
-
-	/* Fetch list of all providers. */
-	providers = camel_session_list_providers (session, TRUE);
-	sources = transports = NULL;
-	for (p = providers; p; p = p->next) {
-		CamelProvider *prov = p->data;
-
-		if (strcmp (prov->domain, "mail") != 0)
-			continue;
-
-		if (prov->object_types[CAMEL_PROVIDER_STORE]) {
-			sources = add_service (sources,
-					       CAMEL_PROVIDER_STORE,
-					       prov);
-		} else if (prov->object_types[CAMEL_PROVIDER_TRANSPORT]) {
-			transports = add_service (transports,
-						  CAMEL_PROVIDER_TRANSPORT,
-						  prov);
-		}
-	}
-
-	mail_logo = load_image ("evolution-inbox.png");
-	identity_logo = load_image ("malehead.png");
-	source_logo = mail_logo;
-	transport_logo = load_image ("envelope.png");
-
-	window = gtk_window_new (GTK_WINDOW_DIALOG);
-	druid = GNOME_DRUID (gnome_druid_new ());
-	gtk_signal_connect (GTK_OBJECT (druid), "cancel",
-			    GTK_SIGNAL_FUNC (cancel), window);
-
-	/* Start page */
-	page = gnome_druid_page_start_new_with_vals (
-		_("Mail Configuration"),
-		"Welcome to the Evolution Mail configuration wizard!\n"
-		"By filling in some information about your email\n"
-		"settings,you can start sending and receiving email\n"
-		"right away. Click \"Next\" to continue.",
-		mail_logo, NULL);
-
-	gnome_druid_page_start_set_logo_bg_color (
-		GNOME_DRUID_PAGE_START (page),
-		&GNOME_DRUID_PAGE_START (page)->background_color);
-	gnome_druid_append_page (druid, GNOME_DRUID_PAGE (page));
-	gtk_signal_connect (GTK_OBJECT (page), "prepare",
-			    GTK_SIGNAL_FUNC (prepare_first), NULL);
-	gtk_widget_show_all (page);
-
-
-	/* Identity page */
-	page = gnome_druid_page_standard_new_with_vals (_("Identity"),
-							identity_logo);
-	dpage = GNOME_DRUID_PAGE_STANDARD (page);
-	gnome_druid_page_standard_set_logo_bg_color (dpage,
-						     &dpage->background_color);
-	gtk_container_set_border_width (GTK_CONTAINER (dpage->vbox), 8);
-	gtk_box_set_spacing (GTK_BOX (dpage->vbox), 5);
-	create_identity_page (dpage->vbox, &idrec);
-	gtk_object_set_data (GTK_OBJECT (dpage->vbox), "exit_button",
-			     druid->next);
-	gnome_druid_append_page (druid, GNOME_DRUID_PAGE (page));
-	gtk_signal_connect (GTK_OBJECT (page), "prepare",
-			    GTK_SIGNAL_FUNC (prepare_identity), dpage->vbox);
-	gtk_signal_connect (GTK_OBJECT (page), "next",
-			    GTK_SIGNAL_FUNC (identity_next), dpage->vbox);
-	gtk_widget_show (page);
-
-
-	/* Source page */
-	page = gnome_druid_page_standard_new_with_vals (_("Mail Source"),
-							source_logo);
-	dpage = GNOME_DRUID_PAGE_STANDARD (page);
-	gnome_druid_page_standard_set_logo_bg_color (dpage,
-						     &dpage->background_color);
-	gtk_container_set_border_width (GTK_CONTAINER (dpage->vbox), 8);
-	gtk_box_set_spacing (GTK_BOX (dpage->vbox), 5);
-	create_source_page (dpage->vbox, sources, &source);
-	gtk_object_set_data (GTK_OBJECT (dpage->vbox), "exit_button",
-			     druid->next);
-	gnome_druid_append_page (druid, GNOME_DRUID_PAGE (page));
-	gtk_signal_connect (GTK_OBJECT (page), "prepare", 
-			    GTK_SIGNAL_FUNC (prepare_service), dpage->vbox);
-	gtk_signal_connect (GTK_OBJECT (page), "next", 
-			    GTK_SIGNAL_FUNC (service_next),
-			    gtk_object_get_data (GTK_OBJECT (dpage->vbox),
-						 "notebook"));
-	gtk_widget_show (page);
-
-
-	/* Transport page */
-	page = gnome_druid_page_standard_new_with_vals (_("Mail Transport"),
-							transport_logo);
-	dpage = GNOME_DRUID_PAGE_STANDARD (page);
-	gnome_druid_page_standard_set_logo_bg_color (dpage,
-						     &dpage->background_color);
-	gtk_container_set_border_width (GTK_CONTAINER (dpage->vbox), 8);
-	gtk_box_set_spacing (GTK_BOX (dpage->vbox), 5);
-	create_transport_page (dpage->vbox, transports, &transport);
-	gtk_object_set_data (GTK_OBJECT (dpage->vbox), "exit_button",
-			     druid->next);
-	gnome_druid_append_page (druid, GNOME_DRUID_PAGE (page));
-	gtk_signal_connect (GTK_OBJECT (page), "prepare", 
-			    GTK_SIGNAL_FUNC (prepare_service), dpage->vbox);
-	gtk_signal_connect (GTK_OBJECT (page), "next", 
-			    GTK_SIGNAL_FUNC (service_next),
-			    gtk_object_get_data (GTK_OBJECT (dpage->vbox),
-						 "notebook"));
-	gtk_widget_show (page);
-
-
-	/* Finish page */
-	page = gnome_druid_page_finish_new_with_vals (
-		_("Mail Configuration"),
-		"Your email configuration is now complete.\n"
-		"Click \"finish\" to save your new settings",
-		mail_logo, NULL);
-	gnome_druid_page_finish_set_logo_bg_color (
-		GNOME_DRUID_PAGE_FINISH (page),
-		&GNOME_DRUID_PAGE_FINISH (page)->background_color);
-	gnome_druid_append_page (druid, GNOME_DRUID_PAGE (page));
-	gtk_signal_connect (GTK_OBJECT (page), "finish",
-			    GTK_SIGNAL_FUNC (finish), window);
-	gtk_widget_show_all (page);
-
-	gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (druid));
-
-	gtk_widget_show (GTK_WIDGET (druid));
-	gtk_widget_show (window);
-	gtk_widget_queue_resize (window);
-	gnome_druid_set_buttons_sensitive (druid, FALSE, TRUE, TRUE);
-
-	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
-	gtk_main ();
-}
-
-static gint identity_row = -1;
-static gint source_row = -1;
-
-struct identity_dialog_data {
-	GtkWidget *clist;
-	struct identity_record *idrec;
-	gboolean new_entry;
-};
-
-struct source_dialog_data {
-	GtkWidget *clist;
-	char *source;
-	gboolean new_entry;
-};
-
-
-static void
-on_cmdIdentityConfigDialogOK_clicked (GtkWidget *dialog, gpointer user_data)
-{
-	struct identity_dialog_data *data = user_data;
-	GtkWidget *vbox = gtk_object_get_data (GTK_OBJECT (dialog), "vbox");
-
-	destroy_identity (GTK_OBJECT (vbox), data->idrec);
-
-	gtk_clist_set_text (GTK_CLIST (data->clist), identity_row, 0, data->idrec->name);
-	gtk_clist_set_text (GTK_CLIST (data->clist), identity_row, 1, data->idrec->address);
-	gtk_clist_set_text (GTK_CLIST (data->clist), identity_row, 2, data->idrec->organization);
-	gtk_clist_set_text (GTK_CLIST (data->clist), identity_row, 3, data->idrec->sigfile);
-
-	gtk_clist_set_row_data (GTK_CLIST (data->clist), identity_row,
-				g_memdup (data->idrec, sizeof (struct identity_record)));
-}
-
-static void
-on_cmdIdentityConfigDialogCancel_clicked (GtkWidget *dialog, gpointer user_data)
-{
-	struct identity_dialog_data *data = user_data;
-	int max_row;
-	
-	if (data && data->new_entry) {
-		gtk_clist_remove (GTK_CLIST (data->clist), identity_row);
-                max_row = GTK_CLIST (data->clist)->rows - 1;
-		identity_row = identity_row > max_row ? max_row : identity_row;
-		gtk_clist_select_row (GTK_CLIST (data->clist), identity_row, 0);
-	}
-}
-
-static void
-on_IdentityConfigDialogButton_clicked (GnomeDialog *dialog, int button, gpointer user_data)
-{
-	switch (button) {
-	case 0: /* OK clicked */
-		g_print ("OK clicked\n");
-		on_cmdIdentityConfigDialogOK_clicked (GTK_WIDGET (dialog), user_data);
-		break;
-	case 1: /* Cancel clicked */
-		g_print ("Cancel clicked\n");
-		on_cmdIdentityConfigDialogCancel_clicked (GTK_WIDGET (dialog), user_data);
-		break;
-	}
-
-	if (button != -1)
-		gnome_dialog_close (dialog);
-}
-
-static GtkWidget*
-create_identity_config_dialog (gboolean edit_mode, struct identity_record *idrecp, GtkWidget *clist)
-{
-	GtkWidget *config_dialog;
-	GtkWidget *dialog_vbox1;
-	GtkWidget *dialog_action_area1;
-	GtkWidget *cmdConfigDialogOK;
-	GtkWidget *cmdConfigDialogCancel;
-	GtkWidget *vbox;
-	struct identity_dialog_data *data = NULL;
-
-	if (edit_mode)
-		config_dialog = gnome_dialog_new (_("Edit Identity"), NULL);
-	else
-		config_dialog = gnome_dialog_new (_("Add Identity"), NULL);
-	gtk_window_set_modal (GTK_WINDOW (config_dialog), TRUE);
-	gtk_widget_set_name (config_dialog, "config_dialog");
-	gtk_object_set_data (GTK_OBJECT (config_dialog), "config_dialog", config_dialog);
-	gtk_window_set_policy (GTK_WINDOW (config_dialog), TRUE, TRUE, FALSE);
-	
-	dialog_vbox1 = GNOME_DIALOG (config_dialog)->vbox;
-	gtk_widget_set_name (dialog_vbox1, "dialog_vbox1");
-	gtk_object_set_data (GTK_OBJECT (config_dialog), "dialog_vbox1", dialog_vbox1);
-	gtk_widget_show (dialog_vbox1);
-	
-	dialog_action_area1 = GNOME_DIALOG (config_dialog)->action_area;
-	gtk_widget_set_name (dialog_action_area1, "dialog_action_area1");
-	gtk_object_set_data (GTK_OBJECT (config_dialog), "dialog_action_area1", dialog_action_area1);
-	gtk_widget_show (dialog_action_area1);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area1), 8);
-
-	/* Create the vbox that we will pack the identity widget into */
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_widget_set_name (vbox, "vbox");
-	gtk_object_set_data (GTK_OBJECT (config_dialog), "vbox", vbox);
-	gtk_widget_ref (vbox);
-	gtk_object_set_data_full (GTK_OBJECT (config_dialog), "vbox", vbox,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (vbox);
-	gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox, TRUE, TRUE, 0);
-	
-	gnome_dialog_append_button (GNOME_DIALOG (config_dialog), GNOME_STOCK_BUTTON_OK);
-	cmdConfigDialogOK = g_list_last (GNOME_DIALOG (config_dialog)->buttons)->data;
-	gtk_widget_set_name (cmdConfigDialogOK, "cmdConfigDialogOK");
-	gtk_object_set_data (GTK_OBJECT (vbox), "ok_button", cmdConfigDialogOK);
-	gtk_widget_ref (cmdConfigDialogOK);
-	gtk_object_set_data_full (GTK_OBJECT (config_dialog), "cmdConfigDialogOK", cmdConfigDialogOK,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdConfigDialogOK);
-	GTK_WIDGET_SET_FLAGS (cmdConfigDialogOK, GTK_CAN_DEFAULT);
-	gtk_widget_set_sensitive (cmdConfigDialogOK, FALSE);
-	
-	gnome_dialog_append_button (GNOME_DIALOG (config_dialog), GNOME_STOCK_BUTTON_CANCEL);
-	cmdConfigDialogCancel = g_list_last (GNOME_DIALOG (config_dialog)->buttons)->data;
-	gtk_widget_set_name (cmdConfigDialogCancel, "cmdConfigDialogCancel");
-	gtk_widget_ref (cmdConfigDialogCancel);
-	gtk_object_set_data_full (GTK_OBJECT (config_dialog), "cmdConfigDialogCancel", cmdConfigDialogCancel,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdConfigDialogCancel);
-	GTK_WIDGET_SET_FLAGS (cmdConfigDialogCancel, GTK_CAN_DEFAULT);
-	
-        /* create/pack our Identity widget */
-	create_identity_page (vbox, &idrec);
-	
-	/*gtk_signal_disconnect_by_func (GTK_OBJECT (vbox), GTK_SIGNAL_FUNC (destroy_identity), NULL);*/
-
-	data = g_malloc0 (sizeof (struct identity_dialog_data));
-	data->clist  = clist;
-	data->idrec  = idrecp;
-	data->new_entry = !edit_mode;
-
-	gtk_signal_connect(GTK_OBJECT (config_dialog), "clicked",
-			   GTK_SIGNAL_FUNC (on_IdentityConfigDialogButton_clicked),
-			   data);
-	/*
-	gtk_signal_connect (GTK_OBJECT (cmdConfigDialogOK), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdIdentityConfigDialogOK_clicked),
-			    data);
-	
-	gtk_signal_connect (GTK_OBJECT (cmdConfigDialogCancel), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdIdentityConfigDialogCancel_clicked),
-			    data);
-	*/
-	
-	return config_dialog;
-}
-
-static void
-on_SourceConfigDialogButton_clicked (GnomeDialog *dialog, int button, gpointer user_data)
-{
-	struct source_dialog_data *data = user_data;
-	GtkWidget *vbox;
-	GtkWidget *notebook;
-	int max_row;
-
-	switch (button) {
-	case 0: /* OK clicked */
-		vbox = gtk_object_get_data (GTK_OBJECT (dialog), "vbox");
-		notebook = gtk_object_get_data (GTK_OBJECT (vbox), "notebook");
-		
-		destroy_service (GTK_OBJECT (notebook), &data->source);
-		
-		gtk_clist_set_text (GTK_CLIST (data->clist), source_row, 0, data->source);
-		gtk_clist_set_row_data (GTK_CLIST (data->clist), source_row,
-					g_strdup (data->source));
-		source = data->source;
-		break;
-	case 1: /* Cancel clicked */
-		g_print ("Cancel clicked\n");
-		if (data && data->new_entry) {
-			gtk_clist_remove (GTK_CLIST (data->clist), source_row);
-			max_row = GTK_CLIST (data->clist)->rows - 1;
-			source_row = source_row > max_row ? max_row : source_row;
-			gtk_clist_select_row (GTK_CLIST (data->clist), source_row, 0);
-		}
-		break;
-	}
-
-	if (button != -1) {
-		gnome_dialog_close (dialog);
-	}
-}
-
-static GtkWidget*
-create_source_config_dialog (gboolean edit_mode, char **sourcep, GtkWidget *clist)
-{
-	GtkWidget *config_dialog;
-	GtkWidget *dialog_vbox1;
-	GtkWidget *dialog_action_area1;
-	GtkWidget *cmdConfigDialogOK;
-	GtkWidget *cmdConfigDialogCancel;
-	GtkWidget *vbox;
-	GList *providers, *p, *sources, *transports;
-	struct source_dialog_data *data = NULL;
-
-        /* Fetch list of all providers. */
-	providers = camel_session_list_providers (session, TRUE);
-	sources = transports = NULL;
-	for (p = providers; p; p = p->next) {
-		CamelProvider *prov = p->data;
-
-		if (strcmp (prov->domain, "mail") != 0)
-			continue;
-
-		if (prov->object_types[CAMEL_PROVIDER_STORE]) {
-			sources = add_service (sources,
-					       CAMEL_PROVIDER_STORE,
-					       prov);
-		} else if (prov->object_types[CAMEL_PROVIDER_TRANSPORT]) {
-			transports = add_service (transports,
-						  CAMEL_PROVIDER_TRANSPORT,
-						  prov);
-		}
-	}
-	
-	if (edit_mode)
-		config_dialog = gnome_dialog_new (_("Edit Source"), NULL);
-	else
-		config_dialog = gnome_dialog_new (_("Add Source"), NULL);
-	gtk_window_set_modal (GTK_WINDOW (config_dialog), TRUE);
-	gtk_widget_set_name (config_dialog, "config_dialog");
-	gtk_object_set_data (GTK_OBJECT (config_dialog), "config_dialog", config_dialog);
-	gtk_window_set_policy (GTK_WINDOW (config_dialog), TRUE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (config_dialog), 380, 450);
-	
-	dialog_vbox1 = GNOME_DIALOG (config_dialog)->vbox;
-	gtk_widget_set_name (dialog_vbox1, "dialog_vbox1");
-	gtk_object_set_data (GTK_OBJECT (config_dialog), "dialog_vbox1", dialog_vbox1);
-	gtk_widget_show (dialog_vbox1);
-	
-	dialog_action_area1 = GNOME_DIALOG (config_dialog)->action_area;
-	gtk_widget_set_name (dialog_action_area1, "dialog_action_area1");
-	gtk_object_set_data (GTK_OBJECT (config_dialog), "dialog_action_area1", dialog_action_area1);
-	gtk_widget_show (dialog_action_area1);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area1), 8);
-
-	/* Create the vbox that we will pack the source widget into */
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_widget_set_name (vbox, "vbox");
-	gtk_object_set_data (GTK_OBJECT (config_dialog), "vbox", vbox);
-	gtk_widget_ref (vbox);
-	gtk_object_set_data_full (GTK_OBJECT (config_dialog), "vbox", vbox,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (vbox);
-	gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox, TRUE, TRUE, 0);
-	
-	gnome_dialog_append_button (GNOME_DIALOG (config_dialog), GNOME_STOCK_BUTTON_OK);
-	cmdConfigDialogOK = g_list_last (GNOME_DIALOG (config_dialog)->buttons)->data;
-	gtk_widget_set_name (cmdConfigDialogOK, "cmdConfigDialogOK");
-	gtk_object_set_data (GTK_OBJECT (vbox), "ok_button", cmdConfigDialogOK);
-	gtk_widget_ref (cmdConfigDialogOK);
-	gtk_object_set_data_full (GTK_OBJECT (config_dialog), "cmdConfigDialogOK", cmdConfigDialogOK,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdConfigDialogOK);
-	GTK_WIDGET_SET_FLAGS (cmdConfigDialogOK, GTK_CAN_DEFAULT);
-	gtk_widget_set_sensitive (cmdConfigDialogOK, FALSE);
-	
-	gnome_dialog_append_button (GNOME_DIALOG (config_dialog), GNOME_STOCK_BUTTON_CANCEL);
-	cmdConfigDialogCancel = g_list_last (GNOME_DIALOG (config_dialog)->buttons)->data;
-	gtk_widget_set_name (cmdConfigDialogCancel, "cmdConfigDialogCancel");
-	gtk_widget_ref (cmdConfigDialogCancel);
-	gtk_object_set_data_full (GTK_OBJECT (config_dialog), "cmdConfigDialogCancel", cmdConfigDialogCancel,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdConfigDialogCancel);
-	GTK_WIDGET_SET_FLAGS (cmdConfigDialogCancel, GTK_CAN_DEFAULT);
-	
-        /* create/pack our source widget */
-	create_source_page (vbox, sources, sourcep);
-	
-	data = g_malloc0 (sizeof (struct source_dialog_data));
-	data->clist = clist;
-	data->source = *sourcep;
-	data->new_entry = !edit_mode;
-
-	gtk_signal_connect(GTK_OBJECT (config_dialog), "clicked",
-			   GTK_SIGNAL_FUNC (on_SourceConfigDialogButton_clicked),
-			   data);
-	
-	return config_dialog;
-}
-
-static void
-on_clistIdentities_select_row (GtkWidget *widget, gint row, gint column,
-			       GdkEventButton *event, gpointer data)
-{
-	identity_row = row;
-}
-
-static void
-on_clistSources_select_row (GtkWidget *widget, gint row, gint column,
-			       GdkEventButton *event, gpointer data)
-{
-	source_row = row;
-}
-
-static void
-on_cmdIdentityAdd_clicked (GtkWidget *widget, gpointer user_data)
-{
-	GtkWidget *dialog;
-	char *text[] = { "", "", "", "" };
-
-	gtk_clist_append (GTK_CLIST (user_data), text);
-
-	if (identity_row > -1)
-		gtk_clist_unselect_row (GTK_CLIST (user_data), identity_row, 0);
-
-	gtk_clist_select_row (GTK_CLIST (user_data), GTK_CLIST (user_data)->rows - 1, 0);
-
-	/* now create the editing dialog */
-	dialog = create_identity_config_dialog (FALSE, &idrec, GTK_WIDGET (user_data));
-	gtk_widget_show (dialog);
-}
-
-static void
-on_cmdIdentityEdit_clicked (GtkWidget *widget, gpointer user_data)
-{
-	GtkWidget *dialog;
-	struct identity_record *idrecp;
-	
-	if (identity_row == -1)
-		return;
-
-	idrecp = gtk_clist_get_row_data (GTK_CLIST (user_data), identity_row);
-	if (!idrecp) {
-		idrecp = &idrec;
-#if 0
-		g_free (idrecp->name);
-		idrecp->name = NULL;
-		g_free (idrecp->address);
-		idrecp->address = NULL;
-		g_free (idrecp->organization);
-		idrecp->organization = NULL;
-		g_free (idrecp->sigfile);
-		idrecp->sigfile = NULL;
-#endif
-	}
-
-	/* now create the editing dialog */
-	dialog = create_identity_config_dialog (TRUE, idrecp, GTK_WIDGET (user_data));
-	gtk_widget_show (dialog);
-}
-
-static void
-on_cmdIdentityDelete_clicked (GtkWidget *widget, gpointer user_data)
-{
-	if (identity_row == -1)
-		return;
-	
-	gtk_clist_remove (GTK_CLIST (user_data), identity_row);
-	identity_row = -1;
-}
-
-static void
-on_cmdSourcesAdd_clicked (GtkWidget *widget, gpointer user_data)
-{
-	GtkWidget *dialog;
-	char *text[] = { "" };
-
-	gtk_clist_append (GTK_CLIST (user_data), text);
-
-	if (source_row > -1)
-		gtk_clist_unselect_row (GTK_CLIST (user_data), source_row, 0);
-
-	gtk_clist_select_row (GTK_CLIST (user_data), GTK_CLIST (user_data)->rows - 1, 0);
-	
-	/* now create the editing dialog */
-	dialog = create_source_config_dialog (FALSE, &source, GTK_WIDGET (user_data));
-	gtk_widget_show (dialog);
-}
-
-static void
-on_cmdSourcesEdit_clicked (GtkWidget *widget, gpointer user_data)
-{
-	GtkWidget *dialog;
-	GtkWidget *vbox;
-	GtkWidget *interior_notebook;
-	GtkWidget *table;
-	int page;
-	char *sourcep;
-	
-	if (source_row == -1)
-		return;
-
-	sourcep = gtk_clist_get_row_data (GTK_CLIST (user_data), source_row);
-	if (sourcep) {
-		source = sourcep;
-	}
-
-	/* now create the editing dialog */
-	dialog = create_source_config_dialog (TRUE, &sourcep, GTK_WIDGET (user_data));
-
-        /* Set the data in the source editor */
-	vbox = gtk_object_get_data (GTK_OBJECT (dialog), "vbox");
-	interior_notebook = gtk_object_get_data (GTK_OBJECT (vbox), "notebook");
-	page = gtk_notebook_get_current_page (GTK_NOTEBOOK (interior_notebook));
-	table = gtk_notebook_get_nth_page (GTK_NOTEBOOK (interior_notebook), page);
-	set_service_url (GTK_OBJECT (table), source);
-
-	gtk_widget_show (dialog);
-}
-
-static void
-on_cmdSourcesDelete_clicked (GtkWidget *widget, gpointer user_data)
-{
-	if (source_row == -1)
-		return;
-	
-	gtk_clist_remove (GTK_CLIST (user_data), source_row);
-	source_row = -1;
-}
-
-static void
-on_cmdCamelServicesOK_clicked (GtkButton *button, gpointer user_data)
-{
-	GtkWidget *notebook, *interior_notebook;
-        GtkWidget *vbox;
-
-	notebook = gtk_object_get_data (GTK_OBJECT (user_data), "notebook");
-
-	/* switch to the third page which is the transport page */
-	gtk_notebook_set_page (GTK_NOTEBOOK (notebook), 2);
-
-	vbox = gtk_object_get_data (GTK_OBJECT (notebook), "transport_page_vbox");
-	interior_notebook = gtk_object_get_data (GTK_OBJECT (vbox), "notebook");
-
-       	if (service_acceptable (GTK_NOTEBOOK (interior_notebook))) {
-		destroy_service (GTK_OBJECT (interior_notebook), (gpointer) &transport);
-		gtk_widget_destroy (GTK_WIDGET (user_data));
-	}
-
-	write_config();
-}
-
-static void
-on_cmdCamelServicesCancel_clicked (GtkButton *button, gpointer user_data)
-{
-	gtk_widget_destroy(GTK_WIDGET (user_data));
-}
-
-static void
-on_chkFormat_toggled (GtkWidget *widget, gpointer user_data)
-{
-	format = GTK_TOGGLE_BUTTON (widget)->active;
-}
-
-GtkWidget*
-providers_config_new (void)
-{
-	GtkWidget *providers_config;
-	GtkWidget *dialog_vbox1;
-	GtkWidget *notebook;
-	GtkWidget *hbox1;
-	GtkWidget *scrolledwindow1;
-	GtkWidget *clistIdentities;
-	GtkWidget *lblIdentities;
-	GtkWidget *vbuttonbox1;
-	GtkWidget *cmdIdentityAdd;
-	GtkWidget *cmdIdentityEdit;
-	GtkWidget *cmdIdentityDelete;
-	GtkWidget *lblIdentity;
-	GtkWidget *hbox2;
-	GtkWidget *scrolledwindow2;
-	GtkWidget *clistSources;
-	GtkWidget *lblMailSources;
-	GtkWidget *vbuttonbox2;
-	GtkWidget *cmdSourcesAdd;
-	GtkWidget *cmdSourcesEdit;
-	GtkWidget *cmdSourcesDelete;
-	GtkWidget *lblProviders;
-	GtkWidget *lblTransports;
-	GtkWidget *dialog_action_area1;
-	GtkWidget *cmdCamelServicesOK;
-	GtkWidget *cmdCamelServicesCancel;
-	GtkWidget *transport_page_vbox;
-	GtkWidget *format_vbox;
-	GtkWidget *chkFormat;
-	GtkWidget *lblOther;
-	GList *providers, *p, *sources, *transports;
-	GtkWidget *table, *interior_notebook;
-	char *titles[] = { _("Name"), _("Address"), _("Organization"), _("Signature file") };
-	char *path;
-	gboolean configured;
-	int page;
-
-
-	/* Fetch list of all providers. */
-	providers = camel_session_list_providers (session, TRUE);
-	sources = transports = NULL;
-	for (p = providers; p; p = p->next) {
-		CamelProvider *prov = p->data;
-
-		if (strcmp (prov->domain, "mail") != 0)
-			continue;
-
-		if (prov->object_types[CAMEL_PROVIDER_STORE]) {
-			sources = add_service (sources,
-					       CAMEL_PROVIDER_STORE,
-					       prov);
-		} else if (prov->object_types[CAMEL_PROVIDER_TRANSPORT]) {
-			transports = add_service (transports,
-						  CAMEL_PROVIDER_TRANSPORT,
-						  prov);
-		}
-	}
-	
-	providers_config = gnome_dialog_new (_("Camel Providers Configuration"), NULL);
-	gtk_window_set_modal (GTK_WINDOW (providers_config), TRUE);
-	gtk_widget_set_name (providers_config, "providers_config");
-	gtk_object_set_data (GTK_OBJECT (providers_config), "providers_config", providers_config);
-	gtk_window_set_policy (GTK_WINDOW (providers_config), TRUE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (providers_config), 460, 340);
-
-	dialog_vbox1 = GNOME_DIALOG (providers_config)->vbox;
-	gtk_widget_set_name (dialog_vbox1, "dialog_vbox1");
-	gtk_object_set_data (GTK_OBJECT (providers_config), "dialog_vbox1", dialog_vbox1);
-	gtk_widget_show (dialog_vbox1);
-
-	notebook = gtk_notebook_new ();
-	gtk_widget_set_name (notebook, "notebook");
-	gtk_widget_ref (notebook);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "notebook", notebook,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (notebook);
-	gtk_box_pack_start (GTK_BOX (dialog_vbox1), notebook, TRUE, TRUE, 0);
-
-	hbox1 = gtk_hbox_new (FALSE, 0);
-	gtk_widget_set_name (hbox1, "hbox1");
-	gtk_widget_ref (hbox1);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "hbox1", hbox1,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (hbox1);
-	gtk_container_add (GTK_CONTAINER (notebook), hbox1);
-
-	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-	gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
-	gtk_widget_ref (scrolledwindow1);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "scrolledwindow1", scrolledwindow1,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (scrolledwindow1);
-	gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-	clistIdentities = gtk_clist_new_with_titles (4, titles);
-	gtk_widget_set_name (clistIdentities, "clistIdentities");
-	gtk_widget_ref (clistIdentities);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "clistIdentities", clistIdentities,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (clistIdentities);
-	gtk_container_add (GTK_CONTAINER (scrolledwindow1), clistIdentities);
-	gtk_clist_set_column_width (GTK_CLIST (clistIdentities), 0, 80);
-	gtk_clist_column_titles_show (GTK_CLIST (clistIdentities));
-
-	/* Find out if stuff has been configured */
-	path = g_strdup_printf ("=%s/config=/mail/configured", evolution_dir);
-	configured = gnome_config_get_bool (path);
-	g_free (path);
-
-	identity_row = -1;
-	if (configured) {
-		char *text[] = { "", "", "", "" };
-		struct identity_record *data;
-
-		/* add an entry to the identity clist */
-		gtk_clist_append (GTK_CLIST (clistIdentities), text);
-
-		path = g_strdup_printf ("=%s/config=/mail/id_name", evolution_dir);
-		idrec.name = gnome_config_get_string (path);
-		gtk_clist_set_text (GTK_CLIST (clistIdentities), 0, 0, idrec.name);
-		g_free (path);
-
-		path = g_strdup_printf ("=%s/config=/mail/id_addr", evolution_dir);
-		idrec.address = gnome_config_get_string (path);
-		gtk_clist_set_text (GTK_CLIST (clistIdentities), 0, 1, idrec.address);
-		g_free (path);
-
-		path = g_strdup_printf ("=%s/config=/mail/id_org", evolution_dir);
-		idrec.organization = gnome_config_get_string (path);
-		gtk_clist_set_text (GTK_CLIST (clistIdentities), 0, 2, idrec.organization);
-		g_free (path);
-
-		path = g_strdup_printf ("=%s/config=/mail/id_sig", evolution_dir);
-		idrec.sigfile = gnome_config_get_string (path);
-		gtk_clist_set_text (GTK_CLIST (clistIdentities), 0, 3, idrec.sigfile);
-		g_free (path);
-
-		data = g_malloc0 (sizeof (struct identity_record));
-		data->name = g_strdup (idrec.name);
-		data->address = g_strdup (idrec.address);
-		data->organization = g_strdup (idrec.organization);
-		data->sigfile = g_strdup (idrec.sigfile);
-		gtk_clist_set_row_data (GTK_CLIST (clistIdentities), 0, data);
-	}
-
-
-	lblIdentities = gtk_label_new (_("Identities"));
-	gtk_widget_set_name (lblIdentities, "lblIdentities");
-	gtk_widget_ref (lblIdentities);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblIdentities", lblIdentities,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblIdentities);
-	gtk_clist_set_column_widget (GTK_CLIST (clistIdentities), 0, lblIdentities);
-
-	vbuttonbox1 = gtk_vbutton_box_new ();
-	gtk_widget_set_name (vbuttonbox1, "vbuttonbox1");
-	gtk_widget_ref (vbuttonbox1);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "vbuttonbox1", vbuttonbox1,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (vbuttonbox1);
-	gtk_box_pack_start (GTK_BOX (hbox1), vbuttonbox1, FALSE, FALSE, 0);
-
-	cmdIdentityAdd = gtk_button_new_with_label (_("Add"));
-	gtk_widget_set_name (cmdIdentityAdd, "cmdIdentityAdd");
-	gtk_widget_ref (cmdIdentityAdd);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdIdentityAdd", cmdIdentityAdd,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdIdentityAdd);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox1), cmdIdentityAdd);
-	GTK_WIDGET_SET_FLAGS (cmdIdentityAdd, GTK_CAN_DEFAULT);
-
-	cmdIdentityEdit = gtk_button_new_with_label (_("Edit"));
-	gtk_widget_set_name (cmdIdentityEdit, "cmdIdentityEdit");
-	gtk_widget_ref (cmdIdentityEdit);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdIdentityEdit", cmdIdentityEdit,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdIdentityEdit);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox1), cmdIdentityEdit);
-	GTK_WIDGET_SET_FLAGS (cmdIdentityEdit, GTK_CAN_DEFAULT);
-
-	cmdIdentityDelete = gtk_button_new_with_label (_("Delete"));
-	gtk_widget_set_name (cmdIdentityDelete, "cmdIdentityDelete");
-	gtk_widget_ref (cmdIdentityDelete);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdIdentityDelete", cmdIdentityDelete,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdIdentityDelete);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox1), cmdIdentityDelete);
-	GTK_WIDGET_SET_FLAGS (cmdIdentityDelete, GTK_CAN_DEFAULT);
-
-	lblIdentity = gtk_label_new (_("Identity"));
-	gtk_widget_set_name (lblIdentity, "lblIdentity");
-	gtk_widget_ref (lblIdentity);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblIdentity", lblIdentity,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblIdentity);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0),
-				    lblIdentity);
-
-	hbox2 = gtk_hbox_new (FALSE, 0);
-	gtk_widget_set_name (hbox2, "hbox2");
-	gtk_widget_ref (hbox2);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "hbox2", hbox2,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (hbox2);
-	gtk_container_add (GTK_CONTAINER (notebook), hbox2);
-
-	scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
-	gtk_widget_set_name (scrolledwindow2, "scrolledwindow2");
-	gtk_widget_ref (scrolledwindow2);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "scrolledwindow2", scrolledwindow2,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (scrolledwindow2);
-	gtk_box_pack_start (GTK_BOX (hbox2), scrolledwindow2, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-
-	clistSources = gtk_clist_new (1);
-	gtk_widget_set_name (clistSources, "clistSources");
-	gtk_widget_ref (clistSources);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "clistSources", clistSources,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (clistSources);
-	gtk_container_add (GTK_CONTAINER (scrolledwindow2), clistSources);
-	gtk_clist_set_column_width (GTK_CLIST (clistSources), 0, 80);
-	gtk_clist_column_titles_show (GTK_CLIST (clistSources));
-
-	if (configured && !source) {
-		path = g_strdup_printf ("=%s/config=/mail/source", evolution_dir);
-		source = gnome_config_get_string (path);
-		g_free (path);
-	}
-
-	source_row = -1;
-	if (source) {
-		char *text[] = { "" };
-
-		gtk_clist_append (GTK_CLIST (clistSources), text);
-
-		gtk_clist_set_text (GTK_CLIST (clistSources), 0, 0, source);
-		gtk_clist_set_row_data (GTK_CLIST (clistSources), 0, g_strdup(source));
-	}
-
-	lblMailSources = gtk_label_new (_("Mail sources"));
-	gtk_widget_set_name (lblMailSources, "lblMailSources");
-	gtk_widget_ref (lblMailSources);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblMailSources", lblMailSources,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblMailSources);
-	gtk_clist_set_column_widget (GTK_CLIST (clistSources), 0, lblMailSources);
-
-	vbuttonbox2 = gtk_vbutton_box_new ();
-	gtk_widget_set_name (vbuttonbox2, "vbuttonbox2");
-	gtk_widget_ref (vbuttonbox2);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "vbuttonbox2", vbuttonbox2,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (vbuttonbox2);
-	gtk_box_pack_start (GTK_BOX (hbox2), vbuttonbox2, FALSE, FALSE, 0);
-
-	cmdSourcesAdd = gtk_button_new_with_label (_("Add"));
-	gtk_widget_set_name (cmdSourcesAdd, "cmdSourcesAdd");
-	gtk_widget_ref (cmdSourcesAdd);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdSourcesAdd", cmdSourcesAdd,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdSourcesAdd);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox2), cmdSourcesAdd);
-	GTK_WIDGET_SET_FLAGS (cmdSourcesAdd, GTK_CAN_DEFAULT);
-
-	cmdSourcesEdit = gtk_button_new_with_label (_("Edit"));
-	gtk_widget_set_name (cmdSourcesEdit, "cmdSourcesEdit");
-	gtk_widget_ref (cmdSourcesEdit);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdSourcesEdit", cmdSourcesEdit,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdSourcesEdit);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox2), cmdSourcesEdit);
-	GTK_WIDGET_SET_FLAGS (cmdSourcesEdit, GTK_CAN_DEFAULT);
-
-	cmdSourcesDelete = gtk_button_new_with_label (_("Delete"));
-	gtk_widget_set_name (cmdSourcesDelete, "cmdSourcesDelete");
-	gtk_widget_ref (cmdSourcesDelete);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdSourcesDelete", cmdSourcesDelete,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdSourcesDelete);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox2), cmdSourcesDelete);
-	GTK_WIDGET_SET_FLAGS (cmdSourcesDelete, GTK_CAN_DEFAULT);
-
-	lblProviders = gtk_label_new (_("Sources"));
-	gtk_widget_set_name (lblProviders, "lblProviders");
-	gtk_widget_ref (lblProviders);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblProviders", lblProviders,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblProviders);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1),
-				    lblProviders);
-
-
-	/* Setup the transport page */
-	transport_page_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (transport_page_vbox), 8);
-	gtk_box_set_spacing (GTK_BOX (transport_page_vbox), 5);
-	gtk_widget_set_name (transport_page_vbox, "transport_page_vbox");
-	gtk_object_set_data (GTK_OBJECT (notebook), "transport_page_vbox", transport_page_vbox);
-	gtk_widget_ref (transport_page_vbox);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "transport_page_vbox", transport_page_vbox,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (transport_page_vbox);
-	gtk_container_add (GTK_CONTAINER (notebook), transport_page_vbox);
-	if (configured && !transport) {
-		path = g_strdup_printf ("=%s/config=/mail/transport", evolution_dir);
-		transport = gnome_config_get_string (path);
-		g_free (path);
-	}
-	create_transport_page (transport_page_vbox, transports, &transport);
-
-	/* Set the data in the transports page */
-	interior_notebook = gtk_object_get_data (GTK_OBJECT (transport_page_vbox), "notebook");
-	page = gtk_notebook_get_current_page (GTK_NOTEBOOK (interior_notebook));
-	if (!strncasecmp(transport, "Sendmail", 8))
-		page = 1;
-	else
-		page = 0;
-	table = gtk_notebook_get_nth_page (GTK_NOTEBOOK (interior_notebook), page);
-	set_service_url (GTK_OBJECT (table), transport);
-	
-
-	lblTransports = gtk_label_new (_("Transports"));
-	gtk_widget_set_name (lblTransports, "lblTransports");
-	gtk_widget_ref (lblTransports);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblTransports", lblTransports,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblTransports);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2),
-				    lblTransports);
-
-	/* Lets make a page to mark Send HTML or text/plan...yay */
-	format_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (format_vbox), 8);
-	gtk_box_set_spacing (GTK_BOX (format_vbox), 5);
-	gtk_widget_set_name (format_vbox, "format_vbox");
-	gtk_object_set_data (GTK_OBJECT (notebook), "format_vbox", format_vbox);
-	gtk_widget_ref (format_vbox);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "format_vbox", format_vbox,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (format_vbox);
-	gtk_container_add (GTK_CONTAINER (notebook), format_vbox);
-
-	chkFormat = gtk_check_button_new_with_label (_("Send messages in HTML format"));
-	gtk_widget_set_name (chkFormat, "chkFormat");
-	gtk_object_set_data (GTK_OBJECT (notebook), "chkFormat", chkFormat);
-	gtk_widget_ref (chkFormat);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "chkFormat", chkFormat,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (chkFormat);
-	gtk_box_pack_start (GTK_BOX (format_vbox), chkFormat, FALSE, FALSE, 0);
-	
-	lblOther = gtk_label_new (_("Other"));
-	gtk_widget_set_name (lblOther, "lblOther");
-	gtk_widget_ref (lblOther);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblOther", lblOther,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblOther);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 3),
-				    lblOther);
-
-	if (configured) {
-		char *buf;
-
-		path = g_strdup_printf ("=%s/config=/mail/msg_format", evolution_dir);
-		buf = gnome_config_get_string (path);
-		g_free (path);
-
-		if (!buf || !strcmp(buf, "alternative"))
-			format = TRUE;
-		else
-			format = FALSE;
-
-		g_free (buf);
-	}
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkFormat), format);
-
-
-	dialog_action_area1 = GNOME_DIALOG (providers_config)->action_area;
-	gtk_widget_set_name (dialog_action_area1, "dialog_action_area1");
-	gtk_object_set_data (GTK_OBJECT (providers_config), "dialog_action_area1", dialog_action_area1);
-	gtk_widget_show (dialog_action_area1);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area1), 8);
-
-	gnome_dialog_append_button (GNOME_DIALOG (providers_config), GNOME_STOCK_BUTTON_OK);
-	cmdCamelServicesOK = g_list_last (GNOME_DIALOG (providers_config)->buttons)->data;
-	gtk_widget_set_name (cmdCamelServicesOK, "cmdCamelServicesOK");
-	gtk_widget_ref (cmdCamelServicesOK);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdCamelServicesOK", cmdCamelServicesOK,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdCamelServicesOK);
-	GTK_WIDGET_SET_FLAGS (cmdCamelServicesOK, GTK_CAN_DEFAULT);
-
-	gnome_dialog_append_button (GNOME_DIALOG (providers_config), GNOME_STOCK_BUTTON_CANCEL);
-	cmdCamelServicesCancel = g_list_last (GNOME_DIALOG (providers_config)->buttons)->data;
-	gtk_widget_set_name (cmdCamelServicesCancel, "cmdCamelServicesCancel");
-	gtk_widget_ref (cmdCamelServicesCancel);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdCamelServicesCancel", cmdCamelServicesCancel,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdCamelServicesCancel);
-	GTK_WIDGET_SET_FLAGS (cmdCamelServicesCancel, GTK_CAN_DEFAULT);
-
-	gtk_signal_connect (GTK_OBJECT (cmdIdentityAdd), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdIdentityAdd_clicked),
-			    clistIdentities);
-	gtk_signal_connect (GTK_OBJECT (cmdIdentityEdit), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdIdentityEdit_clicked),
-			    clistIdentities);
-	gtk_signal_connect (GTK_OBJECT (cmdIdentityDelete), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdIdentityDelete_clicked),
-			    clistIdentities);
-	
-	gtk_signal_connect (GTK_OBJECT (cmdSourcesAdd), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdSourcesAdd_clicked),
-			    clistSources);
-	gtk_signal_connect (GTK_OBJECT (cmdSourcesEdit), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdSourcesEdit_clicked),
-			    clistSources);
-	gtk_signal_connect (GTK_OBJECT (cmdSourcesDelete), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdSourcesDelete_clicked),
-			    clistSources);
-	
-	gtk_signal_connect (GTK_OBJECT (cmdCamelServicesOK), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdCamelServicesOK_clicked),
-			    providers_config);
-	gtk_signal_connect (GTK_OBJECT (cmdCamelServicesCancel), "clicked",
-			    GTK_SIGNAL_FUNC (on_cmdCamelServicesCancel_clicked),
-			    providers_config);
-	
-	gtk_signal_connect (GTK_OBJECT (clistIdentities), "select_row",
-			    GTK_SIGNAL_FUNC (on_clistIdentities_select_row),
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT (clistSources), "select_row",
-			    GTK_SIGNAL_FUNC (on_clistSources_select_row),
-			    NULL);
-
-	gtk_signal_connect (GTK_OBJECT (chkFormat), "toggled",
-			    GTK_SIGNAL_FUNC (on_chkFormat_toggled),
-			    NULL);
-
-	return providers_config;
-}
diff --git a/mail/mail-display.c b/mail/mail-display.c
deleted file mode 100644
index b5db4c69e1..0000000000
--- a/mail/mail-display.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * mail-display.c: Mail display widget
- *
- * Author:
- *   Miguel de Icaza
- *   Bertrand Guiheneuf (bg@aful.org)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <gnome.h>
-#include "e-util/e-setup.h"
-#include "e-util/e-util.h"
-#include "mail-display.h"
-#include "mail.h"
-
-#include <bonobo.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo/bonobo-stream-memory.h>
-
-#define PARENT_TYPE (gtk_vbox_get_type ())
-
-static GtkObjectClass *mail_display_parent_class;
-
-
-/*----------------------------------------------------------------------*
- *                        Callbacks
- *----------------------------------------------------------------------*/
-
-static void
-save_data_eexist_cb (int reply, gpointer user_data)
-{
-	gboolean *ok = user_data;
-
-	*ok = reply == 0;
-	gtk_main_quit ();
-}
-
-static void
-save_data_cb (GtkWidget *widget, gpointer user_data)
-{
-	CamelDataWrapper *data = user_data;
-	CamelStream *stream_fs;
-	GtkFileSelection *file_select = (GtkFileSelection *)
-		gtk_widget_get_ancestor (widget, GTK_TYPE_FILE_SELECTION);
-	char *name;
-	int fd;
-
-	name = gtk_file_selection_get_filename (file_select);
-
-	fd = open (name, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-	if (fd == -1 && errno == EEXIST) {
-		gboolean ok = FALSE;
-
-		gnome_ok_cancel_dialog_modal_parented (
-			"A file by that name already exists.\nOverwrite it?",
-			save_data_eexist_cb, &ok, GTK_WINDOW (file_select));
-		gtk_main ();
-		if (!ok)
-			return;
-		fd = open (name, O_WRONLY | O_TRUNC);
-	}
-
-	if (fd == -1) {
-		char *msg;
-
-		msg = g_strdup_printf ("Could not open file %s:\n%s",
-				       name, g_strerror (errno));
-		gnome_error_dialog_parented (msg, GTK_WINDOW (file_select));
-		return;
-	}
-
-	stream_fs = camel_stream_fs_new_with_fd (fd);
-	if (camel_data_wrapper_write_to_stream (data, stream_fs) == -1
-	    || camel_stream_flush (stream_fs) == -1) {
-		char *msg;
-
-		msg = g_strdup_printf ("Could not write data: %s", strerror(errno));
-		gnome_error_dialog_parented (msg, GTK_WINDOW (file_select));
-	}
-	gtk_object_unref (GTK_OBJECT (stream_fs));
-
-	gtk_widget_destroy (GTK_WIDGET (file_select));
-}
-
-static void
-save_data (const char *cid, CamelMimeMessage *message)
-{
-	GHashTable *urls;
-	CamelMimePart *part;
-	CamelDataWrapper *data;
-	GtkFileSelection *file_select;
-	char *filename;
-
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
-	urls = gtk_object_get_data (GTK_OBJECT (message), "urls");
-	part = g_hash_table_lookup (urls, cid);
-	g_return_if_fail (CAMEL_IS_MIME_PART (part));
-	data = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-
-	filename = (char *)camel_mime_part_get_filename (part);
-	if (filename) {
-		char *p;
-
-		p = strrchr (filename, '/');
-		if (p)
-			filename = g_strdup_printf ("%s%s", evolution_dir, p);
-		else {
-			filename = g_strdup_printf ("%s/%s", evolution_dir,
-						    filename);
-		}
-
-		for (p = strrchr (filename, '/') + 1; *p; p++) {
-			if (!isascii ((unsigned char)*p) ||
-			    strchr (" /'\"`&();|<>${}!", *p))
-				*p = '_';
-		}
-	} else
-		filename = g_strdup_printf ("%s/attachment", evolution_dir);
-
-	file_select = GTK_FILE_SELECTION (gtk_file_selection_new ("Save Attachment"));
-	gtk_file_selection_set_filename (file_select, filename);
-	g_free (filename);
-
-	gtk_signal_connect (GTK_OBJECT (file_select->ok_button), "clicked", 
-			    GTK_SIGNAL_FUNC (save_data_cb), data);
-	gtk_signal_connect_object (GTK_OBJECT (file_select->cancel_button),
-				   "clicked",
-				   GTK_SIGNAL_FUNC (gtk_widget_destroy),
-				   GTK_OBJECT (file_select));
-
-	gtk_widget_show (GTK_WIDGET (file_select));
-}
-
-static void
-on_link_clicked (GtkHTML *html, const char *url, gpointer user_data)
-{
-	CamelMimeMessage *message;
-
-	message = gtk_object_get_data (GTK_OBJECT (html), "message");
-
-	if (!strncasecmp (url, "news:", 5) ||
-	    !strncasecmp (url, "nntp:", 5))
-		g_warning ("Can't handle news URLs yet.");
-	else if (!strncasecmp (url, "mailto:", 7))
-		send_to_url (url);
-	else if (!strncasecmp (url, "cid:", 4))
-		save_data (url, message);
-	else
-		gnome_url_show (url);
-}
-
-static void 
-embeddable_destroy_cb (GtkObject *obj, gpointer user_data)
-{
-	BonoboWidget *be;      /* bonobo embeddable */
-	BonoboViewFrame *vf;   /* the embeddable view frame */
-	BonoboObjectClient* server;
-	CORBA_Environment ev;
-
-	be = BONOBO_WIDGET (obj);
-	server = bonobo_widget_get_server (be);
-
-	vf = bonobo_widget_get_view_frame (be);
-	bonobo_control_frame_control_deactivate (
-		BONOBO_CONTROL_FRAME (vf));
-	/* w = bonobo_control_frame_get_widget (BONOBO_CONTROL_FRAME (vf)); */
-	
-	/* gtk_widget_destroy (w); */
-	
-	CORBA_exception_init (&ev);
-	Bonobo_Unknown_unref (
-		bonobo_object_corba_objref (BONOBO_OBJECT(server)), &ev);
-	CORBA_Object_release (
-		bonobo_object_corba_objref (BONOBO_OBJECT(server)), &ev);
-
-	CORBA_exception_free (&ev);
-	bonobo_object_unref (BONOBO_OBJECT (vf));
-}
-
-static gboolean
-on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
-{
-	CamelMimeMessage *message;
-	GHashTable *urls;
-	CamelMedium *medium;
-	CamelDataWrapper *wrapper;
-	const char *goad_id;
-	GtkWidget *embedded;
-	BonoboObjectClient *server;
-	Bonobo_PersistStream persist;	
-	CORBA_Environment ev;
-	GByteArray *ba;
-	CamelStream *cstream;
-	BonoboStream *bstream;
-
-	if (strncmp (eb->classid, "cid:", 4) != 0)
-		return FALSE;
-	message = gtk_object_get_data (GTK_OBJECT (html), "message");
-	urls = gtk_object_get_data (GTK_OBJECT (message), "urls");
-	medium = g_hash_table_lookup (urls, eb->classid);
-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), FALSE);
-	wrapper = camel_medium_get_content_object (medium);
-
-	goad_id = gnome_mime_get_value (eb->type, "bonobo-goad-id");
-	if (!goad_id) {
-		char *main_type =
-			g_strndup (eb->type, strcspn (eb->type, "/"));
-
-		goad_id = gnome_mime_get_value (main_type, "bonobo-goad-id");
-		g_free (main_type);
-	}
-	if (!goad_id)
-		return FALSE;
-
-	embedded = bonobo_widget_new_subdoc (goad_id, NULL);
-	if (!embedded)
-		return FALSE;
-	gtk_signal_connect (GTK_OBJECT (embedded), "destroy",
-			    embeddable_destroy_cb, NULL);
-	server = bonobo_widget_get_server (BONOBO_WIDGET (embedded));
-
-	persist = (Bonobo_PersistStream) bonobo_object_client_query_interface (
-		server, "IDL:Bonobo/PersistStream:1.0", NULL);
-	if (persist == CORBA_OBJECT_NIL) {
-		bonobo_object_unref (BONOBO_OBJECT (embedded));
-		return FALSE;
-	}
-
-	/* Write the data to a CamelStreamMem... */
-	ba = g_byte_array_new ();
-	cstream = camel_stream_mem_new_with_byte_array (ba);
-	camel_data_wrapper_write_to_stream (wrapper, cstream);
-
-	/* ...convert the CamelStreamMem to a BonoboStreamMem... */
-	bstream = bonobo_stream_mem_create (ba->data, ba->len, TRUE, FALSE);
-	gtk_object_unref (GTK_OBJECT (cstream));
-
-	/* ...and hydrate the PersistStream from the BonoboStream. */
-	CORBA_exception_init (&ev);
-	Bonobo_PersistStream_load (persist,
-				   bonobo_object_corba_objref (
-					   BONOBO_OBJECT (bstream)),
-				   eb->type, &ev);
-	bonobo_object_unref (BONOBO_OBJECT (bstream));
-	Bonobo_Unknown_unref (persist, &ev);
-	CORBA_Object_release (persist, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		bonobo_object_unref (BONOBO_OBJECT (embedded));
-		CORBA_exception_free (&ev);				
-		return FALSE;
-	}
-	CORBA_exception_free (&ev);
-
-	gtk_widget_show (embedded);
-	gtk_container_add (GTK_CONTAINER (eb), embedded);
-
-	return TRUE;
-}
-
-static void
-on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
-		  gpointer user_data)
-{
-	CamelMimeMessage *message;
-	GHashTable *urls;
-
-	message = gtk_object_get_data (GTK_OBJECT (html), "message");
-	urls = gtk_object_get_data (GTK_OBJECT (message), "urls");
-
-	user_data = g_hash_table_lookup (urls, url);
-	if (user_data == NULL)
-		return;
-
-	if (strncmp (url, "cid:", 4) == 0) {
-		CamelMedium *medium = user_data;
-		CamelDataWrapper *data;
-		CamelStream *stream_mem;
-		GByteArray *ba;
-
-		g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-		data = camel_medium_get_content_object (medium);
-
-		ba = g_byte_array_new ();
-		stream_mem = camel_stream_mem_new_with_byte_array (ba);
-		camel_data_wrapper_write_to_stream (data, stream_mem);
-		gtk_html_write (html, handle, ba->data, ba->len);
-		gtk_object_unref (GTK_OBJECT (stream_mem));
-	} else if (strncmp (url, "x-evolution-data:", 17) == 0) {
-		GByteArray *ba = user_data;
-
-		g_return_if_fail (ba != NULL);
-		gtk_html_write (html, handle, ba->data, ba->len);
-	}
-}
-
-void
-mail_html_write (GtkHTML *html, GtkHTMLStream *stream,
-		 const char *format, ...)
-{
-	char *buf;
-	va_list ap;
-
-	va_start (ap, format);
-	buf = g_strdup_vprintf (format, ap);
-	va_end (ap);
-	gtk_html_write (html, stream, buf, strlen (buf));
-	g_free (buf);
-}
-
-
-/**
- * mail_display_set_message:
- * @mail_display: the mail display object
- * @mime_message: the input camel medium
- *
- * Makes the mail_display object show the contents of the medium
- * param. This means feeding mail_display->body_stream and
- * mail_display->headers_stream with html.
- *
- **/
-void 
-mail_display_set_message (MailDisplay *mail_display, 
-			  CamelMedium *medium)
-{
-	GtkHTMLStream *stream;
-	GtkAdjustment *adj;
-
-	/*
-	 * for the moment, camel-formatter deals only with 
-	 * mime messages, but in the future, it should be 
-	 * able to deal with any medium.
-	 * It can work on pretty much data wrapper, but in 
-	 * fact, only the medium class has the distinction 
-	 * header / body 
-	 */
-	if (!CAMEL_IS_MIME_MESSAGE (medium))
-		return;
-
-	/* Clean up from previous message. */
-	if (mail_display->current_message)
-		gtk_object_unref (GTK_OBJECT (mail_display->current_message));
-
-	mail_display->current_message = CAMEL_MIME_MESSAGE (medium);
-	gtk_object_ref (GTK_OBJECT (medium));
-
-	gtk_object_set_data (GTK_OBJECT (mail_display->html), "message", medium);
-	stream = gtk_html_begin (mail_display->html);
-	mail_html_write (mail_display->html, stream, "%s%s", HTML_HEADER,
-			 "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\">\n");
-	mail_format_mime_message (CAMEL_MIME_MESSAGE (medium),
-				  mail_display->html, stream,
-				  CAMEL_MIME_MESSAGE (medium));
-
-	mail_html_write (mail_display->html, stream, "</BODY></HTML>\n");
-	gtk_html_end (mail_display->html, stream, GTK_HTML_STREAM_OK);
-
-	adj = e_scroll_frame_get_vadjustment (mail_display->scroll);
-	gtk_adjustment_set_value (adj, 0);
-	e_scroll_frame_set_vadjustment (mail_display->scroll, adj);
-
-	adj = e_scroll_frame_get_hadjustment (mail_display->scroll);
-	gtk_adjustment_set_value (adj, 0);
-	e_scroll_frame_set_hadjustment (mail_display->scroll, adj);
-}
-
-
-/*----------------------------------------------------------------------*
- *                     Standard Gtk+ Class functions
- *----------------------------------------------------------------------*/
-
-static void
-mail_display_init (GtkObject *object)
-{
-	MailDisplay *mail_display = MAIL_DISPLAY (object);
-
-	/* various other initializations */
-	mail_display->current_message = NULL;
-}
-
-static void
-mail_display_destroy (GtkObject *object)
-{
-	/* MailDisplay *mail_display = MAIL_DISPLAY (object); */
-
-	mail_display_parent_class->destroy (object);
-}
-
-static void
-mail_display_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = mail_display_destroy;
-	mail_display_parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-GtkWidget *
-mail_display_new (FolderBrowser *parent_folder_browser)
-{
-	MailDisplay *mail_display = gtk_type_new (mail_display_get_type ());
-	GtkWidget *scroll, *html;
-
-	g_assert (parent_folder_browser);
-
-	mail_display->parent_folder_browser = parent_folder_browser;
-
-	gtk_box_set_homogeneous (GTK_BOX (mail_display), FALSE);
-	gtk_widget_show (GTK_WIDGET (mail_display));
-
-	scroll = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll),
-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll), GTK_SHADOW_IN);
-	gtk_box_pack_start_defaults (GTK_BOX (mail_display), GTK_WIDGET (scroll));
-	gtk_widget_show (GTK_WIDGET (scroll));
-
-	html = gtk_html_new ();
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	gtk_signal_connect (GTK_OBJECT (html), "url_requested",
-			    GTK_SIGNAL_FUNC (on_url_requested), NULL);
-	gtk_signal_connect (GTK_OBJECT (html), "object_requested",
-			    GTK_SIGNAL_FUNC (on_object_requested), NULL);
-	gtk_signal_connect (GTK_OBJECT (html), "link_clicked",
-			    GTK_SIGNAL_FUNC (on_link_clicked), NULL);
-	gtk_container_add (GTK_CONTAINER (scroll), html);
-	gtk_widget_show (GTK_WIDGET (html));
-
-	mail_display->scroll = E_SCROLL_FRAME (scroll);
-	mail_display->html = GTK_HTML (html);
-
-	return GTK_WIDGET (mail_display);
-}
-
-
-
-E_MAKE_TYPE (mail_display, "MailDisplay", MailDisplay, mail_display_class_init, mail_display_init, PARENT_TYPE);
diff --git a/mail/mail-display.h b/mail/mail-display.h
deleted file mode 100644
index 7348029c47..0000000000
--- a/mail/mail-display.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef _MAIL_DISPLAY_H_
-#define _MAIL_DISPLAY_H_
-
-#include <gtk/gtkvbox.h>
-#include <gtkhtml/gtkhtml.h>
-
-#include "widgets/misc/e-scroll-frame.h"
-
-#include "camel/camel-stream.h"
-#include "camel/camel-mime-message.h"
-#include "folder-browser.h"
-
-
-#define MAIL_DISPLAY_TYPE        (mail_display_get_type ())
-#define MAIL_DISPLAY(o)          (GTK_CHECK_CAST ((o), MAIL_DISPLAY_TYPE, MailDisplay))
-#define MAIL_DISPLAY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MAIL_DISPLAY_TYPE, MailDisplayClass))
-#define IS_MAIL_DISPLAY(o)       (GTK_CHECK_TYPE ((o), MAIL_DISPLAY_TYPE))
-#define IS_MAIL_DISPLAY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_DISPLAY_TYPE))
-
-struct _MailDisplay {
-	GtkVBox parent;
-
-	EScrollFrame *scroll;
-	GtkHTML *html;
-
-	FolderBrowser *parent_folder_browser;
-	CamelMimeMessage *current_message;
-};
-
-typedef struct {
-	GtkVBoxClass parent_class;
-} MailDisplayClass;
-
-GtkType        mail_display_get_type    (void);
-GtkWidget *    mail_display_new         (FolderBrowser *parent_folder_browser);
-
-void           mail_display_set_message (MailDisplay *mail_display, 
-					 CamelMedium *medium);
-
-
-#define HTML_HEADER "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<HTML>\n<HEAD>\n<META NAME=\"GENERATOR\" CONTENT=\"Evolution Mail Component\">\n</HEAD>\n"
-
-void           mail_html_write          (GtkHTML *html,
-					 GtkHTMLStream *stream,
-					 const char *format, ...);
-
-#endif /* _MAIL_DISPLAY_H_ */
diff --git a/mail/mail-format.c b/mail/mail-format.c
deleted file mode 100644
index 6f55ce3b38..0000000000
--- a/mail/mail-format.c
+++ /dev/null
@@ -1,1468 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors:
- *  Matt Loper <matt@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *
- *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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 Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include "mail-display.h"
-#include "mail.h"
-#include "e-util/e-html-utils.h"
-#include "e-util/e-setup.h" /*for evolution_dir*/
-#include <libgnome/libgnome.h>
-
-#include <ctype.h>    /* for isprint */
-#include <string.h>   /* for strstr  */
-#include <fcntl.h>
-
-struct mail_format_data {
-	CamelMimeMessage *root;
-	GHashTable *urls;
-	GtkHTML *html;
-	GtkHTMLStream *stream;
-};
-
-static gboolean handle_text_plain            (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_text_plain_flowed     (char *text,
-					      struct mail_format_data *mfd);
-static gboolean handle_text_enriched         (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_text_html             (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_image                 (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_multipart_mixed       (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_multipart_related     (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_multipart_alternative (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_multipart_appledouble (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_audio                 (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_message_rfc822        (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_message_external_body (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-
-static gboolean handle_unknown_type          (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-static gboolean handle_via_bonobo            (CamelMimePart *part,
-					      const char *mime_type,
-					      struct mail_format_data *mfd);
-
-/* writes the header info for a mime message into an html stream */
-static void write_headers (CamelMimeMessage *message,
-			   struct mail_format_data *mfd);
-
-/* dispatch html printing via mimetype */
-static gboolean call_handler_function (CamelMimePart *part,
-				       struct mail_format_data *mfd);
-
-static void free_urls (gpointer data);
-
-
-/**
- * mail_format_mime_message: 
- * @mime_message: the input mime message
- * @html: a GtkHTML
- * @stream: a stream on @html
- * @root: the root message being displayed (may be the same as @mime_message)
- *
- * Writes a CamelMimeMessage out into a GtkHTML
- **/
-void
-mail_format_mime_message (CamelMimeMessage *mime_message,
-			  GtkHTML *html, GtkHTMLStream *stream,
-			  CamelMimeMessage *root)
-{
-	struct mail_format_data mfd;
-
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
-
-	mfd.html = html;
-	mfd.stream = stream;
-	mfd.root = root;
-	mfd.urls = gtk_object_get_data (GTK_OBJECT (root), "urls");
-	if (!mfd.urls) {
-		mfd.urls = g_hash_table_new (g_str_hash, g_str_equal);
-		gtk_object_set_data_full (GTK_OBJECT (root), "urls",
-					  mfd.urls, free_urls);
-	}
-
-	write_headers (mime_message, &mfd);
-	call_handler_function (CAMEL_MIME_PART (mime_message), &mfd);
-}
-
-static void
-free_url (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-}
-
-static void
-free_urls (gpointer data)
-{
-	GHashTable *urls = data;
-
-	g_hash_table_foreach (urls, free_url, NULL);
-	g_hash_table_destroy (urls);
-}
-
-static const char *
-get_cid (CamelMimePart *part, struct mail_format_data *mfd)
-{
-	char *cid;
-	gpointer orig_name, value;
-
-	/* If we have a real Content-ID, use it. If we don't,
-	 * make a (syntactically invalid) fake one.
-	 */
-	if (camel_mime_part_get_content_id (part)) {
-		cid = g_strdup_printf ("cid:%s",
-				       camel_mime_part_get_content_id (part));
-	} else
-		cid = g_strdup_printf ("cid:@@@%p", part);
-
-	if (g_hash_table_lookup_extended (mfd->urls, cid, &orig_name, &value)) {
-		g_free (cid);
-		return orig_name;
-	} else
-		g_hash_table_insert (mfd->urls, cid, part);
-
-	return cid;
-}
-
-
-
-/* We're maintaining a hashtable of mimetypes -> functions;
- * Those functions have the following signature...
- */
-typedef gboolean (*mime_handler_fn) (CamelMimePart *part,
-				     const char *mime_type,
-				     struct mail_format_data *mfd);
-
-static GHashTable *mime_function_table, *mime_fallback_table;
-
-static void
-setup_function_table (void)
-{
-	mime_function_table = g_hash_table_new (g_str_hash, g_str_equal);
-	mime_fallback_table = g_hash_table_new (g_str_hash, g_str_equal);
-
-	g_hash_table_insert (mime_function_table, "text/plain",
-			     handle_text_plain);
-	g_hash_table_insert (mime_function_table, "text/richtext",
-			     handle_text_enriched);
-	g_hash_table_insert (mime_function_table, "text/enriched",
-			     handle_text_enriched);
-	g_hash_table_insert (mime_function_table, "text/html",
-			     handle_text_html);
-
-	g_hash_table_insert (mime_function_table, "image/*",
-			     handle_image);
-
-	g_hash_table_insert (mime_function_table, "audio/*",
-			     handle_audio);
-
-	g_hash_table_insert (mime_function_table, "message/rfc822",
-			     handle_message_rfc822);
-	g_hash_table_insert (mime_function_table, "message/external-body",
-			     handle_message_external_body);
-
-	g_hash_table_insert (mime_function_table, "multipart/alternative",
-			     handle_multipart_alternative);
-	g_hash_table_insert (mime_function_table, "multipart/related",
-			     handle_multipart_related);
-	g_hash_table_insert (mime_function_table, "multipart/mixed",
-			     handle_multipart_mixed);
-	g_hash_table_insert (mime_function_table, "multipart/appledouble",
-			     handle_multipart_appledouble);
-
-	/* RFC 2046 says unrecognized text subtypes can be treated
-	 * as text/plain (as long as you recognize the character set),
-	 * and unrecognized multipart subtypes as multipart/mixed.
-	 */
-	g_hash_table_insert (mime_fallback_table, "text/*",
-			     handle_text_plain);
-	g_hash_table_insert (mime_function_table, "multipart/*",
-			     handle_multipart_mixed);
-}
-
-static mime_handler_fn
-lookup_handler (const char *mime_type, gboolean *generic)
-{
-	mime_handler_fn handler_function;
-	const char *whole_goad_id, *generic_goad_id;
-	char *mime_type_main;
-
-	if (mime_function_table == NULL)
-		setup_function_table ();
-
-	mime_type_main = g_strdup_printf ("%.*s/*",
-					  (int)strcspn (mime_type, "/"),
-					  mime_type);
-
-	/* OK. There are 6 possibilities, which we try in this order:
-	 *   1) full match in the main table
-	 *   2) partial match in the main table
-	 *   3) full match in bonobo
-	 *   4) full match in the fallback table
-	 *   5) partial match in the fallback table
-	 *   6) partial match in bonobo
-	 *
-	 * Of these, 1-4 are considered exact matches, and 5 and 6 are
-	 * considered generic.
-	 */
-
-	/* Check for full match in mime_function_table. */
-	handler_function = g_hash_table_lookup (mime_function_table,
-						mime_type);
-	if (!handler_function) {
-		handler_function = g_hash_table_lookup (mime_function_table,
-							mime_type_main);
-		if (handler_function) {
-			/* Optimize this for the next time through. */
-			g_hash_table_insert (mime_function_table,
-					     g_strdup (mime_type),
-					     handler_function);
-		}
-	}
-
-	if (handler_function) {
-		g_free (mime_type_main);
-		*generic = FALSE;
-		return handler_function;
-	}
-
-	whole_goad_id = gnome_mime_get_value (mime_type, "bonobo-goad-id");
-	generic_goad_id = gnome_mime_get_value (mime_type_main,
-						"bonobo-goad-id");
-
-	if (whole_goad_id && (!generic_goad_id ||
-			      strcmp (whole_goad_id, generic_goad_id) != 0)) {
-		/* Optimize this for the next time through. */
-		g_hash_table_insert (mime_function_table,
-				     g_strdup (mime_type),
-				     handle_via_bonobo);
-		g_free (mime_type_main);
-		*generic = FALSE;
-		return handle_via_bonobo;
-	}
-
-	handler_function = g_hash_table_lookup (mime_fallback_table,
-						mime_type);
-	if (handler_function)
-		*generic = FALSE;
-	else {
-		handler_function = g_hash_table_lookup (mime_fallback_table,
-							mime_type_main);
-		if (!handler_function && generic_goad_id)
-			handler_function = handle_via_bonobo;
-		*generic = TRUE;
-	}
-
-	g_free (mime_type_main);
-	return handler_function;
-}
-
-static gboolean
-call_handler_function (CamelMimePart *part, struct mail_format_data *mfd)
-{
-	CamelDataWrapper *wrapper;
-	char *mime_type;
-	mime_handler_fn handler_function = NULL;
-	gboolean generic, output;
-
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	mime_type = camel_data_wrapper_get_mime_type (wrapper);
-	g_strdown (mime_type);
-
-	handler_function = lookup_handler (mime_type, &generic);
-	if (handler_function)
-		output = (*handler_function) (part, mime_type, mfd);
-	else
-		output = handle_unknown_type (part, mime_type, mfd);
-
-	g_free (mime_type);
-	return output;
-}
-
-static void
-write_field_to_stream (const char *description, const char *value,
-		       gboolean bold, GtkHTML *html,
-		       GtkHTMLStream *stream)
-{
-	char *encoded_value;
-
-	if (value) {
-		unsigned char *p;
-
-		encoded_value = e_text_to_html (value,
-						E_TEXT_TO_HTML_CONVERT_NL |
-						E_TEXT_TO_HTML_CONVERT_URLS);
-		for (p = (unsigned char *)encoded_value; *p; p++) {
-			if (!isprint (*p))
-				*p = '?';
-		}
-	} else
-		encoded_value = "";
-
-	mail_html_write (html, stream,
-			 "<tr valign=top><%s align=right>%s</%s>"
-			 "<td>%s</td></tr>", bold ? "th" : "td",
-			 description, bold ? "th" : "td", encoded_value);
-	if (value)
-		g_free (encoded_value);
-}
-
-static void
-write_recipients_to_stream (const gchar *recipient_type,
-			    const CamelInternetAddress *recipients,
-			    gboolean optional, gboolean bold,
-			    GtkHTML *html, GtkHTMLStream *stream)
-{
-	int i;
-	char *recipients_string = NULL;
-	const char *name, *addr;
-
-	i = 0;
-	while (camel_internet_address_get (recipients, i++, &name, &addr)) {
-		char *old_string = recipients_string;
-
-		if (*name) {
-			recipients_string = g_strdup_printf (
-				"%s%s\"%s\" <%s>",
-				old_string ? old_string : "",
-				old_string ? ", " : "",
-				name, addr);
-		} else {
-			recipients_string = g_strdup_printf (
-				"%s%s%s", old_string ? old_string : "",
-				old_string ? ", " : "", addr);
-		}
-		g_free (old_string);
-	}
-
-	if (recipients_string || !optional) {
-		write_field_to_stream (recipient_type, recipients_string,
-				       bold, html, stream);
-	}
-	g_free (recipients_string);
-}
-
-
-
-static void
-write_headers (CamelMimeMessage *message, struct mail_format_data *mfd)
-{
-	const CamelInternetAddress *recipients;
-
-	mail_html_write (mfd->html, mfd->stream,
-			 "<table bgcolor=\"#EEEEEE\" width=\"100%%\" "
-			 "cellspacing=0 border=1>"
-			 "<tr><td><table>\n");
-
-	write_field_to_stream ("From:",
-			       camel_mime_message_get_from (message),
-			       TRUE, mfd->html, mfd->stream);
-
-	if (camel_mime_message_get_reply_to (message)) {
-		write_field_to_stream ("Reply-To:",
-				       camel_mime_message_get_reply_to (message),
-				       FALSE, mfd->html, mfd->stream);
-	}
-
-	write_recipients_to_stream ("To:",
-				    camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO),
-				    FALSE, TRUE, mfd->html, mfd->stream);
-
-	recipients = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
-	write_recipients_to_stream ("Cc:", recipients, TRUE, TRUE,
-				    mfd->html, mfd->stream);
-	write_field_to_stream ("Subject:",
-			       camel_mime_message_get_subject (message),
-			       TRUE, mfd->html, mfd->stream);
-
-	mail_html_write (mfd->html, mfd->stream, "</table></td></tr></table></center>");
-}
-
-
-/* Return the contents of a text-based data wrapper, or NULL if it
- * contains only whitespace.
- */
-static char *
-get_data_wrapper_text (CamelDataWrapper *data)
-{
-	CamelStream *memstream;
-	GByteArray *ba;
-	char *text, *end;
-
-	ba = g_byte_array_new ();
-	memstream = camel_stream_mem_new_with_byte_array (ba);
-
-	camel_data_wrapper_write_to_stream (data, memstream);
-
-	for (text = ba->data, end = ba->data + ba->len; text < end; text++) {
-		if (!isspace ((unsigned char)*text))
-			break;
-	}
-
-	if (text < end) {
-		text = g_malloc (ba->len + 1);
-		memcpy (text, ba->data, ba->len);
-		text[ba->len] = '\0';
-	} else
-		text = NULL;
-
-	gtk_object_unref (GTK_OBJECT (memstream));
-	return text;
-}
-
-/*----------------------------------------------------------------------*
- *                     Mime handling functions
- *----------------------------------------------------------------------*/
-
-static gboolean
-handle_text_plain (CamelMimePart *part, const char *mime_type,
-		   struct mail_format_data *mfd)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	char *text, *htmltext;
-	GMimeContentField *type;
-	const char *format;
-
-	text = get_data_wrapper_text (wrapper);
-	if (!text)
-		return FALSE;
-
-	/* Check for RFC 2646 flowed text. */
-	type = camel_mime_part_get_content_type (part);
-	format = gmime_content_field_get_parameter (type, "format");
-	if (format && !g_strcasecmp (format, "flowed"))
-		return handle_text_plain_flowed (text, mfd);
-
-	mail_html_write (mfd->html, mfd->stream,
-			 "\n<!-- text/plain -->\n<pre>\n");
-
-	htmltext = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_URLS);
-	g_free (text);
-	mail_html_write (mfd->html, mfd->stream, "%s", htmltext);
-	g_free (htmltext);
-
-	mail_html_write (mfd->html, mfd->stream, "</pre>\n");
-	return TRUE;
-}
-
-static gboolean
-handle_text_plain_flowed (char *buf, struct mail_format_data *mfd)
-{
-	char *text, *line, *eol, *p;
-	int prevquoting = 0, quoting, len;
-	gboolean br_pending = FALSE;
-
-	mail_html_write (mfd->html, mfd->stream,
-			 "\n<!-- text/plain, flowed -->\n<tt>\n");
-
-	for (line = buf; *line; line = eol + 1) {
-		/* Process next line */
-		eol = strchr (line, '\n');
-		if (eol)
-			*eol = '\0';
-
-		quoting = 0;
-		for (p = line; *p == '>'; p++)
-			quoting++;
-		if (quoting != prevquoting) {
-			mail_html_write (mfd->html, mfd->stream, "%s\n",
-					 prevquoting == 0 ? "<i>\n" : "");
-			while (quoting > prevquoting) {
-				mail_html_write (mfd->html, mfd->stream,
-						 "<blockquote>");
-				prevquoting++;
-			}
-			while (quoting < prevquoting) {
-				mail_html_write (mfd->html, mfd->stream,
-						 "</blockquote>");
-				prevquoting--;
-			}
-			mail_html_write (mfd->html, mfd->stream, "%s\n",
-					 prevquoting == 0 ? "</i>\n" : "");
-		} else if (br_pending) {
-			mail_html_write (mfd->html, mfd->stream, "<br>\n");
-			br_pending = FALSE;
-		}
-
-		if (*p == ' ')
-			p++;
-
-		/* replace '<' with '&lt;', etc. */
-		text = e_text_to_html (p, E_TEXT_TO_HTML_CONVERT_SPACES |
-				       E_TEXT_TO_HTML_CONVERT_URLS);
-		if (text && *text)
-			mail_html_write (mfd->html, mfd->stream, "%s", text);
-		g_free (text);
-
-		len = strlen (p);
-		if (len == 0 || p[len - 1] != ' ' || !strcmp (p, "-- "))
-			br_pending = TRUE;
-
-		if (!eol)
-			break;
-	}
-	g_free (buf);
-
-	mail_html_write (mfd->html, mfd->stream, "</tt>\n");
-	return TRUE;
-}
-
-static void
-free_byte_array (GtkWidget *widget, gpointer user_data)
-{
-	g_byte_array_free (user_data, TRUE);
-}
-
-/* text/enriched (RFC 1896) or text/richtext (included in RFC 1341) */
-static gboolean
-handle_text_enriched (CamelMimePart *part, const char *mime_type,
-		      struct mail_format_data *mfd)
-{
-	static GHashTable *translations = NULL;
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	GString *string;
-	GByteArray *ba;
-	char *text, *p, *xed;
-	int len, nofill = 0;
-	gboolean enriched;
-
-	if (!translations) {
-		translations = g_hash_table_new (g_strcase_hash,
-						 g_strcase_equal);
-		g_hash_table_insert (translations, "bold", "<b>");
-		g_hash_table_insert (translations, "/bold", "</b>");
-		g_hash_table_insert (translations, "italic", "<i>");
-		g_hash_table_insert (translations, "/italic", "</i>");
-		g_hash_table_insert (translations, "fixed", "<tt>");
-		g_hash_table_insert (translations, "/fixed", "</tt>");
-		g_hash_table_insert (translations, "smaller", "<font size=-1>");
-		g_hash_table_insert (translations, "/smaller", "</font>");
-		g_hash_table_insert (translations, "bigger", "<font size=+1>");
-		g_hash_table_insert (translations, "/bigger", "</font>");
-		g_hash_table_insert (translations, "underline", "<u>");
-		g_hash_table_insert (translations, "/underline", "</u>");
-		g_hash_table_insert (translations, "center", "<p align=center>");
-		g_hash_table_insert (translations, "/center", "</p>");
-		g_hash_table_insert (translations, "flushleft", "<p align=left>");
-		g_hash_table_insert (translations, "/flushleft", "</p>");
-		g_hash_table_insert (translations, "flushright", "<p align=right>");
-		g_hash_table_insert (translations, "/flushright", "</p>");
-		g_hash_table_insert (translations, "excerpt", "<blockquote>");
-		g_hash_table_insert (translations, "/excerpt", "</blockquote>");
-		g_hash_table_insert (translations, "paragraph", "<p>");
-		g_hash_table_insert (translations, "signature", "<address>");
-		g_hash_table_insert (translations, "/signature", "</address>");
-		g_hash_table_insert (translations, "comment", "<!-- ");
-		g_hash_table_insert (translations, "/comment", " -->");
-		g_hash_table_insert (translations, "param", "<!-- ");
-		g_hash_table_insert (translations, "/param", " -->");
-		g_hash_table_insert (translations, "np", "<hr>");
-	}
-
-	text = get_data_wrapper_text (wrapper);
-	if (!text)
-		return FALSE;
-
-	if (!g_strcasecmp (mime_type, "text/richtext")) {
-		enriched = FALSE;
-		mail_html_write (mfd->html, mfd->stream,
-				 "\n<!-- text/richtext -->\n");
-	} else {
-		enriched = TRUE;
-		mail_html_write (mfd->html, mfd->stream,
-				 "\n<!-- text/enriched -->\n");
-	}
-
-	/* This is not great code, but I don't feel like fixing it right
-	 * now. I mean, it's just text/enriched...
-	 */
-	p = text;
-	string = g_string_sized_new (2 * strlen (p));
-
-	while (p) {
-		len = strcspn (p, " <>&\n");
-		if (len)
-			g_string_sprintfa (string, "%.*s", len, p);
-
-		p += len;
-		if (!*p)
-			break;
-
-		switch (*p++) {
-		case ' ':
-			while (*p == ' ') {
-				g_string_append (string, "&nbsp;");
-				p++;
-			}
-			g_string_append (string, " ");
-			break;
-
-		case '\n':
-			g_string_append (string, " ");
-			if (enriched && nofill <= 0) {
-				while (*p == '\n') {
-					g_string_append (string, "<br>");
-					p++;
-				}
-			}
-			break;
-
-		case '>':
-			g_string_append (string, "&gt;");
-			break;
-
-		case '&':
-			g_string_append (string, "&amp;");
-			break;
-
-		case '<':
-			if (enriched) {
-				if (*p == '<') {
-					g_string_append (string, "&lt;");
-					p++;
-					break;
-				}
-			} else {
-				if (strncmp (p, "lt>", 3) == 0) {
-					g_string_append (string, "&lt;");
-					p += 3;
-					break;
-				} else if (strncmp (p, "nl>", 3) == 0) {
-					g_string_append (string, "<br>");
-					p += 3;
-					break;
-				}
-			}
-
-			if (strncmp (p, "nofill>", 7) == 0) {
-				nofill++;
-				g_string_append (string, "<pre>");
-			} else if (strncmp (p, "/nofill>", 8) == 0) {
-				nofill--;
-				g_string_append (string, "</pre>");
-			} else {
-				char *copy, *match;
-
-				len = strcspn (p, ">");
-				copy = g_strndup (p, len);
-				match = g_hash_table_lookup (translations,
-							     copy);
-				g_free (copy);
-				if (match)
-					g_string_append (string, match);
-			}
-
-			p = strchr (p, '>');
-			if (p)
-				p++;
-		}
-	}
-	g_free (text);
-
-	ba = g_byte_array_new ();
-	g_byte_array_append (ba, (const guint8 *)string->str,
-			     strlen (string->str));
-	g_string_free (string, TRUE);
-
-	xed = g_strdup_printf ("x-evolution-data:%p", part);
-	g_hash_table_insert (mfd->urls, xed, ba);
-	gtk_signal_connect (GTK_OBJECT (mfd->root), "destroy",
-			    GTK_SIGNAL_FUNC (free_byte_array), ba);
-	mail_html_write (mfd->html, mfd->stream,
-			 "<iframe src=\"%s\" frameborder=0 scrolling=no>"
-			 "</iframe>", xed);
-
-	return TRUE;
-}
-
-static gboolean
-handle_text_html (CamelMimePart *part, const char *mime_type,
-		  struct mail_format_data *mfd)
-{
-	mail_html_write (mfd->html, mfd->stream, "\n<!-- text/html -->\n");
-	mail_html_write (mfd->html, mfd->stream,
-			 "<iframe src=\"%s\" frameborder=0 scrolling=no>"
-			 "</iframe>", get_cid (part, mfd));
-	return TRUE;
-}
-
-static gboolean
-handle_image (CamelMimePart *part, const char *mime_type,
-	      struct mail_format_data *mfd)
-{
-	mail_html_write (mfd->html, mfd->stream, "<img src=\"%s\">",
-			 get_cid (part, mfd));
-	return TRUE;
-}
-
-static gboolean
-handle_multipart_mixed (CamelMimePart *part, const char *mime_type,
-			struct mail_format_data *mfd)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *mp;
-	int i, nparts;
-	gboolean output = FALSE;
-
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	mp = CAMEL_MULTIPART (wrapper);
-
-	nparts = camel_multipart_get_number (mp);	
-	for (i = 0; i < nparts; i++) {
-		if (i != 0 && output)
-			mail_html_write (mfd->html, mfd->stream, "<hr>\n");
-
-		part = camel_multipart_get_part (mp, i);
-
-		output = call_handler_function (part, mfd);
-	}
-
-	return TRUE;
-}
-
-/* As seen in RFC 2387! */
-static gboolean
-handle_multipart_related (CamelMimePart *part, const char *mime_type,
-			  struct mail_format_data *mfd)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *mp;
-	CamelMimePart *body_part, *display_part = NULL;
-	GMimeContentField *content_type;
-	const char *start;
-	int i, nparts;
-
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);	
-
-	content_type = camel_mime_part_get_content_type (part);
-	start = gmime_content_field_get_parameter (content_type, "start");
-	if (start) {
-		int len;
-
-		/* The "start" parameter includes <>s, which Content-Id
-		 * does not.
-		 */
-		len = strlen (start) - 2;
-
-		for (i = 0; i < nparts; i++) {
-			const char *cid;
-
-			body_part = camel_multipart_get_part (mp, i);
-			cid = camel_mime_part_get_content_id (body_part);
-
-			if (!strncmp (cid, start + 1, len) &&
-			    strlen (cid) == len) {
-				display_part = body_part;
-				break;
-			}
-		}
-
-		if (!display_part) {
-			/* Oops. Hrmph. */
-			return handle_multipart_mixed (part, mime_type, mfd);
-		}
-	} else {
-		/* No start parameter, so it defaults to the first part. */
-		display_part = camel_multipart_get_part (mp, 0);
-	}
-
-	/* Record the Content-IDs of any non-displayed parts. */
-	for (i = 0; i < nparts; i++) {
-		body_part = camel_multipart_get_part (mp, i);
-		if (body_part == display_part)
-			continue;
-
-		get_cid (body_part, mfd);
-	}
-
-	/* Now, display the displayed part. */
-	return call_handler_function (display_part, mfd);
-}
-
-/* RFC 2046 says "display the last part that you are able to display". */
-static CamelMimePart *
-find_preferred_alternative (CamelMultipart *multipart, gboolean want_plain)
-{
-	int i, nparts;
-	CamelMimePart *preferred_part = NULL;
-	gboolean generic;
-
-	nparts = camel_multipart_get_number (multipart);
-	for (i = 0; i < nparts; i++) {
-		CamelMimePart *part = camel_multipart_get_part (multipart, i);
-		char *mime_type = gmime_content_field_get_mime_type (
-			camel_mime_part_get_content_type (part));
-
-		g_strdown (mime_type);
-		if (want_plain && !strcmp (mime_type, "text/plain"))
-			return part;
-		if (lookup_handler (mime_type, &generic) &&
-		    (!preferred_part || !generic))
-			preferred_part = part;
-		g_free (mime_type);
-	}
-
-	return preferred_part;
-}
-
-static gboolean
-handle_multipart_alternative (CamelMimePart *part, const char *mime_type,
-			      struct mail_format_data *mfd)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *multipart;
-	CamelMimePart *mime_part;
-
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	multipart = CAMEL_MULTIPART (wrapper);
-
-	mime_part = find_preferred_alternative (multipart, FALSE);
-	if (mime_part)
-		return call_handler_function (mime_part, mfd);
-	else
-		return handle_unknown_type (part, mime_type, mfd);
-}
-
-/* RFC 1740 */
-static gboolean
-handle_multipart_appledouble (CamelMimePart *part, const char *mime_type,
-			      struct mail_format_data *mfd)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *multipart;
-
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	multipart = CAMEL_MULTIPART (wrapper);
-
-	/* The first part is application/applefile and is not useful
-	 * to us. The second part _may_ be displayable data. Most
-	 * likely it's application/octet-stream though.
-	 */
-	part = camel_multipart_get_part (multipart, 1);
-	return call_handler_function (part, mfd);
-}
-
-static const char *
-get_url_for_icon (const char *icon_name, struct mail_format_data *mfd)
-{
-	static GHashTable *icons;
-	char *icon_path = gnome_pixmap_file (icon_name), buf[1024], *url;
-	GByteArray *ba;
-
-	if (!icons)
-		icons = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (!icon_path)
-		return "file:///dev/null";
-
-	ba = g_hash_table_lookup (icons, icon_path);
-	if (!ba) {
-		int fd, nread;
-
-		fd = open (icon_path, O_RDONLY);
-		if (fd == -1) {
-			g_free (icon_path);
-			return "file:///dev/null";
-		}
-
-		ba = g_byte_array_new ();
-
-		while (1) {
-			nread = read (fd, buf, sizeof (buf));
-			if (nread < 1)
-				break;
-			g_byte_array_append (ba, buf, nread);
-		}
-		close (fd);
-
-		g_hash_table_insert (icons, icon_path, ba);
-	}
-	g_free (icon_path);
-
-	url = g_strdup_printf ("x-evolution-data:%p", ba);
-	g_hash_table_insert (mfd->urls, url, ba);
-
-	return url;
-}
-
-static void
-handle_mystery (CamelMimePart *part, struct mail_format_data *mfd,
-		const char *url, const char *icon_name, const char *id,
-		const char *action)
-{
-	const char *info;
-	char *htmlinfo;
-	GMimeContentField *content_type;
-
-	mail_html_write (mfd->html, mfd->stream, "<table><tr><td>");
-
-	/* Draw the icon, surrounded by an <a href> if we have a URL,
-	 * or a plain inactive border if not.
-	 */
-	if (url) {
-		mail_html_write (mfd->html, mfd->stream,
-				 "<a href=\"%s\">", url);
-	} else {
-		mail_html_write (mfd->html, mfd->stream,
-				 "<table border=2><tr><td>");
-	}
-	mail_html_write (mfd->html, mfd->stream, "<img src=\"%s\">",
-			 get_url_for_icon (icon_name, mfd));
-
-	if (url)
-		mail_html_write (mfd->html, mfd->stream, "</a>");
-	else
-		mail_html_write (mfd->html, mfd->stream, "</td></tr></table>");
-	mail_html_write (mfd->html, mfd->stream, "</td><td>%s<br>", id);
-
-	/* Write a description, if we have one. */
-	info = camel_mime_part_get_description (part);
-	if (info) {
-		htmlinfo = e_text_to_html (info, E_TEXT_TO_HTML_CONVERT_URLS);
-		mail_html_write (mfd->html, mfd->stream, "Description: %s<br>",
-				 htmlinfo);
-		g_free (htmlinfo);
-	}
-
-	/* Write the name, if we have it. */
-	content_type = camel_mime_part_get_content_type (part);
-	info = gmime_content_field_get_parameter (content_type, "name");
-	if (!info)
-		info = camel_mime_part_get_filename (part);
-	if (info) {
-		htmlinfo = e_text_to_html (info, 0);
-		mail_html_write (mfd->html, mfd->stream, "Name: %s<br>",
-				 htmlinfo);
-		g_free (htmlinfo);
-	}
-
-	/* Describe the click action, if any. */
-	if (action) {
-		mail_html_write (mfd->html, mfd->stream,
-				 "<br>Click on the icon to %s.", action);
-	}
-
-	mail_html_write (mfd->html, mfd->stream, "</td></tr></table>");
-}
-
-static gboolean
-handle_audio (CamelMimePart *part, const char *mime_type,
-	      struct mail_format_data *mfd)
-{
-	char *id;
-	const char *desc;
-
-	desc = gnome_mime_get_value (mime_type, "description");
-	if (desc)
-		id = g_strdup_printf ("%s data", desc);
-	else {
-		id = g_strdup_printf ("Audio data in \"%s\" format.",
-				      mime_type);
-	}
-	handle_mystery (part, mfd, get_cid (part, mfd), "gnome-audio2.png",
-			id, "play it");
-	g_free (id);
-
-	return TRUE;
-}
-
-static gboolean
-handle_message_rfc822 (CamelMimePart *part, const char *mime_type,
-		       struct mail_format_data *mfd)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (wrapper), FALSE);
-
-	mail_html_write (mfd->html, mfd->stream, "<blockquote>");
-	mail_format_mime_message (CAMEL_MIME_MESSAGE (wrapper),
-				  mfd->html, mfd->stream, mfd->root);
-	mail_html_write (mfd->html, mfd->stream, "</blockquote>");
-
-	return TRUE;
-}
-
-static gboolean
-handle_message_external_body (CamelMimePart *part, const char *mime_type,
-			      struct mail_format_data *mfd)
-{
-	GMimeContentField *type;
-	const char *access_type;
-	char *url = NULL, *desc = NULL;
-
-	type = camel_mime_part_get_content_type (part);
-	access_type = gmime_content_field_get_parameter (type, "access-type");
-	if (!access_type)
-		goto fallback;
-
-	if (!g_strcasecmp (access_type, "ftp") ||
-	    !g_strcasecmp (access_type, "anon-ftp")) {
-		const char *name, *site, *dir, *mode, *ftype;
-		char *path;
-
-		name = gmime_content_field_get_parameter (type, "name");
-		site = gmime_content_field_get_parameter (type, "site");
-		if (name == NULL || site == NULL)
-			goto fallback;
-		dir = gmime_content_field_get_parameter (type, "directory");
-		mode = gmime_content_field_get_parameter (type, "mode");
-
-		/* Generate the path. */
-		if (dir) {
-			const char *p = dir + strlen (dir);
-
-			path = g_strdup_printf ("%s%s%s%s",
-						*dir == '/' ? "" : "/",
-						dir,
-						*p == '/' ? "" : "/",
-						name);
-		} else {
-			path = g_strdup_printf ("%s%s",
-						*name == '/' ? "" : "/",
-						name);
-		}
-
-		if (mode && *mode == 'A')
-			ftype = ";type=A";
-		else if (mode && *mode == 'I')
-			ftype = ";type=I";
-		else
-			ftype = "";
-
-		url = g_strdup_printf ("ftp://%s%s%s", site, path, ftype);
-		g_free (path);
-		desc = g_strdup_printf ("Pointer to FTP site (%s)", url);
-	} else if (!g_strcasecmp (access_type, "local-file")) {
-		const char *name, *site;
-
-		name = gmime_content_field_get_parameter (type, "name");
-		if (name == NULL)
-			goto fallback;
-		site = gmime_content_field_get_parameter (type, "site");
-
-		url = g_strdup_printf ("file://%s%s", *name == '/' ? "" : "/",
-				       name);
-		desc = g_strdup_printf ("Pointer to local file (%s)%s%s%s",
-					name, site ? " valid at site \"" : "",
-					site ? site : "", site ? "\"" : "");
-	} else if (!g_strcasecmp (access_type, "URL")) {
-		const char *urlparam;
-		char *s, *d;
-
-		/* RFC 2017 */
-
-		urlparam = gmime_content_field_get_parameter (type, "url");
-		if (urlparam == NULL)
-			goto fallback;
-
-		/* For obscure MIMEy reasons, the URL may be split into
-		 * multiple words, and needs to be rejoined. (The URL
-		 * must have any real whitespace %-encoded, so we just
-		 * get rid of all of it.
-		 */
-		url = g_strdup (urlparam);
-		s = d = url;
-
-		while (*s) {
-			if (!isspace ((unsigned char)*s))
-				*d++ = *s;
-			s++;
-		}
-		*d = *s;
-
-		desc = g_strdup_printf ("Pointer to remote data (%s)", url);
-	}
-
- fallback:
-	if (!desc) {
-		if (access_type) {
-			desc = g_strdup_printf ("Pointer to unknown external "
-						"data (\"%s\" type)",
-						access_type);
-		} else
-			desc = g_strdup ("Malformed external-body part.");
-	}
-
-	handle_mystery (part, mfd, url, "gnome-globe.png", desc,
-			url ? "open it in a browser" : NULL);
-
-	g_free (desc);
-	g_free (url);
-	return TRUE;
-}
-
-static gboolean
-handle_undisplayable (CamelMimePart *part, const char *mime_type,
-		      struct mail_format_data *mfd)
-{
-	const char *desc;
-	char *id;
-
-	desc = gnome_mime_get_value (mime_type, "description");
-	if (desc)
-		id = g_strdup (desc);
-	else
-		id = g_strdup_printf ("Data of type \"%s\".", mime_type);
-	handle_mystery (part, mfd, get_cid (part, mfd), "gnome-question.png",
-			id, "save it to disk");
-	g_free (id);
-
-	return TRUE;
-}
-
-static gboolean
-handle_unknown_type (CamelMimePart *part, const char *mime_type,
-		     struct mail_format_data *mfd)
-{
-	char *type;
-
-	/* Don't give up quite yet. */
-	type = mail_identify_mime_part (part);
-	if (type) {
-		mime_handler_fn handler_function;
-		gboolean generic, output;
-
-		handler_function = lookup_handler (type, &generic);
-		if (handler_function &&
-		    handler_function != handle_unknown_type) {
-			output = (*handler_function) (part, type, mfd);
-			g_free (type);
-			return output;
-		}
-	} else
-		type = g_strdup (mime_type);
-
-	/* OK. Give up. */
-	handle_undisplayable (part, type, mfd);
-	g_free (type);
-
-	return TRUE;
-}
-
-static gboolean
-handle_via_bonobo (CamelMimePart *part, const char *mime_type,
-		   struct mail_format_data *mfd)
-{
-	mail_html_write (mfd->html, mfd->stream,
-			 "<object classid=\"%s\" type=\"%s\">",
-			 get_cid (part, mfd), mime_type);
-
-	/* Call handle_undisplayable to output its HTML inside the
-	 * <object> ... </object>. It will only be displayed if the
-	 * object loading fails.
-	 */
-	handle_undisplayable (part, mime_type, mfd);
-
-	mail_html_write (mfd->html, mfd->stream, "</object>");
-
-	return TRUE;
-}
-
-static char *
-reply_body (CamelDataWrapper *data, gboolean want_plain, gboolean *is_html)
-{
-	CamelMultipart *mp;
-	CamelMimePart *subpart;
-	int i, nparts;
-	char *subtext, *old;
-	const char *boundary, *disp;
-	char *text = NULL;
-	GMimeContentField *mime_type;
-
-	/* We only include text, message, and multipart bodies. */
-	mime_type = camel_data_wrapper_get_mime_type_field (data);
-
-	/* FIXME: This is wrong. We don't want to include large
-	 * images. But if we don't do it this way, we don't get
-	 * the headers...
-	 */
-	if (g_strcasecmp (mime_type->type, "message") == 0) {
-		*is_html = FALSE;
-		return get_data_wrapper_text (data);
-	}
-
-	if (g_strcasecmp (mime_type->type, "text") == 0) {
-		*is_html = !g_strcasecmp (mime_type->subtype, "html");
-		return get_data_wrapper_text (data);
-	}
-
-	/* If it's not message and it's not text, and it's not
-	 * multipart, we don't want to deal with it.
-	 */
-	if (g_strcasecmp (mime_type->type, "multipart") != 0)
-		return NULL;
-
-	mp = CAMEL_MULTIPART (data);
-
-	if (g_strcasecmp (mime_type->subtype, "alternative") == 0) {
-		/* Pick our favorite alternative and reply to it. */
-
-		subpart = find_preferred_alternative (mp, want_plain);
-		if (!subpart)
-			return NULL;
-
-		data = camel_medium_get_content_object (
-			CAMEL_MEDIUM (subpart));
-		return reply_body (data, want_plain, is_html);
-	}
-
-	nparts = camel_multipart_get_number (mp);
-
-	/* Otherwise, concatenate all the parts that we can. If we find
-	 * an HTML part in there though, return just that: We don't want
-	 * to deal with merging HTML and non-HTML parts.
-	 */
-	boundary = camel_multipart_get_boundary (mp);
-	for (i = 0; i < nparts; i++) {
-		subpart = camel_multipart_get_part (mp, i);
-
-		disp = camel_mime_part_get_disposition (subpart);
-		if (disp && g_strcasecmp (disp, "inline") != 0)
-			continue;
-
-		data = camel_medium_get_content_object (
-			CAMEL_MEDIUM (subpart));
-		subtext = reply_body (data, want_plain, is_html);
-		if (!subtext)
-			continue;
-		if (*is_html) {
-			g_free (text);
-			return subtext;
-		}
-
-		if (text) {
-			old = text;
-			text = g_strdup_printf ("%s\n--%s\n%s", text,
-						boundary, subtext);
-			g_free (subtext);
-			g_free (old);
-		} else
-			text = subtext;
-	}
-
-	if (!text)
-		return NULL;
-
-	return text;
-}
-
-EMsgComposer *
-mail_generate_reply (CamelMimeMessage *message, gboolean to_all)
-{
-	CamelDataWrapper *contents;
-	char *text, *subject, *path, *string;
-	EMsgComposer *composer;
-	gboolean want_plain, is_html;
-	const char *repl_to, *message_id, *references;
-	GList *to, *cc;
-
-	path = g_strdup_printf ("=%s/config=/mail/msg_format", evolution_dir);
-	string = gnome_config_get_string (path);
-	g_free (path);
-	want_plain = string && !strcasecmp (string, "plain");
-
-	contents = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	text = reply_body (contents, want_plain, &is_html);
-
-	composer = E_MSG_COMPOSER (e_msg_composer_new ());
-
-	/* Set the quoted reply text. */
-	if (text) {
-		char *repl_text;
-
-		if (is_html) {
-			repl_text = g_strdup_printf ("<blockquote><i>\n%s\n"
-						     "</i></blockquote>\n",
-						     text);
-		} else {
-			char *s, *d, *quoted_text;
-			int lines, len;
-
-			/* Count the number of lines in the body. If
-			 * the text ends with a \n, this will be one
-			 * too high, but that's ok. Allocate enough
-			 * space for the text and the "> "s.
-			 */
-			for (s = text, lines = 0; s; s = strchr (s + 1, '\n'))
-				lines++;
-			quoted_text = g_malloc (strlen (text) + lines * 2);
-
-			s = text;
-			d = quoted_text;
-
-			/* Copy text to quoted_text line by line,
-			 * prepending "> ".
-			 */
-			while (1) {
-				len = strcspn (s, "\n");
-				if (len == 0 && !*s)
-					break;
-				sprintf (d, "> %.*s\n", len, s);
-				s += len;
-				if (!*s++)
-					break;
-				d += len + 3;
-			}
-
-			/* Now convert that to HTML. */
-			repl_text = e_text_to_html (quoted_text,
-						    E_TEXT_TO_HTML_PRE);
-			g_free (quoted_text);
-		}
-		e_msg_composer_set_body_text (composer, repl_text);
-		g_free (repl_text);
-		g_free (text);
-	}
-
-	/* Set the recipients */
-	repl_to = camel_mime_message_get_reply_to (message);
-	if (!repl_to)
-		repl_to = camel_mime_message_get_from (message);
-	to = g_list_append (NULL, (gpointer)repl_to);
-
-	if (to_all) {
-		const CamelInternetAddress *recip;
-		const char *name, *addr;
-		char *fulladdr;
-		int i;
-
-		recip = camel_mime_message_get_recipients (message, 
-			CAMEL_RECIPIENT_TYPE_TO);
-		i = 0;
-		cc = NULL;
-		while (camel_internet_address_get (recip, i++, &name, &addr)) {
-			fulladdr = g_strdup_printf ("%s <%s>", name, addr);
-			cc = g_list_append (cc, fulladdr);
-		}
-
-		recip = camel_mime_message_get_recipients (message,
-			CAMEL_RECIPIENT_TYPE_CC);
-		i = 0;
-		while (camel_internet_address_get (recip, i++, &name, &addr)) {
-			fulladdr = g_strdup_printf ("%s <%s>", name, addr);
-			cc = g_list_append (cc, fulladdr);
-		}
-	} else
-		cc = NULL;
-
-	/* Set the subject of the new message. */
-	subject = (char *)camel_mime_message_get_subject (message);
-	if (!subject)
-		subject = g_strdup ("");
-	else {
-		while (*subject == ' ')
-			subject++;
-
-		if (!strncasecmp (subject, "Re: ", 4))
-			subject = g_strdup (subject);
-		else
-			subject = g_strdup_printf ("Re: %s", subject);
-	}
-
-	e_msg_composer_set_headers (composer, to, cc, NULL, subject);
-	g_list_free (to);
-	g_list_free (cc);
-	g_free (subject);
-
-	/* Add In-Reply-To and References. */
-	message_id = camel_medium_get_header (CAMEL_MEDIUM (message),
-					      "Message-Id");
-	references = camel_medium_get_header (CAMEL_MEDIUM (message),
-					      "References");
-	if (message_id) {
-		e_msg_composer_add_header (composer, "In-Reply-To",
-					   message_id);
-		if (references) {
-			char *reply_refs;
-			reply_refs = g_strdup_printf ("%s %s", references,
-						      message_id);
-			e_msg_composer_add_header (composer, "References",
-						   reply_refs);
-			g_free (reply_refs);
-		}
-	} else if (references)
-		e_msg_composer_add_header (composer, "References", references);
-
-	return composer;
-}
-
-EMsgComposer *
-mail_generate_forward (CamelMimeMessage *mime_message,
-		       gboolean forward_as_attachment,
-		       gboolean keep_attachments)
-{
-	EMsgComposer *composer;
-	CamelMimePart *part;
-
-	if (!forward_as_attachment)
-		g_warning ("Forward as non-attachment not implemented.");
-	if (!keep_attachments)
-		g_warning ("Forwarding without attachments not implemented.");
-
-	composer = E_MSG_COMPOSER (e_msg_composer_new ());
-
-	part = camel_mime_part_new ();
-	camel_mime_part_set_disposition (part, "inline");
-	camel_mime_part_set_description (part, "forwarded message");
-	camel_medium_set_content_object (CAMEL_MEDIUM (part),
-					 CAMEL_DATA_WRAPPER (mime_message));
-	camel_mime_part_set_content_type (part, "message/rfc822");
-
-	e_msg_composer_attach (composer, part);
-	gtk_object_unref (GTK_OBJECT (part));
-
-	/* FIXME: should we default a subject? */
-
-	return composer;
-}
diff --git a/mail/mail-identify.c b/mail/mail-identify.c
deleted file mode 100644
index 8b8e61487d..0000000000
--- a/mail/mail-identify.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Dan Winship <danw@helixcode.com>
- *
- *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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 Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-#include <libgnome/libgnome.h>
-#include "mail.h"
-
-/**
- * mail_identify_mime_part:
- * @part: a CamelMimePart
- *
- * Try to identify the MIME type of the data in @part (which presumably
- * doesn't have a useful Content-Type).
- **/
-char *
-mail_identify_mime_part (CamelMimePart *part)
-{
-	GMimeContentField *content_type;
-	const char *filename, *type;
-
-	content_type = camel_mime_part_get_content_type (part);
-
-
-	/* Try identifying based on name in Content-Type or
-	 * filename in Content-Disposition.
-	 */
-	filename = gmime_content_field_get_parameter (content_type, "name");
-	if (filename) {
-		type = gnome_mime_type_or_default (filename, NULL);
-		if (type)
-			return g_strdup (type);
-	}
-
-	filename = camel_mime_part_get_filename (part);
-	if (filename) {
-		type = gnome_mime_type_or_default (filename, NULL);
-		if (type)
-			return g_strdup (type);
-	}
-
-
-	/* Try file magic. */
-	/* FIXME */
-
-
-	/* Another possibility to try is the x-mac-type / x-mac-creator
-	 * parameter to Content-Type used by some Mac email clients. That
-	 * would require a Mac type to mime type conversion table.
-	 */
-
-
-	/* We give up. */
-	return NULL;
-}
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
deleted file mode 100644
index feddab24e2..0000000000
--- a/mail/mail-ops.c
+++ /dev/null
@@ -1,796 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-ops.c: callbacks for the mail toolbar/menus */
-
-/* 
- * Author : 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-#include <config.h>
-#include <errno.h>
-#include <gnome.h>
-#include "mail.h"
-#include "mail-threads.h"
-#include "folder-browser.h"
-#include "e-util/e-setup.h"
-#include "filter/filter-editor.h"
-#include "filter/filter-driver.h"
-#include "widgets/e-table/e-table.h"
-
-/* FIXME: is there another way to do this? */
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#ifndef HAVE_MKSTEMP
-#include <fcntl.h>
-#include <sys/stat.h>
-#endif
-
-struct post_send_data {
-	CamelFolder *folder;
-	const char *uid;
-	guint32 flags;
-};
-
-typedef struct rfm_s { 
-	FolderBrowser *fb; 
-	char *source_url; 
-} rfm_t;
-
-typedef struct rsm_s {
-	EMsgComposer *composer;
-	CamelTransport *transport;
-	CamelMimeMessage *message;
-	const char *subject;
-	char *from;
-	struct post_send_data *psd;
-	gboolean ok;
-} rsm_t;
-
-static void
-real_fetch_mail( gpointer user_data );
-
-static void
-real_send_mail( gpointer user_data );
-
-static void
-cleanup_send_mail( gpointer userdata );
-
-static void
-mail_exception_dialog (char *head, CamelException *ex, gpointer widget)
-{
-	char *msg;
-	GtkWindow *window =
-		GTK_WINDOW (gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW));
-
-	msg = g_strdup_printf ("%s:\n%s", head,
-			       camel_exception_get_description (ex));
-	gnome_error_dialog_parented (msg, window);
-	g_free (msg);
-}
-
-static void
-async_mail_exception_dialog (char *head, CamelException *ex, gpointer unused )
-{
-	mail_op_error( "%s: %s", head, camel_exception_get_description( ex ) );
-}
-
-static gboolean
-check_configured (void)
-{
-	char *path;
-	gboolean configured;
-
-	path = g_strdup_printf ("=%s/config=/mail/configured", evolution_dir);
-	if (gnome_config_get_bool (path)) {
-		g_free (path);
-		return TRUE;
-	}
-
-	mail_config_druid ();
-
-	configured = gnome_config_get_bool (path);
-	g_free (path);
-	return configured;
-}
-
-void
-real_fetch_mail (gpointer user_data )
-{
-	rfm_t *info;
-	FolderBrowser *fb = NULL;
-	CamelException *ex;
-	CamelStore *store = NULL;
-	CamelFolder *folder = NULL;
-	char *path, *url = NULL;
-	FilterDriver *filter = NULL;
-	char *userrules, *systemrules;
-	char *tmp_mbox = NULL, *source;
-
-	info = (rfm_t *) user_data;
-	fb = info->fb;
-	url = info->source_url;
-
-	path = CAMEL_SERVICE (fb->folder->parent_store)->url->path;
-	ex = camel_exception_new ();
-
-	tmp_mbox = g_strdup_printf ("%s/movemail", path);
-
-	/* If fetching mail from an mbox store, safely copy it to a
-	 * temporary store first.
-	 */
-	if (!strncmp (url, "mbox:", 5)) {
-		int tmpfd;
-
-		printf("moving from a local mbox\n");
-
-		tmpfd = open (tmp_mbox, O_RDWR | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
-
-		if (tmpfd == -1) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "Couldn't create temporary "
-					      "mbox: %s", g_strerror (errno));
-			async_mail_exception_dialog ("Unable to move mail", ex, fb );
-			goto cleanup;
-		}
-		close (tmpfd);
-
-		/* Skip over "mbox:" plus host part (if any) of url. */
-		source = url + 5;
-		if (!strncmp (source, "//", 2))
-			source = strchr (source + 2, '/');
-
-		switch (camel_movemail (source, tmp_mbox, ex)) {
-		case -1:
-			async_mail_exception_dialog ("Unable to move mail", ex, fb);
-			/* FALL THROUGH */
-
-		case 0:
-			goto cleanup;
-		}
-
-		folder = camel_store_get_folder (fb->folder->parent_store,
-						 strrchr (tmp_mbox, '/') + 1,
-						 FALSE, ex);
-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-			async_mail_exception_dialog ("Unable to move mail", ex, fb);
-			goto cleanup;
-		}
-	} else {
-		CamelFolder *sourcefolder;
-
-		store = camel_session_get_store (session, url, ex);
-		if (!store) {
-			async_mail_exception_dialog ("Unable to get new mail", ex, fb);
-			goto cleanup;
-		}
-		camel_service_connect (CAMEL_SERVICE (store), ex);
-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-			if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_USER_CANCEL)
-				async_mail_exception_dialog ("Unable to get new mail", ex, fb);
-			goto cleanup;
-		}
-
-		sourcefolder = camel_store_get_folder (store, "inbox",
-						       FALSE, ex);
-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-			async_mail_exception_dialog ("Unable to get new mail", ex, fb);
-			goto cleanup;
-		}
-
-		/* can we perform filtering on this source? */
-		if (!(sourcefolder->has_summary_capability
-		      && sourcefolder->has_search_capability)) {
-			GPtrArray *uids;
-			int i;
-
-			printf("folder isn't searchable, performing movemail ...\n");
-
-			folder = camel_store_get_folder (fb->folder->parent_store,
-							 strrchr (tmp_mbox, '/') + 1,
-							 TRUE, ex);
-			if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-				async_mail_exception_dialog ("Unable to move mail", ex, fb);
-				goto cleanup;
-			}
-			
-			uids = camel_folder_get_uids (sourcefolder, ex);
-			printf("got %d messages in source\n", uids->len);
-			for (i = 0; i < uids->len; i++) {
-				CamelMimeMessage *msg;
-				printf("copying message %d to dest\n", i + 1);
-				msg = camel_folder_get_message_by_uid (sourcefolder, uids->pdata[i], ex);
-				if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-					async_mail_exception_dialog ("Unable to read message", ex, fb);
-					gtk_object_unref((GtkObject *)msg);
-					gtk_object_unref((GtkObject *)sourcefolder);
-					goto cleanup;
-				}
-
-				camel_folder_append_message (folder, msg, ex);
-				if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-					async_mail_exception_dialog ("Unable to write message", ex, fb);
-					gtk_object_unref((GtkObject *)msg);
-					gtk_object_unref((GtkObject *)sourcefolder);
-					goto cleanup;
-				}
-
-				camel_folder_delete_message_by_uid(sourcefolder, uids->pdata[i], ex);
-				gtk_object_unref((GtkObject *)msg);
-			}
-			camel_folder_free_uids (sourcefolder, uids);
-			camel_folder_sync (sourcefolder, TRUE, ex);
-			if (camel_exception_is_set (ex))
-				async_mail_exception_dialog ("", ex, fb);
-			gtk_object_unref((GtkObject *)sourcefolder);
-		} else {
-			printf("we can search on this folder, performing search!\n");
-			folder = sourcefolder;
-		}
-	}
-
-	if (camel_folder_get_message_count (folder, ex) == 0) {
-		gnome_ok_dialog ("No new messages.");
-		goto cleanup;
-	} else if (camel_exception_is_set (ex)) {
-		async_mail_exception_dialog ("Unable to get new mail", ex, fb);
-		goto cleanup;
-	}
-
-	folder_browser_clear_search (fb);
-
-	/* apply filtering rules to this inbox */
-	filter = filter_driver_new();
-	userrules = g_strdup_printf ("%s/filters.xml", evolution_dir);
-	systemrules = g_strdup_printf("%s/evolution/filtertypes.xml", EVOLUTION_DATADIR);
-	filter_driver_set_rules(filter, systemrules, userrules);
-	filter_driver_set_session(filter, session);
-	g_free(userrules);
-	g_free(systemrules);
-
-	if (filter_driver_run(filter, folder, fb->folder) == -1) {
-		async_mail_exception_dialog ("Unable to get new mail", ex, fb);
-		goto cleanup;
-	}
-
-	/* Redisplay. Ick. FIXME */
-	path = g_strdup_printf ("file://%s", path);
-	folder_browser_set_uri (fb, path);
-	g_free (path);
-
- cleanup:
-	g_free(tmp_mbox);
-
-	if (filter)
-		gtk_object_unref((GtkObject *)filter);
-	if (url)
-		g_free (url);
-	if (folder) {
-		camel_folder_sync (folder, TRUE, ex);
-		gtk_object_unref (GTK_OBJECT (folder));
-	}
-	if (store) {
-		camel_service_disconnect (CAMEL_SERVICE (store), ex);
-		gtk_object_unref (GTK_OBJECT (store));
-	}
-	camel_exception_free (ex);
-}
-
-/* FIXME: This is BROKEN! It fetches mail into whatever folder you're
- * currently viewing.
- */
-void
-fetch_mail (GtkWidget *button, gpointer user_data)
-{
-	char *path, *url = NULL;
-	rfm_t *info;
-
-	if (!check_configured ())
-		return;
-
-	path = g_strdup_printf ("=%s/config=/mail/source", evolution_dir);
-	url = gnome_config_get_string (path);
-	g_free (path);
-
-	if (!url) {
-		GtkWidget *win = gtk_widget_get_ancestor (GTK_WIDGET (user_data),
-							  GTK_TYPE_WINDOW);
-
-		gnome_error_dialog_parented ("You have no remote mail source "
-					     "configured", GTK_WINDOW (win));
-		return;
-	}
-
-	/* This must be dynamically allocated so as not to be clobbered
-	 * when we return. Actually, making it static in the whole file
-	 * would probably work.
-	 */
-
-	info = g_new( rfm_t, 1 );
-	info->fb = FOLDER_BROWSER( user_data );
-	info->source_url = url;
-	mail_operation_try( _("Fetching mail"), real_fetch_mail, NULL, info );
-}
-
-static gboolean
-ask_confirm_for_empty_subject (EMsgComposer *composer)
-{
-	GtkWidget *message_box;
-	int button;
-
-	message_box = gnome_message_box_new (_("This message has no subject.\nReally send?"),
-					     GNOME_MESSAGE_BOX_QUESTION,
-					     GNOME_STOCK_BUTTON_YES, GNOME_STOCK_BUTTON_NO,
-					     NULL);
-
-	button = gnome_dialog_run_and_close (GNOME_DIALOG (message_box));
-
-	if (button == 0)
-		return TRUE;
-	else
-		return FALSE;
-}
-
-static void
-real_send_mail( gpointer user_data )
-{
-	rsm_t *info = (rsm_t *) user_data;
-	EMsgComposer *composer = NULL;
-	CamelTransport *transport = NULL;
-	CamelException *ex = NULL;
-	CamelMimeMessage *message = NULL;
-	const char *subject = NULL;
-	char *from = NULL;
-	struct post_send_data *psd = NULL;
-
-	mail_op_hide_progressbar();
-	mail_op_set_message( "Connecting to transport..." );
-
-	ex = camel_exception_new ();
-	composer = info->composer;
-	transport = info->transport;
-	message = info->message;
-	subject = info->subject;
-	from = info->from;
-	psd = info->psd;
-
-	camel_mime_message_set_from (message, from);
-	camel_medium_add_header (CAMEL_MEDIUM (message), "X-Mailer",
-				 "Evolution (Developer Preview)");
-	camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-
-	camel_service_connect (CAMEL_SERVICE (transport), ex);
-
-	mail_op_set_message( "Connected. Sending..." );
-
-	if (!camel_exception_is_set (ex))
-		camel_transport_send (transport, CAMEL_MEDIUM (message), ex);
-
-	if (!camel_exception_is_set (ex)) {
-		mail_op_set_message( "Sent. Disconnecting..." );
-		camel_service_disconnect (CAMEL_SERVICE (transport), ex);
-	}
-
-	if (camel_exception_is_set (ex)) {
-		async_mail_exception_dialog ("Could not send message", ex, composer);
-		info->ok = FALSE;
-	} else {
-		if (psd) {
-			guint32 set;
-
-			set = camel_folder_get_message_flags (psd->folder,
-							      psd->uid, ex);
-			camel_folder_set_message_flags (psd->folder, psd->uid,
-							psd->flags, ~set, ex);
-		}
-		info->ok = TRUE;
-
-	}
-
-	camel_exception_free (ex);
-}
-
-static void
-cleanup_send_mail( gpointer userdata )
-{
-	rsm_t *info = (rsm_t *) userdata;
-	
-	if( info->ok ) {
-		gtk_object_destroy (GTK_OBJECT (info->composer));
-	}
-
-	gtk_object_unref (GTK_OBJECT (info->message));
-	g_free( info );
-}
-
-static void
-composer_send_cb (EMsgComposer *composer, gpointer data)
-{
-	static CamelTransport *transport = NULL;
-	struct post_send_data *psd = data;
-	rsm_t *info;
-	static char *from = NULL;
-	const char *subject;
-	CamelException *ex;
-	CamelMimeMessage *message;
-	char *name, *addr, *path;
-
-	ex = camel_exception_new ();
-
-	if (!from) {
-		CamelInternetAddress *ciaddr;
-
-		path = g_strdup_printf ("=%s/config=/mail/id_name",
-					evolution_dir);
-		name = gnome_config_get_string (path);
-		g_assert (name);
-		g_free (path);
-		path = g_strdup_printf ("=%s/config=/mail/id_addr",
-					evolution_dir);
-		addr = gnome_config_get_string (path);
-		g_assert (addr);
-		g_free (path);
-
-		ciaddr = camel_internet_address_new ();
-		camel_internet_address_add (ciaddr, name, addr);
-
-		from = camel_address_encode (CAMEL_ADDRESS (ciaddr));
-	}
-
-	if (!transport) {
-		char *url;
-
-		path = g_strdup_printf ("=%s/config=/mail/transport",
-					evolution_dir);
-		url = gnome_config_get_string (path);
-		g_assert (url);
-		g_free (path);
-
-		transport = camel_session_get_transport (session, url, ex);
-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-			mail_exception_dialog ("Could not load mail transport",
-					       ex, composer);
-			camel_exception_free (ex);
-			return;
-		}
-	}
-
-	message = e_msg_composer_get_message (composer);
-
-	subject = camel_mime_message_get_subject (message);
-	if (subject == NULL || subject[0] == '\0') {
-		if (! ask_confirm_for_empty_subject (composer)) {
-			gtk_object_unref (GTK_OBJECT (message));
-			return;
-		}
-	}
-
-	info = g_new0( rsm_t, 1 );
-	info->composer = composer;
-	info->transport = transport;
-	info->message = message;
-	info->subject = subject;
-	info->from = from;
-	info->psd = psd;
-
-	mail_operation_try( "Send Message", real_send_mail, cleanup_send_mail, info );
-}
-
-static void
-free_psd (GtkWidget *composer, gpointer user_data)
-{
-	struct post_send_data *psd = user_data;
-
-	gtk_object_unref (GTK_OBJECT (psd->folder));
-	g_free (psd);
-}
-
-void
-send_msg (GtkWidget *widget, gpointer user_data)
-{
-	GtkWidget *composer;
-
-	if (!check_configured ())
-		return;
-
-	composer = e_msg_composer_new ();
-
-	gtk_signal_connect (GTK_OBJECT (composer), "send",
-			    GTK_SIGNAL_FUNC (composer_send_cb), NULL);
-	gtk_widget_show (composer);
-}
-
-/* Send according to a mailto (RFC 2368) URL. */
-void
-send_to_url (const char *url)
-{
-	GtkWidget *composer;
-
-	if (!check_configured ())
-		return;
-
-	composer = e_msg_composer_new_from_url (url);
-
-	gtk_signal_connect (GTK_OBJECT (composer), "send",
-			    GTK_SIGNAL_FUNC (composer_send_cb), NULL);
-	gtk_widget_show (composer);
-}	
-
-static void
-reply (FolderBrowser *fb, gboolean to_all)
-{
-	EMsgComposer *composer;
-	struct post_send_data *psd;
-
-	if (!check_configured ())
-		return;
-
-	psd = g_new (struct post_send_data, 1);
-	psd->folder = fb->folder;
-	gtk_object_ref (GTK_OBJECT (psd->folder));
-	psd->uid = fb->message_list->selected_uid;
-	psd->flags = CAMEL_MESSAGE_ANSWERED;
-
-	composer = mail_generate_reply (fb->mail_display->current_message,
-					to_all);
-
-	gtk_signal_connect (GTK_OBJECT (composer), "send",
-			    GTK_SIGNAL_FUNC (composer_send_cb), psd); 
-	gtk_signal_connect (GTK_OBJECT (composer), "destroy",
-			    GTK_SIGNAL_FUNC (free_psd), psd); 
-
-	gtk_widget_show (GTK_WIDGET (composer));	
-}
-
-void
-reply_to_sender (GtkWidget *button, gpointer user_data)
-{
-	reply (FOLDER_BROWSER (user_data), FALSE);
-}
-
-void
-reply_to_all (GtkWidget *button, gpointer user_data)
-{
-	reply (FOLDER_BROWSER (user_data), TRUE);
-}
-
-
-void
-forward_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb;
-	EMsgComposer *composer;
-
-	if (!check_configured ())
-		return;
-
-	fb = FOLDER_BROWSER (user_data);
-	composer = mail_generate_forward (fb->mail_display->current_message,
-					  TRUE, TRUE);
-
-	gtk_signal_connect (GTK_OBJECT (composer), "send",
-			    GTK_SIGNAL_FUNC (composer_send_cb), NULL);
-
-	gtk_widget_show (GTK_WIDGET (composer));	
-}
-
-void
-delete_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = user_data;
-	MessageList *ml = fb->message_list;
-	CamelException ex;
-	guint32 flags;
-
-	if (!fb->mail_display->current_message)
-		return;
-
-	camel_exception_init (&ex);
-
-	flags = camel_folder_get_message_flags (fb->folder, ml->selected_uid,
-						&ex);
-	if (!camel_exception_is_set (&ex)) {
-		/* Toggle the deleted flag without touching other flags. */
-		camel_folder_set_message_flags (fb->folder, ml->selected_uid,
-						CAMEL_MESSAGE_DELETED,
-						~flags, &ex);
-	}
-
-	if (camel_exception_is_set (&ex)) {
-		mail_exception_dialog ("Could not toggle deleted flag",
-				       &ex, fb);
-		camel_exception_clear (&ex);
-		return;
-	}
-
-	/* Move the cursor down a row... FIXME: should skip other
-	 * deleted messages.
-	 */
-	e_table_select_row (E_TABLE (ml->etable), ml->selected_row + 1);
-}
-
-static void real_expunge_folder( gpointer user_data )
-{
-	FolderBrowser *fb = FOLDER_BROWSER(user_data);
-	CamelException ex;
-
-	mail_op_hide_progressbar();
-	mail_op_set_message( "Expunging %s...", fb->message_list->folder->full_name );
-
-	camel_exception_init(&ex);
-
-	camel_folder_expunge(fb->message_list->folder, &ex);
-
-	/* FIXME: is there a better way to force an update? */
-	/* FIXME: Folder should raise a signal to say its contents has changed ... */
-	e_table_model_changed (fb->message_list->table_model);
-
-	if (camel_exception_get_id (&ex) != CAMEL_EXCEPTION_NONE) {
-		async_mail_exception_dialog ("Unable to expunge deleted messages", &ex, fb);
-	}
-}
-
-void
-expunge_folder (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER(user_data);
-
-	if (fb->message_list->folder) {
-		mail_operation_try( "Expunge Folder", real_expunge_folder, NULL, fb );
-	}
-}
-
-static void
-filter_druid_clicked(FilterEditor *fe, int button, FolderBrowser *fb)
-{
-	printf("closing dialog\n");
-	if (button == 0) {
-		char *user;
-
-		user = g_strdup_printf ("%s/filters.xml", evolution_dir);
-		filter_editor_save_rules(fe, user);
-		printf("saving filter options to '%s'\n", user);
-		g_free(user);
-	}
-	if (button != -1) {
-		gnome_dialog_close((GnomeDialog *)fe);
-	}
-}
-
-void
-filter_edit (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER(user_data);
-	FilterEditor *fe;
-	char *user, *system;
-
-	printf("Editing filters ...\n");
-	fe = filter_editor_new();
-
-	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
-	system = g_strdup_printf("%s/evolution/filtertypes.xml", EVOLUTION_DATADIR);
-	filter_editor_set_rule_files(fe, system, user);
-	g_free(user);
-	g_free(system);
-	gnome_dialog_append_buttons((GnomeDialog *)fe, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, 0);
-	gtk_signal_connect((GtkObject *)fe, "clicked", filter_druid_clicked, fb);
-	gtk_widget_show((GtkWidget *)fe);
-}
-
-static void
-vfolder_editor_clicked(FilterEditor *fe, int button, FolderBrowser *fb)
-{
-	printf("closing dialog\n");
-	if (button == 0) {
-		char *user;
-
-		user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-		filter_editor_save_rules(fe, user);
-		printf("saving vfolders to '%s'\n", user);
-		g_free(user);
-
-		/* FIXME: this is also not the way to do this, see also
-		   component-factory.c */
-		{
-			EvolutionStorage *storage;
-			FilterDriver *fe;
-			int i, count;
-			char *user, *system;
-			extern char *evolution_dir;
-
-			storage = gtk_object_get_data((GtkObject *)fb, "e-storage");
-	
-			fe = filter_driver_new();
-			user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-			system = g_strdup_printf("%s/evolution/vfoldertypes.xml", EVOLUTION_DATADIR);
-			filter_driver_set_rules(fe, system, user);
-			g_free(user);
-			g_free(system);
-			count = filter_driver_rule_count(fe);
-			for (i=0;i<count;i++) {
-				struct filter_option *fo;
-				GString *query;
-				struct filter_desc *desc = NULL;
-				char *desctext, descunknown[64];
-				char *name;
-				
-				fo = filter_driver_rule_get(fe, i);
-				if (fo == NULL)
-					continue;
-				query = g_string_new("");
-				if (fo->description)
-					desc = fo->description->data;
-				if (desc)
-					desctext = desc->data;
-				else {
-					sprintf(descunknown, "volder-%p", fo);
-					desctext = descunknown;
-				}
-				g_string_sprintf(query, "vfolder:/%s/vfolder/%s?", evolution_dir, desctext);
-				filter_driver_expand_option(fe, query, NULL, fo);
-				name = g_strdup_printf("/%s", desctext);
-				printf("Adding new vfolder: %s\n", query->str);
-				evolution_storage_new_folder (storage, name,
-							      "mail",
-							      query->str,
-							      name+1);
-				g_string_free(query, TRUE);
-				g_free(name);
-			}
-			gtk_object_unref((GtkObject *)fe);
-		}
-
-	}
-	if (button != -1) {
-		gnome_dialog_close((GnomeDialog *)fe);
-	}
-}
-
-void
-vfolder_edit (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER(user_data);
-	FilterEditor *fe;
-	char *user, *system;
-
-	printf("Editing vfolders ...\n");
-	fe = filter_editor_new();
-
-	user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-	system = g_strdup_printf("%s/evolution/vfoldertypes.xml", EVOLUTION_DATADIR);
-	filter_editor_set_rule_files(fe, system, user);
-	g_free(user);
-	g_free(system);
-	gnome_dialog_append_buttons((GnomeDialog *)fe, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, 0);
-	gtk_signal_connect((GtkObject *)fe, "clicked", vfolder_editor_clicked, fb);
-	gtk_widget_show((GtkWidget *)fe);
-}
-
-void
-providers_config (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GtkWidget *pc;
-
-	printf("Configuring Providers ...\n");
-	pc = providers_config_new();
-
-	gtk_widget_show(pc);
-}
-
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
deleted file mode 100644
index 1df871719a..0000000000
--- a/mail/mail-threads.c
+++ /dev/null
@@ -1,869 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Peter Williams (peterw@helixcode.com)
- *
- *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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 Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <glib.h>
-#include "mail.h"
-#include "mail-threads.h"
-
-/* FIXME TODO: Do we need operations that don't get a progress window because
- * they're quick, but we still want camel to be locked? We need some kind
- * of flag to mail_operation_try, but then we also need some kind of monitor
- * to open the window if it takes more than a second or something. That would
- * probably entail another thread....
- */
-
-/**
- * A function and its userdata
- **/
-
-typedef struct closure_s {
-	void (*callback)( gpointer );
-	void (*cleanup)( gpointer );
-	gpointer data;
-	
-	gchar *prettyname;
-	/* gboolean gets_window; */
-} closure_t;
-
-/**
- * A command issued through the compipe
- **/
-
-typedef struct com_msg_s {
-	enum com_msg_type_e { STARTING, PERCENTAGE, HIDE_PBAR, SHOW_PBAR, MESSAGE, PASSWORD, ERROR, FINISHED } type;
-	gfloat percentage;
-	gchar *message;
-
-	void (*func)( gpointer );
-	gpointer userdata;
-
-	/* Password stuff */
-	gchar **reply;
-	gboolean secret;
-	gboolean *success;
-} com_msg_t;
-
-/** 
- * @mail_operation_in_progress: When true, there's
- * another thread executing a major ev-mail operation:
- * fetch_mail, etc.
- *
- * Because camel is not thread-safe we work
- * with the restriction that more than one mailbox
- * cannot be accessed at once. Thus we cannot
- * concurrently check mail and move messages, etc.
- **/
-
-static gboolean mail_operation_in_progress;
-
-/**
- * @queue_window: The little window on the screen that
- * shows the progress of the current operation and the
- * operations that are queued to proceed after it.
- *
- * @queue_window_pending: The vbox that contains the
- * list of pending operations.
- *
- * @queue_window_message: The label that contains the
- * operation's message to the user
- **/
-
-static GtkWidget *queue_window = NULL;
-static GtkWidget *queue_window_pending = NULL;
-static GtkWidget *queue_window_message = NULL;
-static GtkWidget *queue_window_progress = NULL;
-
-/**
- * @progress_timeout_handle: the handle to our timer
- * function so that we can remove it when the progress bar
- * mode changes.
- **/
-
-static int progress_timeout_handle = -1;
-
-/**
- * @op_queue: The list of operations the are scheduled
- * to proceed after the currently executing one. When
- * only one operation is going, this is NULL.
- **/
-
-static GSList *op_queue = NULL;
-
-/**
- * @compipe: The pipe through which the dispatcher communicates
- * with the main thread for GTK+ calls
- *
- * @chan_reader: the GIOChannel that reads our pipe
- *
- * @READER: the fd in our pipe that.... reads!
- * @WRITER: the fd in our pipe that.... writes!
- */
-
-#define READER compipe[0]
-#define WRITER compipe[1]
-
-static int compipe[2] = { -1, -1 };
-
-GIOChannel *chan_reader = NULL;
-
-/**
- * @modal_cond: a condition maintained so that the
- * calling thread (the dispatch thread) blocks correctly
- * until the user has responded to some kind of modal
- * dialog boxy thing.
- *
- * @modal_lock: a mutex for said condition
- *
- * @modal_may_proceed: a gboolean telling us whether
- * the dispatch thread may proceed its operations.
- */
-
-G_LOCK_DEFINE_STATIC( modal_lock );
-static GCond *modal_cond = NULL;
-static gboolean modal_may_proceed = FALSE;
-
-/**
- * Static prototypes
- **/
-
-static void create_queue_window( void );
-static void dispatch( closure_t *clur );
-static void *dispatch_func( void *data );
-static void check_compipe( void );
-static void check_cond( void );
-static gboolean read_msg( GIOChannel *source, GIOCondition condition, gpointer userdata );
-static void remove_next_pending( void );
-static void show_error( com_msg_t *msg );
-static void show_error_clicked( void );
-static void get_password( com_msg_t *msg );
-static void get_password_cb( gchar *string, gpointer data );
-static void get_password_clicked( GnomeDialog *dialog, gint button, gpointer user_data );
-static gboolean progress_timeout( gpointer data );
-static void timeout_toggle( gboolean active );
-
-/* Pthread code */
-/* FIXME: support other thread types!!!! */
-
-#ifdef G_THREADS_IMPL_POSIX
-
-#include <pthread.h>
-
-/**
- * @dispatch_thread: the pthread_t (when using pthreads, of
- * course) representing our dispatcher routine. Never used
- * except to make pthread_create happy
- **/
-
-static pthread_t dispatch_thread;
-
-/* FIXME: do we need to set any attributes for our thread? 
- * If so, we need to create a pthread_attr structure and
- * fill it in somewhere. But the defaults should be good
- * enough.
- */
-
-#else /* defined USE_PTHREADS */
-choke on this: no thread type defined
-#endif
-
-/**
- * mail_operation_try:
- * @description: A user-friendly string describing the operation.
- * @callback: the function to call in another thread to start the operation
- * @cleanup: the function to call in the main thread when the callback is finished.
- *    NULL is allowed.
- * @user_data: extra data passed to the callback
- *
- * Runs a mail operation asynchronously. If no other operation is running,
- * we start another thread and call the callback in that thread. The function
- * can then use the mail_op_ functions to perform limited UI returns, while
- * the main UI is completely unlocked.
- *
- * If an async operation is going on when this function is called again, 
- * it waits for the currently executing operation to finish, then
- * executes the callback function in another thread.
- *
- * Returns TRUE on success, FALSE on some sort of queueing error.
- **/
-
-gboolean
-mail_operation_try( const gchar *description, void (*callback)( gpointer ), 
-		    void (*cleanup)( gpointer ), gpointer user_data )
-{
-	closure_t *clur;
-	g_assert( callback );
-
-	clur = g_new( closure_t, 1 );
-	clur->callback = callback;
-	clur->cleanup = cleanup;
-	clur->data = user_data;
-	clur->prettyname = g_strdup( description );
-
-	if( mail_operation_in_progress == FALSE ) {
-		/* No operations are going on, none are pending. So
-		 * we check to see if we're initialized (create the
-		 * window and the pipes), and send off the operation
-		 * on its merry way.
-		 */
-
-		mail_operation_in_progress = TRUE;
-
-		check_compipe();
-		create_queue_window();
-		gtk_widget_show_all( queue_window );
-		gnome_win_hints_set_layer( queue_window, 
-					   WIN_LAYER_ONTOP );
-		gnome_win_hints_set_state( queue_window, 
-					   WIN_STATE_ARRANGE_IGNORE );
-		gnome_win_hints_set_hints( queue_window, 
-					   WIN_HINTS_SKIP_FOCUS |
-					   WIN_HINTS_SKIP_WINLIST |
-					   WIN_HINTS_SKIP_TASKBAR );
-		gtk_widget_hide( queue_window_pending );
-
-		dispatch( clur );
-	} else {
-		GtkWidget *label;
-
-		/* Zut. We already have an operation running. Well,
-		 * queue ourselves up.
-		 *
-		 * Yes, g_slist_prepend is faster down here.. But we pop
-		 * operations off the beginning of the list later and
-		 * that's a lot faster.
-		 */
-
-		op_queue = g_slist_append( op_queue, clur );
-
-		/* Show us in the pending window. */
-		label = gtk_label_new( description );
-		gtk_misc_set_alignment( GTK_MISC( label ), 1.0, 0.5 );
-		gtk_box_pack_start( GTK_BOX( queue_window_pending ), label,
-				    FALSE, TRUE, 2 );
-
-		/* If we want the next op to be on the bottom, uncomment this */
-		/* 1 = first on list always (0-based) */
-		/* gtk_box_reorder_child( GTK_BOX( queue_window_pending ), label, 1 ); */
-		gtk_widget_show_all( queue_window_pending );
-	}
-
-	return TRUE;
-}
-
-/**
- * mail_op_set_percentage:
- * @percentage: the percentage that will be displayed in the progress bar
- *
- * Set the percentage of the progress bar for the currently executing operation.
- * Threadsafe for, nay, intended to be called by, the dispatching thread.
- **/
-
-void mail_op_set_percentage( gfloat percentage )
-{
-	com_msg_t msg;
-
-	msg.type = PERCENTAGE;
-	msg.percentage = percentage;
-	write( WRITER, &msg, sizeof( msg ) );
-}
-
-/**
- * mail_op_hide_progressbar:
- *
- * Hide the progress bar in the status box
- * Threadsafe for, nay, intended to be called by, the dispatching thread.
- **/
-
-/* FIXME: I'd much rather have one of those Netscape-style progress
- * bars that just zips back and forth, but gtkprogressbar can't do
- * that, right? 
- */
-
-void mail_op_hide_progressbar( void )
-{
-	com_msg_t msg;
-
-	msg.type = HIDE_PBAR;
-	write( WRITER, &msg, sizeof( msg ) );
-}
-
-/**
- * mail_op_show_progressbar:
- *
- * Show the progress bar in the status box
- * Threadsafe for, nay, intended to be called by, the dispatching thread.
- **/
-
-void mail_op_show_progressbar( void )
-{
-	com_msg_t msg;
-
-	msg.type = SHOW_PBAR;
-	write( WRITER, &msg, sizeof( msg ) );
-}
-
-/**
- * mail_op_set_message:
- * @fmt: printf-style format string for the message
- * @...: arguments to the format string
- *
- * Set the message displayed above the progress bar for the currently
- * executing operation.
- * Threadsafe for, nay, intended to be called by, the dispatching thread.
- **/
-
-void mail_op_set_message( gchar *fmt, ... )
-{
-	com_msg_t msg;
-	va_list val;
-
-	va_start( val, fmt );
-	msg.type = MESSAGE;
-	msg.message = g_strdup_vprintf( fmt, val );
-	va_end( val );
-
-	write( WRITER, &msg, sizeof( msg ) );
-}
-
-/**
- * mail_op_get_password:
- * @prompt: the question put to the user
- * @secret: whether the dialog box shold print stars when the user types
- * @dest: where to store the reply
- *
- * Asks the user for a password (or string entry in general). Waits for
- * the user's response. On success, returns TRUE and @dest contains the
- * response. On failure, returns FALSE and @dest contains the error
- * message.
- **/
-
-gboolean mail_op_get_password( gchar *prompt, gboolean secret, gchar **dest )
-{
-	com_msg_t msg;
-	gboolean result;
-
-	check_cond();
-
-	msg.type = PASSWORD;
-	msg.secret = secret;
-	msg.message = prompt;
-	msg.reply = dest;
-	msg.success = &result;
-	
-	(*dest) = NULL;
-
-	G_LOCK( modal_lock );
-
-	write( WRITER, &msg, sizeof( msg ) );
-	modal_may_proceed = FALSE;
-
-	while( modal_may_proceed == FALSE )
-		g_cond_wait( modal_cond, g_static_mutex_get_mutex( &G_LOCK_NAME( modal_lock ) ) );
-
-	G_UNLOCK( modal_lock );
-
-	return result;
-}
-
-/**
- * mail_op_error:
- * @fmt: printf-style format string for the error
- * @...: arguments to the format string
- *
- * Opens an error dialog for the currently executing operation.
- * Threadsafe for, nay, intended to be called by, the dispatching thread.
- **/
-
-void mail_op_error( gchar *fmt, ... )
-{
-	com_msg_t msg;
-	va_list val;
-
-	check_cond();
-
-	va_start( val, fmt );
-	msg.type = ERROR;
-	msg.message = g_strdup_vprintf( fmt, val );
-	va_end( val );
-
-	G_LOCK( modal_lock );
-
-	modal_may_proceed = FALSE;
-	write( WRITER, &msg, sizeof( msg ) );
-
-	while( modal_may_proceed == FALSE )
-		g_cond_wait( modal_cond, g_static_mutex_get_mutex( &G_LOCK_NAME( modal_lock ) ) );
-
-	G_UNLOCK( modal_lock );
-}
-
-/**
- * mail_operation_wait_for_finish:
- *
- * Waits for the currently executing async operations
- * to finish executing
- */
-
-void mail_operation_wait_for_finish( void )
-{
-	while( mail_operation_in_progress ) {
-		while( gtk_events_pending() )
-			gtk_main_iteration();
-	}
-}
-
-/**
- * mail_operations_are_executing:
- *
- * Returns TRUE if operations are being executed asynchronously
- * when called, FALSE if not.
- */
-
-gboolean mail_operations_are_executing( void )
-{
-	return mail_operation_in_progress;
-}
-
-/* ** Static functions **************************************************** */
-
-/**
- * create_queue_window:
- *
- * Creates the queue_window widget that displays the progress of the
- * current operation.
- */
-
-static void
-create_queue_window( void )
-{
-	GtkWidget *vbox;
-	GtkWidget *pending_vb, *pending_lb;
-	GtkWidget *progress_lb, *progress_bar;
-
-	/* Check to see if we've only hidden it */
-	if( queue_window != NULL )
-		return;
-
-	queue_window = gtk_window_new( GTK_WINDOW_DIALOG );
-	gtk_container_set_border_width( GTK_CONTAINER( queue_window ), 8 );
-
-	vbox = gtk_vbox_new( FALSE, 4 );
-
-	pending_vb = gtk_vbox_new( FALSE, 2 );
-	queue_window_pending = pending_vb;
-
-	pending_lb = gtk_label_new( _("Currently pending operations:") );
-	gtk_misc_set_alignment( GTK_MISC( pending_lb ), 0.0, 0.0 );
-	gtk_box_pack_start( GTK_BOX( pending_vb ), pending_lb,
-			    FALSE, TRUE, 0 );
-
-	gtk_box_pack_start( GTK_BOX( vbox ), pending_vb,
-			    TRUE, TRUE, 4 );
-
-	/* FIXME: 'operation' is not the warmest cuddliest word. */
-	progress_lb = gtk_label_new( "" );
-	queue_window_message = progress_lb;
-	gtk_box_pack_start( GTK_BOX( vbox ), progress_lb,
-			    FALSE, TRUE, 4 );
-
-	progress_bar = gtk_progress_bar_new();
-	queue_window_progress = progress_bar;
-	/* FIXME: is this fit for l10n? */
-	gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR( progress_bar ), 
-					  GTK_PROGRESS_LEFT_TO_RIGHT );
-	gtk_progress_bar_set_bar_style( GTK_PROGRESS_BAR( progress_bar ), 
-					GTK_PROGRESS_CONTINUOUS );
-	gtk_box_pack_start( GTK_BOX( vbox ), progress_bar,
-			    FALSE, TRUE, 4 );
-
-	gtk_container_add( GTK_CONTAINER( queue_window ), vbox );
-}
-
-/**
- * check_compipe:
- *
- * Check and see if our pipe has been opened and open
- * it if necessary.
- **/
-
-static void check_compipe( void )
-{
-	if( READER > 0 )
-		return;
-
-	if( pipe( compipe ) < 0 ) { 
-		g_warning( "Call to pipe(2) failed!" );
-		
-		/* FIXME: better error handling. How do we react? */
-		return;
-	}
-
-	chan_reader = g_io_channel_unix_new( READER );
-	g_io_add_watch( chan_reader, G_IO_IN, read_msg, NULL );
-}
-
-/**
- * check_cond:
- *
- * See if our condition is initialized and do so if necessary
- **/
-
-static void check_cond( void )
-{
-	if( modal_cond == NULL )
-		modal_cond = g_cond_new();
-}
-
-/**
- * dispatch:
- * @clur: The function to execute and its userdata
- *
- * Start a thread that executes the closure and exit
- * it when done.
- */
-
-static void dispatch( closure_t *clur )
-{
-	int res;
-
-	res = pthread_create( &dispatch_thread, NULL, (void *) &dispatch_func, clur );
-
-	if( res != 0 ) {
-		g_warning( "Error launching dispatch thread!" );
-		/* FIXME: more error handling */
-	}
-}
-
-/**
- * dispatch_func:
- * @data: the closure to run
- *
- * Runs the closure and exits the thread.
- */
-
-static void *dispatch_func( void *data )
-{
-	com_msg_t msg;
-	closure_t *clur = (closure_t *) data;
-
-	msg.type = STARTING;
-	msg.message = clur->prettyname;
-	write( WRITER, &msg, sizeof( msg ) );
-
-	(clur->callback)( clur->data );
-
-	msg.type = FINISHED;
-	msg.func = clur->cleanup; /* NULL is ok */
-	msg.userdata = clur->data;
-	write( WRITER, &msg, sizeof( msg ) );
-
-	g_free( clur->prettyname );
-	g_free( data );
-
-	pthread_exit( 0 );
-	return NULL; /*NOTREACHED*/
-}
-
-/**
- * read_msg:
- * @source: the channel that has data to read
- * @condition: the reason we were called
- * @userdata: unused
- *
- * A message has been recieved on our pipe; perform the appropriate 
- * action.
- **/
-
-static gboolean read_msg( GIOChannel *source, GIOCondition condition, gpointer userdata )
-{
-	com_msg_t *msg;
-	closure_t *clur;
-	GSList *temp;
-	guint size;
-
-	msg = g_new0( com_msg_t, 1 );
-
-	g_io_channel_read( source, (gchar *) msg, 
-			   sizeof( com_msg_t ) / sizeof( gchar ), 
-			   &size );
-
-	if( size != sizeof( com_msg_t ) ) {
-		g_warning( _("Incomplete message written on pipe!") );
-		msg->type = ERROR;
-		msg->message = g_strdup( _("Error reading commands from dispatching thread.") );
-	}
-
-	/* This is very important, though I'm not quite sure why
-	 * it is as we are in the main thread right now.
-	 */
-
-	GDK_THREADS_ENTER();
-
-	switch( msg->type ) {
-	case STARTING:
-		gtk_label_set_text( GTK_LABEL( queue_window_message ), msg->message );
-		gtk_progress_bar_update( GTK_PROGRESS_BAR( queue_window_progress ), 0.0 );
-		g_free( msg );
-		break;
-	case PERCENTAGE:
-		gtk_progress_bar_update( GTK_PROGRESS_BAR( queue_window_progress ), msg->percentage );
-		g_free( msg );
-		break;
-	case HIDE_PBAR:
-		gtk_progress_set_activity_mode( GTK_PROGRESS( queue_window_progress ), TRUE );
-		timeout_toggle( TRUE );
-
-		g_free( msg );
-		break;
-	case SHOW_PBAR:
-		timeout_toggle( FALSE );
-		gtk_progress_set_activity_mode( GTK_PROGRESS( queue_window_progress ), FALSE );
-
-		g_free( msg );
-		break;
-	case MESSAGE:
-		gtk_label_set_text( GTK_LABEL( queue_window_message ),
-				    msg->message );
-		g_free( msg->message );
-		g_free( msg );
-		break;
-	case PASSWORD:
-		g_assert( msg->reply );
-		g_assert( msg->success );
-		get_password( msg );
-		/* don't free msg! done later */
-		break;
-	case ERROR:
-		show_error( msg );
-		g_free( msg );
-		break;
-
-		/* Don't fall through; dispatch_func does the FINISHED
-		 * call for us 
-		 */
-
-	case FINISHED:
-		if( msg->func )
-			(msg->func)( msg->userdata );
-
-		if( op_queue == NULL ) {
-			/* All done! */
-			gtk_widget_hide( queue_window );
-			mail_operation_in_progress = FALSE;
-		} else {
-			/* There's another operation left */
-			
-			/* Pop it off the front */
-			clur = op_queue->data;
-			temp = g_slist_next( op_queue );
-			g_slist_free_1( op_queue );
-			op_queue = temp;
-
-			/* Clear it out of the 'pending' vbox */
-			remove_next_pending();
-
-			/* Run run run little process */
-			dispatch( clur );
-		}
-		g_free( msg );
-		break;
-	default:
-		g_warning( _("Corrupted message from dispatching thread?") );
-		break;
-	}
-
-	GDK_THREADS_LEAVE();
-	return TRUE;
-}
-
-/**
- * remove_next_pending:
- *
- * Remove an item from the list of pending items. If
- * that's the last one, additionally hide the little
- * 'pending' message.
- **/
-
-static void remove_next_pending( void )
-{
-	GList *children;
-
-	children = gtk_container_children( GTK_CONTAINER( queue_window_pending ) );
-
-	/* Skip past the header label */
-	children = g_list_first( children );
-	children = g_list_next( children );
-
-	/* Nuke the one on top */
-	gtk_container_remove( GTK_CONTAINER( queue_window_pending ),
-			      GTK_WIDGET( children->data ) );
-
-	/* Hide it? */
-	if( g_list_next( children ) == NULL )
-		gtk_widget_hide( queue_window_pending );
-}
-
-/**
- * show_error:
- *
- * Show the error dialog and wait for user OK
- **/
-
-static void show_error( com_msg_t *msg )
-{
-	GtkWidget *err_dialog;
-
-	err_dialog = gnome_error_dialog( msg->message );
-	gnome_dialog_set_close( GNOME_DIALOG(err_dialog), TRUE );
-	gtk_signal_connect( GTK_OBJECT( err_dialog ), "clicked", (GtkSignalFunc) show_error_clicked, NULL );
-	g_free( msg->message );
-
-	G_LOCK( modal_lock );
-
-	timeout_toggle( FALSE );
-	modal_may_proceed = FALSE;
-	gtk_widget_show( GTK_WIDGET( err_dialog ) );
-}
-
-/**
- * show_error_clicked:
- *
- * Called when the user makes hits okay to the error dialog --
- * the dispatch thread is allowed to continue.
- **/
-
-static void show_error_clicked( void )
-{
-	modal_may_proceed = TRUE;
-	timeout_toggle( TRUE );
-	g_cond_signal( modal_cond );
-	G_UNLOCK( modal_lock );
-}
-
-/**
- * get_password:
- *
- * Ask for a password and put the answer in *(msg->reply)
- **/
-
-static void get_password( com_msg_t *msg )
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_request_dialog( msg->secret, msg->message, NULL,
-				       0, get_password_cb, msg,
-				       NULL );
-	gnome_dialog_set_close( GNOME_DIALOG(dialog), TRUE );
-	gtk_signal_connect( GTK_OBJECT( dialog ), "clicked", get_password_clicked, msg );
-
-	G_LOCK( modal_lock );
-
-	modal_may_proceed = FALSE;
-
-	if( dialog == NULL ) {
-		*(msg->success) = FALSE;
-		*(msg->reply) = g_strdup( _("Could not create dialog box.") );
-		modal_may_proceed = TRUE;
-		g_cond_signal( modal_cond );
-		G_UNLOCK( modal_lock );
-	} else {
-		*(msg->reply) = NULL;
-		timeout_toggle( FALSE );
-		gtk_widget_show( GTK_WIDGET( dialog ) );
-	}
-}
-
-static void get_password_cb( gchar *string, gpointer data )
-{
-	com_msg_t *msg = (com_msg_t *) data;
-
-        if (string)
-                *(msg->reply) = g_strdup( string );
-        else
-                *(msg->reply) = NULL;
-}
-
-static void get_password_clicked( GnomeDialog *dialog, gint button, gpointer user_data )
-{
-	com_msg_t *msg = (com_msg_t *) user_data;
-
-	if( button == 1 || *(msg->reply) == NULL ) {
-		*(msg->success) = FALSE;
-		*(msg->reply) = g_strdup( _("User cancelled query.") );
-	} else
-		*(msg->success) = TRUE;
-
-	g_free( msg );
-	modal_may_proceed = TRUE;
-	timeout_toggle( TRUE );
-	g_cond_signal( modal_cond );
-	G_UNLOCK( modal_lock );
-}
-
-/* NOT totally copied from gtk+/gtk/testgtk.c, really! */
-
-static gboolean
-progress_timeout (gpointer data)
-{
-	gfloat new_val;
-	GtkAdjustment *adj;
-
-	adj = GTK_PROGRESS (data)->adjustment;
-  
-	new_val = adj->value + 1;
-	if (new_val > adj->upper)
-		new_val = adj->lower;
-
-	gtk_progress_set_value (GTK_PROGRESS (data), new_val);
-
-	return TRUE;
-}
-
-/**
- * timeout_toggle:
- *
- * Turn on and off our timeout to zip the progressbar along,
- * protecting against recursion (Ie, call with TRUE twice
- * in a row.
- **/
-
-static void
-timeout_toggle( gboolean active )
-{
-	if( (GTK_PROGRESS( queue_window_progress ))->activity_mode == 0 )
-		return;
-
-	if( active ) {
-		if( progress_timeout_handle < 0 )
-			progress_timeout_handle = gtk_timeout_add( 80, progress_timeout, queue_window_progress );
-	} else {
-		if( progress_timeout_handle >= 0 ) {
-			gtk_timeout_remove( progress_timeout_handle );
-			progress_timeout_handle = -1;
-		}
-	}
-}
diff --git a/mail/mail-threads.h b/mail/mail-threads.h
deleted file mode 100644
index d3f2a184e3..0000000000
--- a/mail/mail-threads.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Peter Williams (peterw@helixcode.com)
- *
- *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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 Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _MAIL_THREADS_H_
-#define _MAIL_THREADS_H_
-
-/* Schedule to operation to happen eventually */
-
-gboolean mail_operation_try( const gchar *description, 
-			     void (*callback)( gpointer ), 
-			     void (*cleanup)( gpointer ),
-			     gpointer user_data );
-
-/* User interface hooks for the other thread */
-
-void mail_op_set_percentage( gfloat percentage );
-void mail_op_hide_progressbar( void );
-void mail_op_show_progressbar( void );
-void mail_op_set_message( gchar *fmt, ... ) G_GNUC_PRINTF( 1, 2 );
-void mail_op_error( gchar *fmt, ... ) G_GNUC_PRINTF( 1, 2 );
-gboolean mail_op_get_password( gchar *prompt, gboolean secret, gchar **dest );
-
-/* Wait for the async operations to finish */
-void mail_operation_wait_for_finish( void );
-
-gboolean mail_operations_are_executing( void );
-
-#endif /* defined _MAIL_THREADS_H_ */
diff --git a/mail/mail-types.h b/mail/mail-types.h
deleted file mode 100644
index c5b690563d..0000000000
--- a/mail/mail-types.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef MAIL_TYPES_H
-#define MAIL_TYPES_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-
-typedef struct  _FolderBrowser     FolderBrowser;
-typedef struct  _MessageList       MessageList;
-typedef struct  _MailDisplay       MailDisplay;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_TYPES_H */
diff --git a/mail/mail.h b/mail/mail.h
deleted file mode 100644
index a63ffdb4ac..0000000000
--- a/mail/mail.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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 Street #330, Boston, MA 02111-1307, USA.
- */
-
-#include <gtkhtml/gtkhtml.h>
-#include "camel/camel.h"
-#include "composer/e-msg-composer.h"
-
-/* FIXME FIXME FIXME this sucks sucks sucks sucks */
-
-/* folder-browser-factory */
-void           folder_browser_factory_init         (void);
-BonoboControl *folder_browser_factory_new_control  (const char *uri);
-
-/* mail-config */
-void mail_config_druid (void);
-
-/* mail-format */
-void mail_format_mime_message (CamelMimeMessage *mime_message,
-				   GtkHTML *html, GtkHTMLStream *stream,
-				   CamelMimeMessage *root_message);
-
-EMsgComposer *mail_generate_reply (CamelMimeMessage *mime_message,
-				   gboolean to_all);
-
-EMsgComposer *mail_generate_forward (CamelMimeMessage *mime_message,
-				     gboolean forward_as_attachment,
-				     gboolean keep_attachments);
-
-/* mail-identify */
-char *mail_identify_mime_part (CamelMimePart *part);
-
-/* mail-ops */
-void fetch_mail (GtkWidget *button, gpointer user_data);
-void send_msg (GtkWidget *button, gpointer user_data);
-void send_to_url (const char *url);
-void forward_msg (GtkWidget *button, gpointer user_data);
-void reply_to_sender (GtkWidget *button, gpointer user_data);
-void reply_to_all (GtkWidget *button, gpointer user_data);
-void delete_msg (GtkWidget *button, gpointer user_data);
-
-void expunge_folder (BonoboUIHandler *uih, void *user_data, const char *path);
-void filter_edit (BonoboUIHandler *uih, void *user_data, const char *path);
-void vfolder_edit (BonoboUIHandler *uih, void *user_data, const char *path);
-void providers_config (BonoboUIHandler *uih, void *user_data, const char *path);
-
-GtkWidget *providers_config_new (void);
-
-/* session */
-void session_init (void);
-void forget_passwords (BonoboUIHandler *uih, void *user_data, const char *path);
-extern CamelSession *session;
diff --git a/mail/main.c b/mail/main.c
deleted file mode 100644
index 5332213147..0000000000
--- a/mail/main.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * mail-component.c: The core of the mail component
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include <glade/glade.h>
-
-#include "e-util/e-gui-utils.h"
-#include "e-util/e-cursors.h"
-
-#include "component-factory.h"
-#include "mail.h"
-
-#ifdef USING_OAF
-
-#include <liboaf/liboaf.h>
-
-static void
-init_corba (int *argc, char *argv [])
-{
-	gnome_init_with_popt_table ("evolution-mail-component", VERSION, *argc, argv,
-				    oaf_popt_options, 0, NULL);
-	oaf_init (*argc, argv);
-}
-
-#else  /* USING_OAF */
-
-#include <libgnorba/gnorba.h>
-
-static void
-init_corba (int *argc, char *argv [])
-{
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-
- 	gnome_CORBA_init_with_popt_table (
-		"evolution-mail-component", "1.0",
-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-#endif /* USING_OAF */
-
-static void
-init_bonobo (void)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE){
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Mail Component: I could not initialize Bonobo"));
-		exit (1);
-	}
-}
-
-int
-main (int argc, char *argv [])
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	g_thread_init( NULL );
-
-	init_corba (&argc, argv);
-	init_bonobo ();
-	gtkhtmllib_init (argc, argv);
-
-	glade_gnome_init ();
-
-	session_init ();
-	e_cursors_init ();
-
-	component_factory_init ();
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/mail/message-list.c b/mail/message-list.c
deleted file mode 100644
index 2cb8e1d363..0000000000
--- a/mail/message-list.c
+++ /dev/null
@@ -1,1024 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * message-list.c: Displays the messages.
- *                 Implements CORBA's Evolution::MessageList
- *
- * Author:
- *     Miguel de Icaza (miguel@helixcode.com)
- *     Bertrand Guiheneuf (bg@aful.org)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include "e-util/e-util.h"
-#include "camel/camel-exception.h"
-#include <camel/camel-folder.h>
-#include "message-list.h"
-#include "Mail.h"
-#include "widgets/e-table/e-table-header-item.h"
-#include "widgets/e-table/e-table-item.h"
-
-#include "art/mail-new.xpm"
-#include "art/mail-read.xpm"
-#include "art/mail-replied.xpm"
-#include "art/attachment.xpm"
-#include "art/empty.xpm"
-
-/*
- * Default sizes for the ETable display
- *
- */
-#define N_CHARS(x) (CHAR_WIDTH * (x))
-
-#define COL_ICON_WIDTH         (16)
-#define COL_CHECK_BOX_WIDTH    (16)
-#define COL_FROM_EXPANSION     (24.0)
-#define COL_FROM_WIDTH_MIN     (32)
-#define COL_SUBJECT_EXPANSION  (30.0)
-#define COL_SUBJECT_WIDTH_MIN  (32)
-#define COL_SENT_EXPANSION     (24.0)
-#define COL_SENT_WIDTH_MIN     (32)
-#define COL_RECEIVED_EXPANSION (20.0)
-#define COL_RECEIVED_WIDTH_MIN (32)
-#define COL_TO_EXPANSION       (24.0)
-#define COL_TO_WIDTH_MIN       (32)
-#define COL_SIZE_EXPANSION     (6.0)
-#define COL_SIZE_WIDTH_MIN     (32)
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-
-static BonoboObjectClass *message_list_parent_class;
-static POA_Evolution_MessageList__vepv evolution_message_list_vepv;
-
-static void
-on_cursor_change_cmd (ETable *table, 
-		      int row,
-		      gpointer user_data);
-static void
-select_row (ETable *table,
-	    gpointer user_data);
-
-
-static CamelMessageInfo *
-get_message_info(MessageList *message_list, gint row)
-{
-	CamelMessageInfo *info = NULL;
-
-	if (message_list->search) {
-		if (row<message_list->match_count) {
-			info = message_list->summary_search_cache->pdata[row];
-			if (info == NULL) {
-				char *uid = g_list_nth_data(message_list->matches, row);
-				if (uid) {
-					info = message_list->summary_search_cache->pdata[row] =
-						(CamelMessageInfo *) camel_folder_summary_get_by_uid(message_list->folder, uid);
-				}
-			}
-		}
-	} else {
-		if (row<message_list->summary_table->len)
-			info = message_list->summary_table->pdata[row];
-	}
-
-	return info;
-}
-
-static int
-get_message_row (MessageList *message_list, const char *uid)
-{
-	CamelMessageInfo *info;
-	int row;
-
-	if (message_list->search) {
-		GList *l;
-
-		/* Yum. Linear search. See also "FIXME: This should use
-		 * a better format" in message-list.h
-		 */
-		for (l = message_list->matches, row = 0; l; l = l->next, row++) {
-			if (!strcmp (uid, l->data))
-				return row;
-		}
-	} else {
-		gpointer key, value;
-
-		if (g_hash_table_lookup_extended (message_list->uid_rowmap,
-						  uid, &key, &value))
-			return GPOINTER_TO_INT (value);
-
-		row = g_hash_table_size (message_list->uid_rowmap);
-		for (; row < message_list->summary_table->len; row++) {
-			info = message_list->summary_table->pdata[row];
-			g_hash_table_insert (message_list->uid_rowmap,
-					     info->uid, GINT_TO_POINTER (row));
-			if (!strcmp (uid, info->uid))
-				return row;
-		}
-	}
-
-	return -1;
-}
-
-static gint
-mark_msg_seen (gpointer data)
-{
-	MessageList *ml = data;
-	guint32 flags;
-
-	if (!ml->selected_uid)
-		return;
-
-	flags = camel_folder_get_message_flags (ml->folder, ml->selected_uid,
-						NULL);
-	camel_folder_set_message_flags (ml->folder, ml->selected_uid,
-					CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN,
-					NULL);
-	return FALSE;
-}
-
-/* select a message and display it */
-static void
-select_msg (MessageList *message_list, gint row)
-{
-	CamelException ex;
-	CamelMimeMessage *message = NULL;
-	CamelMessageInfo *msg_info;
-
-	camel_exception_init (&ex);
-
-	msg_info = get_message_info(message_list, row);
-	if (msg_info) {
-		message = camel_folder_get_message_by_uid (message_list->folder, 
-							   msg_info->uid,
-							   &ex);
-		if (camel_exception_get_id (&ex)) {
-			printf ("Unable to get message: %s\n",
-				ex.desc?ex.desc:"unknown_reason");
-			return;
-		}
-	}
-
-	if (message) {
-		if (message_list->seen_id)
-			gtk_timeout_remove (message_list->seen_id);
-
-		mail_display_set_message (message_list->parent_folder_browser->mail_display,
-					  CAMEL_MEDIUM (message));
-		gtk_object_unref (GTK_OBJECT (message));
-
-		message_list->seen_id =
-			gtk_timeout_add (1500, mark_msg_seen, message_list);
-	}
-}
-
-/*
- * SimpleTableModel::col_count
- */
-static int
-ml_col_count (ETableModel *etm, void *data)
-{
-	return COL_LAST;
-}
-
-/*
- * SimpleTableModel::row_count
- */
-static int
-ml_row_count (ETableModel *etm, void *data)
-{
-	MessageList *message_list = data;
-	int v;
-	
-	if (!message_list->folder) {
-		return 0;
-	}
-
-	if (message_list->search) {
-		v = message_list->match_count;
-	} else {
-		v = message_list->summary_table->len;
-	}
-
-	/* in the case where no message is available, return 1
-	 * however, cause we want to be able to show a text */
-	return (v ? v:1);
-	
-}
-
-static void *
-ml_value_at (ETableModel *etm, int col, int row, void *data)
-{
-	static char buffer [10];
-	MessageList *message_list = data;
-	CamelFolder *folder;
-	CamelMessageInfo *msg_info;
-	CamelException ex;
-	void *retval = NULL;
-
-	camel_exception_init (&ex);
-	
-	folder = message_list->folder;
-	if (!folder)
-		goto nothing_to_see;
-	
-	
-	/* retrieve the message information array */
-	msg_info = get_message_info(message_list, row);
-
-	/* 
-	 * in the case where it is zero message long 
-	 * display nothing 
-	 */
-	if (msg_info == NULL)
-		goto nothing_to_see;
-	
-	switch (col){
-	case COL_ONLINE_STATUS:
-		retval = GINT_TO_POINTER (0);
-		break;
-		
-	case COL_MESSAGE_STATUS:
-		if (msg_info->flags & CAMEL_MESSAGE_ANSWERED)
-			retval = GINT_TO_POINTER (2);
-		else if (msg_info->flags & CAMEL_MESSAGE_SEEN)
-			retval = GINT_TO_POINTER (1);
-		else
-			retval = GINT_TO_POINTER (0);
-		break;
-		
-	case COL_PRIORITY:
-		retval = GINT_TO_POINTER (1);
-		break;
-		
-	case COL_ATTACHMENT:
-		retval = GINT_TO_POINTER (0);
-		break;
-		
-	case COL_FROM:
-		if (msg_info->from)
-			retval = msg_info->from;
-		else
-			retval = "";
-		break;
-		
-	case COL_SUBJECT:
-		if (msg_info->subject)
-			retval = msg_info->subject;
-		else
-			retval = "";
-		break;
-		
-	case COL_SENT:
-		retval = GINT_TO_POINTER (msg_info->date_sent);
-		break;
-		
-	case COL_RECEIVED:
-		retval = GINT_TO_POINTER (msg_info->date_received);
-		break;
-		
-	case COL_TO:
-		if (msg_info->to)
-			retval = msg_info->to;
-		else
-			retval = "";
-		break;
-		
-	case COL_SIZE:
-		sprintf (buffer, "%d", msg_info->size);
-		retval = buffer;
-		break;
-			
-	case COL_DELETED:
-		retval = GINT_TO_POINTER(!!(msg_info->flags & CAMEL_MESSAGE_DELETED));
-		break;
-
-	case COL_UNREAD:
-		retval = GINT_TO_POINTER(!(msg_info->flags & CAMEL_MESSAGE_SEEN));
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	return retval;
-	
-	
- nothing_to_see:
-	/* 
-	 * in the case there is nothing to look at, 
-	 * notify the user.
-	 */
-	switch (col){
-	case COL_ONLINE_STATUS:
-	case COL_MESSAGE_STATUS:
-	case COL_PRIORITY:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-		return (void *) 0;
-
-	case COL_SUBJECT:
-		return "No item in this view";
-	case COL_FROM:
-	case COL_TO:
-	case COL_SIZE:
-		return "";
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-static void
-ml_set_value_at (ETableModel *etm, int col, int row, const void *value, void *data)
-{
-	MessageList *message_list = data;
-	CamelMessageInfo *msg_info;
-
-	switch (col) {
-	case COL_MESSAGE_STATUS:
-		msg_info = get_message_info (message_list, row);
-		camel_folder_set_message_flags (message_list->folder,
-						msg_info->uid,
-						CAMEL_MESSAGE_SEEN,
-						~(msg_info->flags), NULL);
-		if (message_list->seen_id) {
-			gtk_timeout_remove (message_list->seen_id);
-			message_list->seen_id = 0;
-		}
-		break;
-	default:
-		break;
-	}
-
-}
-
-static gboolean
-ml_is_cell_editable (ETableModel *etm, int col, int row, void *data)
-{
-	switch (col) {
-	case COL_MESSAGE_STATUS:
-		return TRUE;
-		break;
-	default:
-		return FALSE;
-		break;
-	}
-}
-
-static void *
-ml_duplicate_value (ETableModel *etm, int col, const void *value, void *data)
-{
-	switch (col){
-	case COL_ONLINE_STATUS:
-	case COL_MESSAGE_STATUS:
-	case COL_PRIORITY:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-		return (void *) value;
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_SIZE:
-		return g_strdup (value);
-	default:
-		g_assert_not_reached ();
-	}
-	return NULL;
-}
-
-static void
-ml_free_value (ETableModel *etm, int col, void *value, void *data)
-{
-	switch (col){
-	case COL_ONLINE_STATUS:
-	case COL_MESSAGE_STATUS:
-	case COL_PRIORITY:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-		break;
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_SIZE:
-		g_free (value);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void *
-ml_initialize_value (ETableModel *etm, int col, void *data)
-{
-	switch (col){
-	case COL_ONLINE_STATUS:
-	case COL_MESSAGE_STATUS:
-	case COL_PRIORITY:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-		return NULL;
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_SIZE:
-		return g_strdup("");
-	default:
-		g_assert_not_reached ();
-	}
-
-	return NULL;
-}
-
-static gboolean
-ml_value_is_empty (ETableModel *etm, int col, const void *value, void *data)
-{
-	switch (col){
-	case COL_ONLINE_STATUS:
-	case COL_MESSAGE_STATUS:
-	case COL_PRIORITY:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-		return value == NULL;
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_SIZE:
-		return !(value && *(char *)value);
-	default:
-		g_assert_not_reached ();
-		return FALSE;
-	}
-}
-
-static struct {
-	char **image_base;
-	GdkPixbuf  *pixbuf;
-} states_pixmaps [] = {
-	{ mail_new_xpm,		NULL },
-	{ mail_read_xpm,	NULL },
-	{ mail_replied_xpm,	NULL },
-	{ empty_xpm,		NULL },
-	{ attachment_xpm,	NULL },
-	{ NULL,			NULL }
-};
-
-static void
-message_list_init_images (void)
-{
-	int i;
-
-	/*
-	 * Only load once, and share
-	 */
-	if (states_pixmaps [0].pixbuf)
-		return;
-	
-	for (i = 0; states_pixmaps [i].image_base; i++){
-		states_pixmaps [i].pixbuf = gdk_pixbuf_new_from_xpm_data (
-			(const char **) states_pixmaps [i].image_base);
-	}
-}
-
-static char *
-filter_date (const void *data)
-{
-	time_t date = GPOINTER_TO_INT (data);
-	char buf[26], *p;
-
-	if (date == 0)
-		return g_strdup ("?");
-
-	ctime_r (&date, buf);
-	p = strchr (buf, '\n');
-	if (p)
-		*p = '\0';
-
-	return g_strdup (buf);
-}
-
-static void
-message_list_init_renderers (MessageList *message_list)
-{
-	GdkPixbuf *images [3];
-
-	g_assert (message_list);
-	g_assert (message_list->table_model);
-
-	message_list->render_text = e_cell_text_new (
-		message_list->table_model,
-		NULL, GTK_JUSTIFY_LEFT);
-
-	gtk_object_set(GTK_OBJECT(message_list->render_text),
-		       "strikeout_column", COL_DELETED,
-		       NULL);
-	gtk_object_set(GTK_OBJECT(message_list->render_text),
-		       "bold_column", COL_UNREAD,
-		       NULL);
-
-	message_list->render_date = e_cell_text_new (
-		message_list->table_model,
-		NULL, GTK_JUSTIFY_LEFT);
-
-	gtk_object_set(GTK_OBJECT(message_list->render_date),
-		       "text_filter", filter_date,
-		       NULL);
-	gtk_object_set(GTK_OBJECT(message_list->render_date),
-		       "strikeout_column", COL_DELETED,
-		       NULL);
-	gtk_object_set(GTK_OBJECT(message_list->render_date),
-		       "bold_column", COL_UNREAD,
-		       NULL);
-
-	message_list->render_online_status = e_cell_checkbox_new ();
-
-	/*
-	 * Message status
-	 */
-	images [0] = states_pixmaps [0].pixbuf;
-	images [1] = states_pixmaps [1].pixbuf;
-	images [2] = states_pixmaps [2].pixbuf;
-
-	message_list->render_message_status = e_cell_toggle_new (0, 3, images);
-
-	/*
-	 * Attachment
-	 */
-	images [0] = states_pixmaps [3].pixbuf;
-	images [1] = states_pixmaps [4].pixbuf;
-
-	message_list->render_attachment = e_cell_toggle_new (0, 2, images);
-	
-	/*
-	 * FIXME: We need a real renderer here
-	 */
-	message_list->render_priority = e_cell_checkbox_new ();
-}
-
-static void
-message_list_init_header (MessageList *message_list)
-{
-	int i;
-	
-	/*
-	 * FIXME:
-	 *
-	 * Use the font metric to compute this.
-	 */
-	
-	message_list->header_model = e_table_header_new ();
-	gtk_object_ref (GTK_OBJECT (message_list->header_model));
-	gtk_object_sink (GTK_OBJECT (message_list->header_model));
-
-	message_list->table_cols [COL_ONLINE_STATUS] =
-		e_table_col_new (
-			COL_ONLINE_STATUS, _("Online Status"),
-			0.0, COL_CHECK_BOX_WIDTH,
-			message_list->render_online_status,
-			g_int_compare, FALSE);
-	
-	message_list->table_cols [COL_MESSAGE_STATUS] =
-		e_table_col_new_with_pixbuf (
-			COL_MESSAGE_STATUS, states_pixmaps [0].pixbuf,
-			0.0, COL_CHECK_BOX_WIDTH,
-			message_list->render_message_status, 
-			g_int_compare, FALSE);
-
-	message_list->table_cols [COL_PRIORITY] =
-		e_table_col_new (
-			COL_PRIORITY, _("Priority"),
-			0.0, COL_CHECK_BOX_WIDTH,
-			message_list->render_priority,
-			g_int_compare, FALSE);
-	
-	message_list->table_cols [COL_ATTACHMENT] =
-		e_table_col_new_with_pixbuf (
-			COL_ATTACHMENT, states_pixmaps [4].pixbuf,
-			0.0, COL_ICON_WIDTH,
-			message_list->render_attachment,
-			g_int_compare, FALSE);
-
-	message_list->table_cols [COL_FROM] =
-		e_table_col_new (
-			COL_FROM, _("From"),
-			COL_FROM_EXPANSION, COL_FROM_WIDTH_MIN,
-			message_list->render_text,
-			g_str_compare, TRUE);
-
-	message_list->table_cols [COL_SUBJECT] =
-		e_table_col_new (
-			COL_SUBJECT, _("Subject"),
-			COL_SUBJECT_EXPANSION, COL_SUBJECT_WIDTH_MIN,
-			message_list->render_text,
-			g_str_compare, TRUE);
-
-	message_list->table_cols [COL_SENT] =
-		e_table_col_new (
-			COL_SENT, _("Date"),
-			COL_SENT_EXPANSION, COL_SENT_WIDTH_MIN,
-			message_list->render_date,
-			g_int_compare, TRUE);
-	
-	message_list->table_cols [COL_RECEIVED] =
-		e_table_col_new (
-			COL_RECEIVED, _("Received"),
-			COL_RECEIVED_EXPANSION, COL_RECEIVED_WIDTH_MIN,
-			message_list->render_date,
-			g_int_compare, TRUE);
-
-	message_list->table_cols [COL_TO] =
-		e_table_col_new (
-			COL_TO, _("To"),
-			COL_TO_EXPANSION, COL_TO_WIDTH_MIN,
-			message_list->render_text,
-			g_str_compare, TRUE);
-
-	message_list->table_cols [COL_SIZE] =
-		e_table_col_new (
-			COL_SIZE, _("Size"),
-			COL_SIZE_EXPANSION, COL_SIZE_WIDTH_MIN,
-			message_list->render_text,
-			g_str_compare, TRUE);
-	
-	for (i = 0; i < COL_LAST; i++) {
-		gtk_object_ref (GTK_OBJECT (message_list->table_cols [i]));
-		e_table_header_add_column (message_list->header_model,
-					   message_list->table_cols [i], i);
-	}
-}
-
-static char *
-message_list_get_layout (MessageList *message_list)
-{
-	/* Message status, From, Subject, Sent Date */
-	return g_strdup ("<ETableSpecification> <columns-shown> <column> 1 </column> <column> 4 </column> <column> 5 </column> <column> 6 </column> </columns-shown> <grouping> </grouping> </ETableSpecification>");
-}
-
-/*
- * GtkObject::init
- */
-static void
-message_list_init (GtkObject *object)
-{
-	MessageList *message_list = MESSAGE_LIST (object);
-	char *spec;
-		
-	message_list->table_model = e_table_simple_new (
-		ml_col_count, ml_row_count, ml_value_at,
-		ml_set_value_at, ml_is_cell_editable,
-		ml_duplicate_value, ml_free_value,
-		ml_initialize_value, ml_value_is_empty,
-		message_list);
-
-	message_list_init_renderers (message_list);
-	message_list_init_header (message_list);
-
-	/*
-	 * The etable
-	 */
-
-	spec = message_list_get_layout (message_list);
-	message_list->etable = e_table_new (
-		message_list->header_model, message_list->table_model, spec);
-	g_free (spec);
-
-	gtk_object_set(GTK_OBJECT(message_list->etable),
-		       "cursor_mode", E_TABLE_CURSOR_LINE,
-		       "drawfocus", FALSE,
-		       "drawgrid", FALSE,
-		       NULL);
-
-	gtk_signal_connect (GTK_OBJECT (message_list->etable), "realize",
-			    GTK_SIGNAL_FUNC (select_row), message_list);
-	
-	gtk_signal_connect (GTK_OBJECT (message_list->etable), "cursor_change",
-			   GTK_SIGNAL_FUNC (on_cursor_change_cmd), message_list);
-
-	gtk_widget_show (message_list->etable);
-	
-	gtk_object_ref (GTK_OBJECT (message_list->table_model));
-	gtk_object_sink (GTK_OBJECT (message_list->table_model));
-	
-	/*
-	 * We do own the Etable, not some widget container
-	 */
-	gtk_object_ref (GTK_OBJECT (message_list->etable));
-	gtk_object_sink (GTK_OBJECT (message_list->etable));
-
-	message_list->summary_search_cache = g_ptr_array_new();
-}
-
-static void
-message_list_destroy (GtkObject *object)
-{
-	MessageList *message_list = MESSAGE_LIST (object);
-	int i;
-
-	
-	gtk_object_unref (GTK_OBJECT (message_list->table_model));
-	gtk_object_unref (GTK_OBJECT (message_list->header_model));
-	
-	/*
-	 * Renderers
-	 */
-	gtk_object_unref (GTK_OBJECT (message_list->render_text));
-	gtk_object_unref (GTK_OBJECT (message_list->render_online_status));
-	gtk_object_unref (GTK_OBJECT (message_list->render_message_status));
-	gtk_object_unref (GTK_OBJECT (message_list->render_priority));
-	gtk_object_unref (GTK_OBJECT (message_list->render_attachment));
-	
-	gtk_object_unref (GTK_OBJECT (message_list->etable));
-
-	if (message_list->summary_search_cache)
-		g_ptr_array_free(message_list->summary_search_cache, TRUE);
-	if (message_list->summary_table)
-		camel_folder_free_summary(message_list->folder, message_list->summary_table);
-	if (message_list->uid_rowmap)
-		g_hash_table_destroy(message_list->uid_rowmap);
-
-	for (i = 0; i < COL_LAST; i++)
-		gtk_object_unref (GTK_OBJECT (message_list->table_cols [i]));
-	
-	if (message_list->idle_id != 0)
-		g_source_remove(message_list->idle_id);
-
-	gtk_object_unref (GTK_OBJECT (message_list->folder));
-
-	GTK_OBJECT_CLASS (message_list_parent_class)->destroy (object);
-}
-
-/*
- * CORBA method: Evolution::MessageList::select_message
- */
-static void
-MessageList_select_message (PortableServer_Servant _servant,
-			    const CORBA_long message_number,
-			    CORBA_Environment *ev)
-{
-	printf ("FIXME: select message method\n");
-}
-
-/*
- * CORBA method: Evolution::MessageList::open_message
- */
-static void
-MessageList_open_message (PortableServer_Servant _servant,
-			  const CORBA_long message_number,
-			  CORBA_Environment *ev)
-{
-	printf ("FIXME: open message method\n");
-}
-
-static POA_Evolution_MessageList__epv *
-evolution_message_list_get_epv (void)
-{
-	POA_Evolution_MessageList__epv *epv;
-
-	epv = g_new0 (POA_Evolution_MessageList__epv, 1);
-
-	epv->select_message = MessageList_select_message;
-	epv->open_message   = MessageList_open_message;
-
-	return epv;
-}
-
-static void
-message_list_corba_class_init (void)
-{
-	evolution_message_list_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	evolution_message_list_vepv.Evolution_MessageList_epv = evolution_message_list_get_epv ();
-}
-
-/*
- * GtkObjectClass::init
- */
-static void
-message_list_class_init (GtkObjectClass *object_class)
-{
-	message_list_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = message_list_destroy;
-
-	message_list_corba_class_init ();
-
-	message_list_init_images ();
-}
-
-static void
-message_list_construct (MessageList *message_list, Evolution_MessageList corba_message_list)
-{
-	bonobo_object_construct (BONOBO_OBJECT (message_list), corba_message_list);
-}
-
-static Evolution_MessageList
-create_corba_message_list (BonoboObject *object)
-{
-	POA_Evolution_MessageList *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Evolution_MessageList *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &evolution_message_list_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_MessageList__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (Evolution_MessageList) bonobo_object_activate_servant (object, servant);
-}
-
-BonoboObject *
-message_list_new (FolderBrowser *parent_folder_browser)
-{
-	Evolution_MessageList corba_object;
-	MessageList *message_list;
-
-	g_assert (parent_folder_browser);
-
-	message_list = gtk_type_new (message_list_get_type ());
-
-	corba_object = create_corba_message_list (BONOBO_OBJECT (message_list));
-	if (corba_object == CORBA_OBJECT_NIL){
-		gtk_object_destroy (GTK_OBJECT (message_list));
-		return NULL;
-	}
-
-	message_list->parent_folder_browser = parent_folder_browser;
-
-	message_list->idle_id = 0;
-
-	message_list_construct (message_list, corba_object);
-
-	return BONOBO_OBJECT (message_list);
-}
-
-void
-message_list_set_search (MessageList *message_list, const char *search)
-{
-	if (message_list->matches) {
-		/* FIXME: free contents too ... */
-		g_list_free(message_list->matches);
-		message_list->matches = NULL;
-	}
-
-	if (message_list->search) {
-		g_free(message_list->search);
-		message_list->search = NULL;
-	}
-
-	if (search) {
-		CamelException ex;
-
-		camel_exception_init (&ex);
-		message_list->matches = camel_folder_search_by_expression(message_list->folder, search, &ex);
-		message_list->search = g_strdup(search);
-		message_list->match_count = g_list_length(message_list->matches);
-		g_ptr_array_set_size(message_list->summary_search_cache, message_list->match_count);
-		memset(message_list->summary_search_cache->pdata, 0, sizeof(message_list->summary_search_cache->pdata[0]) * message_list->match_count);
-	}
-
-	e_table_model_changed (message_list->table_model);
-	select_msg (message_list, 0);
-}
-
-static void
-folder_changed(CamelFolder *f, int type, MessageList *message_list)
-{
-	if (message_list->summary_table)
-		camel_folder_free_summary(f, message_list->summary_table);
-	message_list->summary_table = camel_folder_get_summary (f, NULL);
-
-	if (message_list->uid_rowmap)
-		g_hash_table_destroy(message_list->uid_rowmap);
-	message_list->uid_rowmap = g_hash_table_new (g_str_hash, g_str_equal);
-
-	message_list_set_search(message_list, message_list->search);
-}
-
-static void
-message_changed (CamelFolder *f, const char *uid, MessageList *message_list)
-{
-	int row;
-
-	row = get_message_row (message_list, uid);
-	if (row != -1)
-		e_table_model_row_changed (message_list->table_model, row);
-}
-
-void
-message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder)
-{
-	CamelException ex;
-
-	g_return_if_fail (message_list != NULL);
-	g_return_if_fail (camel_folder != NULL);
-	g_return_if_fail (IS_MESSAGE_LIST (message_list));
-	g_return_if_fail (CAMEL_IS_FOLDER (camel_folder));
-	g_return_if_fail (camel_folder_has_summary_capability (camel_folder));
-
-	if (message_list->matches) {
-		/* FIXME: free contents too ... */
-		g_list_free(message_list->matches);
-		message_list->matches = NULL;
-	}
-
-	camel_exception_init (&ex);
-	
-	if (message_list->folder)
-		gtk_object_unref (GTK_OBJECT (message_list->folder));
-
-	message_list->folder = camel_folder;
-
-	gtk_signal_connect(GTK_OBJECT (camel_folder), "folder_changed",
-			   folder_changed, message_list);
-	gtk_signal_connect(GTK_OBJECT (camel_folder), "message_changed",
-			   message_changed, message_list);
-
-	gtk_object_ref (GTK_OBJECT (camel_folder));
-
-	folder_changed (camel_folder, 0, message_list);
-
-	select_msg (message_list, 0);
-}
-
-GtkWidget *
-message_list_get_widget (MessageList *message_list)
-{
-	return message_list->etable;
-}
-
-E_MAKE_TYPE (message_list, "MessageList", MessageList, message_list_class_init, message_list_init, PARENT_TYPE);
-
-static gboolean
-on_cursor_change_idle (gpointer data)
-{
-	MessageList *message_list = data;
-
-	select_msg (message_list, message_list->selected_row);
-
-	message_list->idle_id = 0;
-	return FALSE;
-}
-
-static void
-on_cursor_change_cmd (ETable *table, 
-		      int row, 
-		      gpointer user_data)
-{
-	MessageList *message_list;
-	CamelMessageInfo *info;
-	
-	message_list = MESSAGE_LIST (user_data);
-	
-	info = get_message_info (message_list, row);
-	if (!info)
-		return;
-
-	message_list->selected_row = row;
-	message_list->selected_uid = info->uid;
-	
-	if (!message_list->idle_id)
-		message_list->idle_id = g_idle_add_full (G_PRIORITY_LOW, on_cursor_change_idle, message_list, NULL);
-}
-
-
-/* FIXME: this is all a kludge. */
-
-static gint
-idle_select_row (gpointer user_data)
-{
-	e_table_select_row (user_data, 0);
-	return FALSE;
-}
-
-static void
-select_row (ETable *table, gpointer user_data)
-{
-	MessageList *message_list = user_data;
-
-	gtk_idle_add (idle_select_row, message_list->etable);
-}
diff --git a/mail/message-list.h b/mail/message-list.h
deleted file mode 100644
index 28ce513e18..0000000000
--- a/mail/message-list.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _MESSAGE_LIST_H_
-#define _MESSAGE_LIST_H_
-
-#include "mail-types.h"
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object.h>
-#include "camel/camel-folder.h"
-#include "e-table/e-table.h"
-#include "e-table/e-table-simple.h"
-#include "e-table/e-cell-text.h"
-#include "e-table/e-cell-toggle.h"
-#include "e-table/e-cell-checkbox.h"
-#include "folder-browser.h"
-
-
-#define MESSAGE_LIST_TYPE        (message_list_get_type ())
-#define MESSAGE_LIST(o)          (GTK_CHECK_CAST ((o), MESSAGE_LIST_TYPE, MessageList))
-#define MESSAGE_LIST_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MESSAGE_LIST_TYPE, MessageListClass))
-#define IS_MESSAGE_LIST(o)       (GTK_CHECK_TYPE ((o), MESSAGE_LIST_TYPE))
-#define IS_MESSAGE_LIST_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MESSAGE_LIST_TYPE))
-
-typedef struct _Renderer Renderer;
-
-
-enum {
-	COL_ONLINE_STATUS,
-	COL_MESSAGE_STATUS,
-	COL_PRIORITY,
-	COL_ATTACHMENT,
-	COL_FROM,
-	COL_SUBJECT,
-	COL_SENT,
-	COL_RECEIVED,
-	COL_TO,
-	COL_SIZE,
-
-	COL_LAST,
-
-	/* Invisible columns */
-	COL_DELETED,
-	COL_UNREAD,
-};
-
-struct _MessageList {
-	BonoboObject parent;
-
-	/* the folder browser that contains the 
-	 * this message list */
-	FolderBrowser *parent_folder_browser;
-
-	ETableModel  *table_model;
-	ETableHeader *header_model;
-	ETableCol    *table_cols [COL_LAST];
-
-	ECell        *render_text;
-	ECell        *render_date;
-	ECell        *render_online_status;
-	ECell        *render_message_status;
-	ECell        *render_priority;
-	ECell        *render_attachment;
-
-	GtkWidget    *etable;
-
-	CamelFolder  *folder;
-
-	GPtrArray *summary_table; /* the summary of all messages */
-	GHashTable *uid_rowmap;
-
-	char *search;		/* search string */
-	/* FIXME: This should use a better format ... */
-	GList *matches;		/* when a search has been performed ... */
-	int match_count;
-	GPtrArray *summary_search_cache; /* summary info cache for searches */
-
-	int selected_row;
-	const char *selected_uid;
-
-	/* row-selection and seen-marking timers */
-	guint idle_id, seen_id;
-};
-
-typedef struct {
-	BonoboObjectClass parent_class;
-} MessageListClass;
-
-GtkType        message_list_get_type   (void);
-BonoboObject   *message_list_new        (FolderBrowser *parent_folder_browser);
-void           message_list_set_folder (MessageList *message_list,
-					CamelFolder *camel_folder);
-void           message_list_set_search (MessageList *message_list, const char *search);
-GtkWidget     *message_list_get_widget (MessageList *message_list);
-
-#endif /* _MESSAGE_LIST_H_ */
diff --git a/mail/pixmaps.h b/mail/pixmaps.h
deleted file mode 100644
index fdbb932771..0000000000
--- a/mail/pixmaps.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef EVOLUTION_PIXMAPS_H
-#define EVOLUTION_PIXMAPS_H
-
-#include "pixmaps/envelope-opened.xpm"
-#include "pixmaps/envelope-closed.xpm"
-#include "pixmaps/empty.xpm"
-#include "pixmaps/attachment.xpm"
-#include "pixmaps/attachment-header.xpm"
-#include "pixmaps/online-status.xpm"
-#include "pixmaps/message-status.xpm"
-#include "pixmaps/envelope-deleted.xpm"
-
-#endif /* EVOLUTION_PIXMAPS_H */
-
diff --git a/mail/pixmaps/attachment-header.xpm b/mail/pixmaps/attachment-header.xpm
deleted file mode 100644
index d3b0f96301..0000000000
--- a/mail/pixmaps/attachment-header.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * attachment_header_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"      ..        ",
-" +   ..  .....  ",
-"    ..  ..   .  ",
-"    .  ..    .  ",
-"   .. .     ..  ",
-"   .  .     .   ",
-"  ..       .    ",
-"  .      ..     ",
-"  .     ..      ",
-"  .......       ",
-"                ",
-"                ",
-"                "};
diff --git a/mail/pixmaps/attachment.xpm b/mail/pixmaps/attachment.xpm
deleted file mode 100644
index f154cceb18..0000000000
--- a/mail/pixmaps/attachment.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * attachment_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"       ..       ",
-"    .  . .      ",
-"    . .  ..     ",
-"    . .   .     ",
-"    . .   .     ",
-"    . .   .     ",
-"    . .   .     ",
-"    . .   .     ",
-"    .     .     ",
-"    .     .     ",
-"    ..   ..     ",
-"     .. ..      ",
-"       ..       ",
-"                ",
-"                "};
diff --git a/mail/pixmaps/empty.xpm b/mail/pixmaps/empty.xpm
deleted file mode 100644
index 93b02c0164..0000000000
--- a/mail/pixmaps/empty.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * empty_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #FFFFFF",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
diff --git a/mail/pixmaps/envelope-closed.xpm b/mail/pixmaps/envelope-closed.xpm
deleted file mode 100644
index 060b659c78..0000000000
--- a/mail/pixmaps/envelope-closed.xpm
+++ /dev/null
@@ -1,65 +0,0 @@
-/* XPM */
-static char * envelope_closed_xpm[] = {
-"16 16 46 1",
-" 	c None",
-".	c #000000",
-"+	c #837D71",
-"@	c #FFFFFF",
-"#	c #4E4B42",
-"$	c #767165",
-"%	c #FFFEFE",
-"&	c #FFF4DB",
-"*	c #FFFEFD",
-"=	c #F4E9D1",
-"-	c #625D54",
-";	c #D0C7B2",
-">	c #767166",
-",	c #FFFDFA",
-"'	c #F2E7CF",
-")	c #666257",
-"!	c #C8BFAB",
-"~	c #736D63",
-"{	c #FFFEFC",
-"]	c #F6EBD3",
-"^	c #EEE3CC",
-"/	c #FAEFD6",
-"(	c #918A7C",
-"_	c #7E786B",
-":	c #E0D6C0",
-"<	c #C7BEAA",
-"[	c #FDF2D9",
-"}	c #8A8476",
-"|	c #746F63",
-"1	c #CEC4B0",
-"2	c #8C8678",
-"3	c #F9EED5",
-"4	c #F1E6CE",
-"5	c #F7ECD3",
-"6	c #EFE4CD",
-"7	c #D1C7B2",
-"8	c #555149",
-"9	c #CDC4B0",
-"0	c #666258",
-"a	c #C1B8A5",
-"b	c #C2B9A6",
-"c	c #C0B7A4",
-"d	c #C3BAA7",
-"e	c #C4BBA8",
-"f	c #CAC1AD",
-"g	c #4E4B43",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"   ...........  ",
-"  .+@@@@@@@@@#. ",
-"  .@$%&@&*&=-;. ",
-"  .@&>%&,&')'!. ",
-"  .@&&~{&])&^!. ",
-"  .@&/()@)_=:<. ",
-"  .@[}&&)]]|1<. ",
-"  .@2&^3456789. ",
-"  .0abbbcddefg. ",
-"   ...........  ",
-"                "};
diff --git a/mail/pixmaps/envelope-deleted.xpm b/mail/pixmaps/envelope-deleted.xpm
deleted file mode 100644
index 9588ad2f0b..0000000000
--- a/mail/pixmaps/envelope-deleted.xpm
+++ /dev/null
@@ -1,54 +0,0 @@
-/* XPM */
-static char * envelope_deleted_xpm[] = {
-"16 16 35 1",
-" 	c None",
-".	c #FF0000",
-"+	c #000000",
-"@	c #837D71",
-"#	c #FFFFFF",
-"$	c #4E4B42",
-"%	c #767165",
-"&	c #FFFEFE",
-"*	c #FFF4DB",
-"=	c #F4E9D1",
-"-	c #625D54",
-";	c #D0C7B2",
-">	c #767166",
-",	c #FFFDFA",
-"'	c #666257",
-")	c #F2E7CF",
-"!	c #C8BFAB",
-"~	c #FFFEFC",
-"{	c #F6EBD3",
-"]	c #EEE3CC",
-"^	c #918A7C",
-"/	c #E0D6C0",
-"(	c #C7BEAA",
-"_	c #8A8476",
-":	c #F9EED5",
-"<	c #F1E6CE",
-"[	c #F7ECD3",
-"}	c #EFE4CD",
-"|	c #D1C7B2",
-"1	c #C1B8A5",
-"2	c #C2B9A6",
-"3	c #C0B7A4",
-"4	c #C3BAA7",
-"5	c #C4BBA8",
-"6	c #CAC1AD",
-"                ",
-"                ",
-"              . ",
-" ...       ...  ",
-"   ...    ..    ",
-"   ++..++..+++  ",
-"  +@###...###$+ ",
-"  +#%&*...*=-;+ ",
-"  +#*>..,..')!+ ",
-"  +#*..~*{.*]!+ ",
-"  +#..^'#'../(+ ",
-"  +#._**'{{..(+ ",
-"  +..*]:<[}|..+ ",
-"  +.122234456.+ ",
-"   +++++++++++  ",
-"                "};
diff --git a/mail/pixmaps/envelope-opened.xpm b/mail/pixmaps/envelope-opened.xpm
deleted file mode 100644
index 40de0d743d..0000000000
--- a/mail/pixmaps/envelope-opened.xpm
+++ /dev/null
@@ -1,74 +0,0 @@
-/* XPM */
-static char * envelope_opened_xpm[] = {
-"16 16 55 1",
-" 	c None",
-".	c #000000",
-"+	c #F4EDDD",
-"@	c #F1EBDB",
-"#	c #F1EAD8",
-"$	c #EAE3CB",
-"%	c #F4EAD5",
-"&	c #F1E6CF",
-"*	c #DDD4BE",
-"=	c #ECE3CD",
-"-	c #D3CAB6",
-";	c #C1C1C1",
-">	c #BDBDBD",
-",	c #BFBFBF",
-"'	c #12110F",
-")	c #FFFFFF",
-"!	c #514D45",
-"~	c #767165",
-"{	c #D0C7B2",
-"]	c #FFF4DB",
-"^	c #625D54",
-"/	c #565249",
-"(	c #F2E7CF",
-"_	c #C8BFAB",
-":	c #3B3732",
-"<	c #837D71",
-"[	c #807A6D",
-"}	c #45423B",
-"|	c #EEE3CC",
-"1	c #FBF0D7",
-"2	c #918A7C",
-"3	c #7E786B",
-"4	c #F4E9D1",
-"5	c #E0D6C0",
-"6	c #C7BEAA",
-"7	c #FDF2D9",
-"8	c #6A665B",
-"9	c #F6EBD3",
-"0	c #656157",
-"a	c #CEC4B0",
-"b	c #6D675D",
-"c	c #F9EED5",
-"d	c #F1E6CE",
-"e	c #F7ECD3",
-"f	c #EFE4CD",
-"g	c #D1C7B2",
-"h	c #CDC4B0",
-"i	c #080707",
-"j	c #C1B8A5",
-"k	c #C2B9A6",
-"l	c #C0B7A4",
-"m	c #C3BAA7",
-"n	c #C4BBA8",
-"o	c #CAC1AD",
-"p	c #1E1D1A",
-"                ",
-"                ",
-"      .....     ",
-"     .+@##$.    ",
-"    .%&&&&&*.   ",
-"   .=&&&&&&&-.  ",
-"  ..;>>>>>>>,'. ",
-"  .)!)))))))~{. ",
-"  .)]^)))))/(_. ",
-"  .)]]:<<[}]|_. ",
-"  .)]12]]]3456. ",
-"  .)78]]]990a6. ",
-"  .)b]|cdefg0h. ",
-"  .ijkkklmmnop. ",
-"   ...........  ",
-"                "};
diff --git a/mail/pixmaps/message-status.xpm b/mail/pixmaps/message-status.xpm
deleted file mode 100644
index a0c4414f3f..0000000000
--- a/mail/pixmaps/message-status.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * message_status_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #09B0F2",
-"+	c #33A8D6",
-"                ",
-"       ..       ",
-"       ..       ",
-"      ++++      ",
-"      ++++      ",
-"      ++++      ",
-"  +++++++++++   ",
-"..+++++..++++.. ",
-"..+++++..++++.. ",
-"  +++++++++++   ",
-"      ++++      ",
-"      ++++      ",
-"      ++++      ",
-"       ..       ",
-"       ..       ",
-"                "};
diff --git a/mail/pixmaps/online-status.xpm b/mail/pixmaps/online-status.xpm
deleted file mode 100644
index 88009ea480..0000000000
--- a/mail/pixmaps/online-status.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * online_status_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000",
-"+	c #9B9B9B",
-"@	c #5CE537",
-"                ",
-"  .             ",
-"  .             ",
-"  .             ",
-"  .  +........+ ",
-"  .  .++++++++. ",
-"  .. .++++++@+. ",
-"   ...++++++++. ",
-"  .. .++++++++. ",
-"  .  .++++++++. ",
-"  .  +........+ ",
-"  .             ",
-"  .             ",
-"  .             ",
-"  .             ",
-"                "};
diff --git a/mail/session.c b/mail/session.c
deleted file mode 100644
index 09b1250cf1..0000000000
--- a/mail/session.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * session.c: handles the session information and resource manipulation
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 2000 Helix Code, Inc. http://www.helixcode.com
- */
-#include <config.h>
-#include <gnome.h>
-#include "mail.h"
-#include "mail-threads.h"
-#include "e-util/e-setup.h"
-
-CamelSession *session;
-GHashTable *passwords;
-
-/* FIXME: Will this ever be called in a non-async
- * manner? Better hope not, cause if that happens
- * we deadlock....
- */
-
-#define ASYNC_AUTH_CALLBACK
-
-#ifndef ASYNC_AUTH_CALLBACK
-static void
-request_callback (gchar *string, gpointer data)
-{
-	char **ans = data;
-
-	if (string)
-		*ans = g_strdup(string);
-	else
-		*ans = NULL;
-}
-#endif
-
-static char *
-evolution_auth_callback (CamelAuthCallbackMode mode, char *data,
-			 gboolean secret, CamelService *service, char *item,
-			 CamelException *ex)
-{
-#ifndef ASYNC_AUTH_CALLBACK
-	GtkWidget *dialog;
-#endif
-
-	char *key, *ans;
-
-	if (!passwords)
-		passwords = g_hash_table_new (g_str_hash, g_str_equal);
-
-	key = g_strdup_printf ("%s:%s",
-			       camel_url_to_string (service->url, FALSE),
-			       item);
-
-	if (mode == CAMEL_AUTHENTICATOR_TELL) {
-		if (!data) {
-			g_hash_table_remove (passwords, key);
-			g_free (key);
-		} else {
-			gpointer old_key, old_data;
-
-			if (g_hash_table_lookup_extended (passwords, key,
-							  &old_key,
-							  &old_data)) {
-				g_hash_table_insert (passwords, old_key, data);
-				g_free (old_data);
-				g_free (key);
-			} else
-				g_hash_table_insert (passwords, key, data);
-		}
-
-		return NULL;
-	}
-
-	ans = g_hash_table_lookup (passwords, key);
-	if (ans) {
-		g_free (key);
-		return g_strdup (ans);
-	}
-
-#ifndef ASYNC_AUTH_CALLBACK
-	/* XXX parent window? */
-	dialog = gnome_request_dialog (secret, data, NULL, 0,
-				       request_callback, &ans, NULL);
-	if (!dialog) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     "Could not create dialog box.");
-		g_free (key);
-		return NULL;
-	}
-	if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == -1 ||
-	    ans == NULL) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     "User cancelled query.");
-		g_free (key);
-		return NULL;
-	}
-#else
-	if( mail_op_get_password( data, secret, &ans ) == FALSE ) {
-		camel_exception_set( ex, CAMEL_EXCEPTION_USER_CANCEL, ans );
-		g_free( key );
-		return NULL;
-	}
-#endif
-
-	g_hash_table_insert (passwords, key, g_strdup (ans));
-	return ans;
-}
-
-void
-session_init (void)
-{
-	e_setup_base_dir ();
-	camel_init ();
-
-	session = camel_session_new (evolution_auth_callback);
-}
-
-static gboolean
-free_entry (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	memset (value, 0, strlen (value));
-	g_free (value);
-	return TRUE;
-}
-
-void
-forget_passwords (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	g_hash_table_foreach_remove (passwords, free_entry, NULL);
-}
diff --git a/mail/test-mail.c b/mail/test-mail.c
deleted file mode 100644
index f2a39bf104..0000000000
--- a/mail/test-mail.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Tests the mail summary display bonobo component
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#ifdef USING_OAF
-
-#include <liboaf/liboaf.h>
-
-static void
-init_corba (int *argc, char *argv[])
-{
-	gnome_init ("sample-control-container", "1.0", *argc, argv);
-	oaf_init (*argc, argv);
-}
-
-#else  /* USING_OAF */
-
-#include <libgnorba/gnorba.h>
-
-static void
-init_corba (int *argc, char *argv [])
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	gnome_CORBA_init ("sample-control-container", "1.0", argc, argv, 0, &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-#endif /* USING_OAF */
-
-static guint
-create_container (void)
-{
-	GtkWidget *window, *control;
-	BonoboUIHandler *uih;
-
-	gdk_rgb_init ();
-
-	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
-	gtk_widget_set_default_visual (gdk_rgb_get_visual ());
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_widget_set_usize (GTK_WIDGET (window), 640, 480);
-	gtk_widget_show (GTK_WIDGET (window));
-
-	uih = bonobo_ui_handler_new ();
-
-#ifdef USING_OAF
-	control = bonobo_widget_new_control ("OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45",
-					     bonobo_object_corba_objref (BONOBO_OBJECT (uih)));
-#else
-	control = bonobo_widget_new_control ("control:evolution-mail",
-				     bonobo_object_corba_objref (BONOBO_OBJECT (uih)));
-#endif
-	
-	if (control == NULL){
-		printf ("Could not launch mail control\n");
-		exit (1);
-	}
-	gtk_container_add (GTK_CONTAINER (window), control);
-
-	gtk_widget_show (window);
-	gtk_widget_show (control);
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char *argv [])
-{
-	init_corba (&argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error ("Could not initialize Bonobo\n");
-	
-	gtk_idle_add ((GtkFunction) create_container, NULL);
-
-	/*
-	 * Main loop
-	 */
-	bonobo_main ();
-	
-	return 0;
-}
-
-
-
-
-
diff --git a/mail/test-thread.c b/mail/test-thread.c
deleted file mode 100644
index 9c62e7f78c..0000000000
--- a/mail/test-thread.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Tests the multithreaded UI code */
-
-#include "config.h"
-#include <unistd.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <libgnomeui/libgnomeui.h>
-#include <stdio.h>
-#include "mail-threads.h"
-
-static void op_1( gpointer userdata );
-static void op_2( gpointer userdata );
-static void op_3( gpointer userdata );
-static void op_4( gpointer userdata );
-static void op_5( gpointer userdata );
-static void done( gpointer userdata );
-static gboolean queue_ops( void );
-
-static gboolean queue_ops( void )
-{
-	int i;
-	gchar buf[32];
-
-	g_message( "Top of queue_ops" );
-
-	mail_operation_try( "The Crawling Progress Bar of Doom", op_1, done, "op1 finished" );
-	mail_operation_try( "The Mysterious Message Setter", op_2, done, "op2 finished" );
-	mail_operation_try( "The Error Dialog of No Return", op_3, done, "op3 finished" );
-
-	for( i = 0; i < 3; i++ ) {
-		sprintf( buf, "Queue Filler %d", i );
-		mail_operation_try( buf, op_4, NULL, GINT_TO_POINTER( i ) );
-	}
-
-	g_message( "Waiting for finish..." );
-	mail_operation_wait_for_finish();
-
-	g_message( "Ops done -- queue some more!" );
-
-	mail_operation_try( "Progress Bar Redux", op_1, NULL, NULL );
-
-	g_message( "Waiting for finish again..." );
-	mail_operation_wait_for_finish();
-
-	g_message( "Ops done -- more, more!" );
-
-	mail_operation_try( "Dastardly Password Stealer", op_5, NULL, NULL );
-
-	for( i = 0; i < 3; i++ ) {
-		sprintf( buf, "Queue Filler %d", i );
-		mail_operation_try( buf, op_4, NULL, GINT_TO_POINTER( i ) );
-	}
-
-	g_message( "Waiting for finish AGAIN..." );
-	mail_operation_wait_for_finish();
-	g_message( "Ops done again. Exiting 0" );
-	gtk_exit( 0 );
-	return FALSE;
-}
-
-static void op_1( gpointer userdata )
-{
-	gfloat pct;
-
-	mail_op_show_progressbar();
-	mail_op_set_message( "Watch the progress bar!" );
-
-	for( pct = 0.0; pct < 1.0; pct += 0.2 ) {
-		sleep( 1 );
-		mail_op_set_percentage( pct );
-	}
-}
-
-static void op_2( gpointer userdata )
-{
-	int i;
-
-	mail_op_hide_progressbar();
-	for( i = 5; i > 0; i-- ) {
-		mail_op_set_message( "%d", i );
-		sleep( 1 );
-	}
-
-	mail_op_set_message( "BOOOM!" );
-	sleep( 1 );
-}
-
-static void op_3( gpointer userdata )
-{
-	gfloat pct;
-
-	mail_op_show_progressbar();
-	mail_op_set_message( "Frobulating the foosamatic" );
-
-	for( pct = 0.0; pct < 0.3; pct += 0.1 ) {
-		mail_op_set_percentage( pct );
-		sleep( 1 );
-	}
-
-	mail_op_error( "Oh no! The foosamatic was booby-trapped!" );
-	sleep( 1 );
-}
-
-static void op_4( gpointer userdata )
-{
-	mail_op_hide_progressbar();
-	mail_op_set_message( "Filler # %d", GPOINTER_TO_INT( userdata ) );
-	sleep( 1 );
-}
-
-static void op_5( gpointer userdata )
-{
-	gchar *pass;
-	gboolean ret;
-
-	mail_op_show_progressbar();
-	mail_op_set_percentage( 0.5 );
-
-	ret = mail_op_get_password( "What is your super-secret password?", TRUE, &pass );
-
-	if( ret == FALSE )
-		mail_op_set_message( "Oh no, you cancelled! : %s", pass );
-	else
-		mail_op_set_message( "\"%s\", you said?", pass );
-
-	sleep( 1 );
-}
-
-static void done( gpointer userdata )
-{
-	g_message( "Operation done: %s", (gchar *) userdata );
-}
-
-int main( int argc, char **argv )
-{
-	g_thread_init( NULL );
-	gnome_init( "test-thread", "0.0", argc, argv );
-	gtk_idle_add( (GtkFunction) queue_ops, NULL );
-	gtk_main();
-	return 0;
-}