Merge branch 'master' into kill-bonobo

Conflicts:
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/component-factory.c
	addressbook/gui/component/eab-composer-util.h
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/e-addressbook-model.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/e-addressbook-view.h
	addressbook/gui/widgets/eab-gui-util.c
	addressbook/gui/widgets/eab-gui-util.h
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup.h
	calendar/gui/calendar-component.c
	calendar/gui/e-cal-event.h
	calendar/gui/e-calendar-table.c
	calendar/gui/e-calendar-view.c
	calendar/gui/e-calendar-view.h
	calendar/gui/e-memo-table.c
	calendar/gui/memos-component.c
	calendar/gui/tasks-component.c
	composer/e-composer-header-table.c
	composer/e-composer-private.h
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	composer/evolution-composer.ui
	configure.ac
	data/icons/Makefile.am
	em-format/em-format.c
	em-format/em-format.h
	mail/Makefile.am
	mail/e-mail-shell-migrate.c
	mail/e-searching-tokenizer.c
	mail/e-searching-tokenizer.h
	mail/em-composer-utils.c
	mail/em-composer-utils.h
	mail/em-folder-browser.c
	mail/em-folder-tree-model.c
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html-display.h
	mail/em-mailer-prefs.c
	mail/em-message-browser.c
	plugins/vcard-inline/Makefile.am
	plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
	plugins/vcard-inline/vcard-inline.c
	shell/e-component-registry.h
	shell/e-shell-window.c
	shell/es-menu.h
	widgets/misc/e-filter-bar.c
	widgets/misc/e-filter-bar.h
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h

47 files changed, 3862 insertions, 982 deletions

diff --git a/autogen.sh b/autogen.sh
index 267560d8a9..1e2af1a08c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="Evolution"
 REQUIRED_AUTOMAKE_VERSION=1.6
 
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
   && test -f $srcdir/ChangeLog \
   && test -d $srcdir/shell) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 11c3c8f33d..3341d7c51b 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -1575,8 +1575,16 @@ calendar_config_select_day_second_zone (void)
 	dialog = e_timezone_dialog_get_toplevel (tzdlg);
 
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+		const char *location = NULL;
+
 		zone = e_timezone_dialog_get_timezone (tzdlg);
-		calendar_config_set_day_second_zone (zone ? icaltimezone_get_location (zone) : NULL);
+		if (zone == icaltimezone_get_utc_timezone ()) {
+			location = "UTC";
+		} else if (zone) {
+			location = icaltimezone_get_location (zone);
+		}
+
+		calendar_config_set_day_second_zone (location);
 	}
 
 	g_object_unref (tzdlg);
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 57704da0f2..53fdacefb9 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -820,8 +820,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
 	e_cal_component_get_recurid (comp, &rid);
 	e_cal_component_get_dtstart (comp, &sdt);
 
-	if (icaltime_compare_date_only (*rid.datetime.value, *sdt.value) == 0)
-	{
+	if (rid.datetime.value && sdt.value && icaltime_compare_date_only (*rid.datetime.value, *sdt.value) == 0) {
 		ECalComponentDateTime msdt, medt, edt;
 		int *sequence;
 
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index bee9daf99a..049f90a1ff 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1934,7 +1934,7 @@ comp_editor_set_summary (CompEditor *editor,
 		!editor->priv->warned &&
 		!(editor->priv->flags & COMP_EDITOR_DELEGATE) &&
 		editor->priv->existing_org &&
-		!editor->priv->user_org;
+		!editor->priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM);
 
 	if (show_warning) {
 		e_notice (
@@ -1982,7 +1982,8 @@ comp_editor_set_changed (CompEditor *editor,
 	show_warning =
 		changed && !editor->priv->warned &&
 		!(editor->priv->flags & COMP_EDITOR_DELEGATE) &&
-		editor->priv->existing_org && !editor->priv->user_org;
+		editor->priv->existing_org && !editor->priv->user_org
+		&& !(editor->priv->flags & COMP_EDITOR_NEW_ITEM);
 
 	if (show_warning) {
 		e_notice (
@@ -2808,7 +2809,7 @@ page_dates_changed_cb (CompEditor *editor,
 		if (page != (CompEditorPage *) l->data)
 			comp_editor_page_set_dates (l->data, dates);
 
-	if (!priv->warned && priv->existing_org && !priv->user_org) {
+	if (!priv->warned && priv->existing_org && !priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM)) {
 		e_notice (priv->notebook, GTK_MESSAGE_INFO,
 			  _("Changes made to this item may be discarded if an update arrives"));
 		priv->warned = TRUE;
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 3508f38f02..e5ae1e6cdc 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -167,7 +167,7 @@ cb_toggled_cb (GtkWidget *toggle, gpointer data)
 }
 
 gboolean
-prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent)
+prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent, gboolean *retract)
 {
 	char *message = NULL;
 	ECalComponentVType type = E_CAL_COMPONENT_NO_TYPE;
@@ -232,13 +232,15 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare
 			GtkTextIter text_iter_start, text_iter_end;
 			GtkTextBuffer *text_buffer;
 
+			*retract = TRUE;
 			text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
 			gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
 			gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
 
 			*retract_text = gtk_text_buffer_get_text (text_buffer, &text_iter_start,
 					&text_iter_end, FALSE);
-		}
+		} else
+			*retract = FALSE;
 	}
 
 	gtk_widget_destroy ((GtkWidget *) dialog);
diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h
index a2f85301a0..bb4b5983d9 100644
--- a/calendar/gui/dialogs/delete-comp.h
+++ b/calendar/gui/dialogs/delete-comp.h
@@ -33,6 +33,6 @@ gboolean delete_component_dialog (ECalComponent *comp,
 				  gboolean consider_as_untitled,
 				  int n_comps, ECalComponentVType vtype,
 				  GtkWidget *widget);
-gboolean prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent);
+gboolean prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent, gboolean *retract);
 
 #endif
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index e914e5095b..26c0ad6dea 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1132,9 +1132,6 @@ check_for_retract (ECalComponent *comp, ECal *client)
 		ret_val = TRUE;
 	}
 
-	if (!ret_val)
-		ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
-
 	g_free (email);
 	return ret_val;
 }
@@ -1180,8 +1177,7 @@ e_calendar_table_delete_selected (ECalendarTable *cal_table)
 		char *retract_comment = NULL;
 		gboolean retract = FALSE;
 
-		retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_table));
-		delete = retract;
+		delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_table), &retract);
 		if (retract) {
 			GList *users = NULL;
 			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 4a3bd2e75c..cc51599440 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -73,7 +73,6 @@ struct _ECalendarViewPrivate {
 static void e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
 static void e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
 static void e_calendar_view_destroy (GtkObject *object);
-static void open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags);
 
 
 /* Property IDs */
@@ -963,9 +962,6 @@ check_for_retract (ECalComponent *comp, ECal *client)
 		ret_val = TRUE;
 	}
 
-	if (!ret_val)
-		ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
-
 	g_free (email);
 	return ret_val;
 }
@@ -986,11 +982,12 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 	if (!e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER))
 		e_cal_component_set_recurid (comp, NULL);
 
+	/*FIXME Retract should be moved to Groupwise features plugin */
 	if (check_for_retract (comp, event->comp_data->client)) {
 		char *retract_comment = NULL;
 		gboolean retract = FALSE;
 
-		retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view));
+		delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view), &retract);
 		if (retract) {
 			GList *users = NULL;
 			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
@@ -1102,11 +1099,12 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 	vtype = e_cal_component_get_vtype (comp);
 
+	/*FIXME Retract should be moved to Groupwise features plugin */
 	if (check_for_retract (comp, event->comp_data->client)) {
 		char *retract_comment = NULL;
 		gboolean retract = FALSE;
 
-		retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view));
+		delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view), &retract);
 		if (retract) {
 			GList *users = NULL;
 			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
@@ -1569,7 +1567,7 @@ on_delegate (EPopup *ep, EPopupItem *pitem, void *data)
 
 		flags |= COMP_EDITOR_MEETING | COMP_EDITOR_DELEGATE;
 
-		open_event_with_flags (cal_view, event->comp_data->client, clone, flags);
+		e_calendar_view_open_event_with_flags (cal_view, event->comp_data->client, clone, flags);
 
 		icalcomponent_free (clone);
 		g_list_free (selected);
@@ -1917,7 +1915,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
 		flags |= COMP_EDITOR_USER_ORG;
 	}
 
-	open_event_with_flags (cal_view, default_client,
+	e_calendar_view_open_event_with_flags (cal_view, default_client,
 			icalcomp, flags);
 
 	g_object_unref (comp);
@@ -2008,8 +2006,8 @@ object_created_cb (CompEditor *ce, ECalendarView *cal_view)
 #endif
 }
 
-static void
-open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags)
+CompEditor *
+e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags)
 {
 	CompEditor *ce;
 	const char *uid;
@@ -2038,6 +2036,7 @@ open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *ica
 
 	gtk_window_present (GTK_WINDOW (ce));
 
+	return ce;
 }
 
 /**
@@ -2072,7 +2071,7 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view,
 	}
 
 
-	open_event_with_flags (cal_view, client, icalcomp, flags);
+	e_calendar_view_open_event_with_flags (cal_view, client, icalcomp, flags);
 }
 
 void
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index e5d8478b8e..5116c7c9c9 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include "e-cal-model.h"
 #include "gnome-cal.h"
+#include "dialogs/comp-editor.h"
 
 G_BEGIN_DECLS
 
@@ -142,6 +143,7 @@ void           e_calendar_view_paste_clipboard (ECalendarView *cal_view);
 void           e_calendar_view_delete_selected_event (ECalendarView *cal_view);
 void           e_calendar_view_delete_selected_events (ECalendarView *cal_view);
 void           e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view);
+CompEditor*    e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags);
 
 GtkMenu       *e_calendar_view_create_popup_menu (ECalendarView *cal_view);
 
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 915f0efb3c..6638cf7aef 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -299,104 +299,6 @@ action_smime_sign_cb (GtkToggleAction *action,
 	gtkhtml_editor_set_changed (editor, TRUE);
 }
 
-static void
-action_view_bcc_cb (GtkToggleAction *action,
-                    EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_BCC, active);
-}
-
-static void
-action_view_cc_cb (GtkToggleAction *action,
-                   EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_CC, active);
-}
-
-static void
-action_view_from_cb (GtkToggleAction *action,
-                     EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_FROM, active);
-}
-
-static void
-action_view_post_to_cb (GtkToggleAction *action,
-                        EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_POST_TO, active);
-}
-
-static void
-action_view_reply_to_cb (GtkToggleAction *action,
-                         EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_REPLY_TO, active);
-}
-
-static void
-action_view_subject_cb (GtkToggleAction *action,
-                        EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_SUBJECT, active);
-}
-
-static void
-action_view_to_cb (GtkToggleAction *action,
-                   EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_TO, active);
-}
-
 static GtkActionEntry entries[] = {
 
 	{ "attach",
@@ -541,7 +443,7 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  N_("_Bcc Field"),
 	  NULL,
 	  N_("Toggles whether the BCC field is displayed"),
-	  G_CALLBACK (action_view_bcc_cb),
+	  NULL,  /* Handled by property bindings */
 	  FALSE },
 
 	{ "view-cc",
@@ -549,7 +451,7 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  N_("_Cc Field"),
 	  NULL,
 	  N_("Toggles whether the CC field is displayed"),
-	  G_CALLBACK (action_view_cc_cb),
+	  NULL,  /* Handled by property bindings */
 	  FALSE },
 
 	{ "view-from",
@@ -557,15 +459,7 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  N_("_From Field"),
 	  NULL,
 	  N_("Toggles whether the From chooser is displayed"),
-	  G_CALLBACK (action_view_from_cb),
-	  FALSE },
-
-	{ "view-post-to",
-	  NULL,
-	  N_("_Post-To Field"),
-	  NULL,
-	  N_("Toggles whether the Post-To field is displayed"),
-	  G_CALLBACK (action_view_post_to_cb),
+	  NULL,  /* Handled by property bindings */
 	  FALSE },
 
 	{ "view-reply-to",
@@ -573,24 +467,8 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  N_("_Reply-To Field"),
 	  NULL,
 	  N_("Toggles whether the Reply-To field is displayed"),
-	  G_CALLBACK (action_view_reply_to_cb),
+	  NULL,  /* Handled by property bindings */
 	  FALSE },
-
-	{ "view-subject",
-	  NULL,
-	  N_("_Subject Field"),
-	  NULL,
-	  N_("Toggles whether the Subject field is displayed"),
-	  G_CALLBACK (action_view_subject_cb),
-	  FALSE },
-
-	{ "view-to",
-	  NULL,
-	  N_("_To Field"),
-	  NULL,
-	  N_("Toggles whether the To field is displayed"),
-	  G_CALLBACK (action_view_to_cb),
-	  FALSE }
 };
 
 void
diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h
index c17f3ebc32..da3e470d81 100644
--- a/composer/e-composer-actions.h
+++ b/composer/e-composer-actions.h
@@ -61,13 +61,7 @@
 	E_COMPOSER_ACTION ((composer), "view-cc")
 #define E_COMPOSER_ACTION_VIEW_FROM(composer) \
 	E_COMPOSER_ACTION ((composer), "view-from")
-#define E_COMPOSER_ACTION_VIEW_POST_TO(composer) \
-	E_COMPOSER_ACTION ((composer), "view-post-to")
 #define E_COMPOSER_ACTION_VIEW_REPLY_TO(composer) \
 	E_COMPOSER_ACTION ((composer), "view-reply-to")
-#define E_COMPOSER_ACTION_VIEW_SUBJECT(composer) \
-	E_COMPOSER_ACTION ((composer), "view-subject")
-#define E_COMPOSER_ACTION_VIEW_TO(composer) \
-	E_COMPOSER_ACTION ((composer), "view-to")
 
 #endif /* E_COMPOSER_ACTIONS_H */
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index d539565ad2..267bfbf1e7 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -22,7 +22,9 @@
 #include <camel/camel-internet-address.h>
 #include <libedataserverui/e-name-selector.h>
 
-#include "e-signature-combo-box.h"
+#include "e-util/e-binding.h"
+#include "e-util/gconf-bridge.h"
+#include "widgets/misc/e-signature-combo-box.h"
 
 #include "e-composer-from-header.h"
 #include "e-composer-name-header.h"
@@ -33,34 +35,6 @@
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate))
 
-#define E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER(table) \
-	(E_COMPOSER_FROM_HEADER (e_composer_header_table_get_header \
-	(E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_FROM)))
-
-#define E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER(table) \
-	(E_COMPOSER_TEXT_HEADER (e_composer_header_table_get_header \
-	(E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_REPLY_TO)))
-
-#define E_COMPOSER_HEADER_TABLE_GET_TO_HEADER(table) \
-	(E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \
-	(E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_TO)))
-
-#define E_COMPOSER_HEADER_TABLE_GET_CC_HEADER(table) \
-	(E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \
-	(E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_CC)))
-
-#define E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER(table) \
-	(E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \
-	(E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_BCC)))
-
-#define E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER(table) \
-	(E_COMPOSER_POST_HEADER (e_composer_header_table_get_header \
-	(E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_POST_TO)))
-
-#define E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER(table) \
-	(E_COMPOSER_TEXT_HEADER (e_composer_header_table_get_header \
-	(E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_SUBJECT)))
-
 #define HEADER_TOOLTIP_TO \
 	_("Enter the recipients of the message")
 #define HEADER_TOOLTIP_CC \
@@ -71,6 +45,8 @@
 	  "carbon copy of the message without appearing " \
 	  "in the recipient list of the message")
 
+#define GCONF_KEY_PREFIX	"/apps/evolution/mail/composer"
+
 enum {
 	PROP_0,
 	PROP_ACCOUNT,
@@ -88,6 +64,7 @@ enum {
 
 struct _EComposerHeaderTablePrivate {
 	EComposerHeader *headers[E_COMPOSER_NUM_HEADERS];
+	guint gconf_bindings[E_COMPOSER_NUM_HEADERS];
 	GtkWidget *signature_label;
 	GtkWidget *signature_combo_box;
 	ENameSelector *name_selector;
@@ -296,26 +273,160 @@ skip_custom:
 }
 
 static void
+composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
+{
+	GConfBridge *bridge;
+	gint ii;
+
+	bridge = gconf_bridge_get ();
+
+	for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) {
+		EComposerHeader *header;
+		const gchar *key;
+		guint binding_id;
+
+		binding_id = table->priv->gconf_bindings[ii];
+		header = e_composer_header_table_get_header (table, ii);
+
+		if (binding_id > 0)
+			gconf_bridge_unbind (bridge, binding_id);
+
+		switch (ii) {
+			case E_COMPOSER_HEADER_BCC:
+				key = GCONF_KEY_PREFIX "/show_mail_bcc";
+				break;
+
+			case E_COMPOSER_HEADER_CC:
+				key = GCONF_KEY_PREFIX "/show_mail_cc";
+				break;
+
+			case E_COMPOSER_HEADER_FROM:
+				key = GCONF_KEY_PREFIX "/show_mail_from";
+				break;
+
+			case E_COMPOSER_HEADER_REPLY_TO:
+				key = GCONF_KEY_PREFIX "/show_mail_reply_to";
+				break;
+
+			default:
+				key = NULL;
+				break;
+		}
+
+		switch (ii) {
+			case E_COMPOSER_HEADER_BCC:
+			case E_COMPOSER_HEADER_CC:
+			case E_COMPOSER_HEADER_FROM:
+			case E_COMPOSER_HEADER_REPLY_TO:
+			case E_COMPOSER_HEADER_SUBJECT:
+			case E_COMPOSER_HEADER_TO:
+				e_composer_header_set_sensitive (header, TRUE);
+				e_composer_header_set_visible (header, TRUE);
+				break;
+
+			default:
+				e_composer_header_set_sensitive (header, FALSE);
+				e_composer_header_set_visible (header, FALSE);
+				break;
+		}
+
+		if (key != NULL)
+			binding_id = gconf_bridge_bind_property (
+				bridge, key, G_OBJECT (header), "visible");
+		else
+			binding_id = 0;
+
+		table->priv->gconf_bindings[ii] = binding_id;
+	}
+}
+
+static void
+composer_header_table_setup_post_headers (EComposerHeaderTable *table)
+{
+	GConfBridge *bridge;
+	gint ii;
+
+	bridge = gconf_bridge_get ();
+
+	for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) {
+		EComposerHeader *header;
+		const gchar *key;
+		guint binding_id;
+
+		binding_id = table->priv->gconf_bindings[ii];
+		header = e_composer_header_table_get_header (table, ii);
+
+		if (binding_id > 0)
+			gconf_bridge_unbind (bridge, binding_id);
+
+		switch (ii) {
+			case E_COMPOSER_HEADER_FROM:
+				key = GCONF_KEY_PREFIX "/show_post_from";
+				break;
+
+			case E_COMPOSER_HEADER_REPLY_TO:
+				key = GCONF_KEY_PREFIX "/show_post_reply_to";
+				break;
+
+			default:
+				key = NULL;
+				break;
+		}
+
+		switch (ii) {
+			case E_COMPOSER_HEADER_FROM:
+			case E_COMPOSER_HEADER_POST_TO:
+			case E_COMPOSER_HEADER_REPLY_TO:
+			case E_COMPOSER_HEADER_SUBJECT:
+				e_composer_header_set_sensitive (header, TRUE);
+				e_composer_header_set_visible (header, TRUE);
+				break;
+
+			default:  /* this includes TO, CC and BCC */
+				e_composer_header_set_sensitive (header, FALSE);
+				e_composer_header_set_visible (header, FALSE);
+				break;
+		}
+
+		if (key != NULL)
+			binding_id = gconf_bridge_bind_property (
+				bridge, key, G_OBJECT (header), "visible");
+		else
+			binding_id = 0;
+
+		table->priv->gconf_bindings[ii] = binding_id;
+	}
+}
+
+static void
 composer_header_table_from_changed_cb (EComposerHeaderTable *table)
 {
 	EAccount *account;
+	EComposerHeader *header;
+	EComposerHeaderType type;
 	EComposerPostHeader *post_header;
 	EComposerTextHeader *text_header;
 	EDestination **old_destinations;
 	EDestination **new_destinations;
 	const gchar *reply_to;
+	const gchar *source_url;
 	gboolean always_cc;
 	gboolean always_bcc;
 
 	/* Keep "Post-To" and "Reply-To" synchronized with "From" */
 
 	account = e_composer_header_table_get_account (table);
+	source_url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
 
-	post_header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table);
+	type = E_COMPOSER_HEADER_POST_TO;
+	header = e_composer_header_table_get_header (table, type);
+	post_header = E_COMPOSER_POST_HEADER (header);
 	e_composer_post_header_set_account (post_header, account);
 
+	type = E_COMPOSER_HEADER_REPLY_TO;
+	header = e_composer_header_table_get_header (table, type);
 	reply_to = (account != NULL) ? account->id->reply_to : NULL;
-	text_header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table);
+	text_header = E_COMPOSER_TEXT_HEADER (header);
 	e_composer_text_header_set_text (text_header, reply_to);
 
 	always_cc = (account != NULL && account->always_cc);
@@ -338,6 +449,27 @@ composer_header_table_from_changed_cb (EComposerHeaderTable *table)
 		old_destinations, always_bcc ? account->bcc_addrs : NULL);
 	e_composer_header_table_set_destinations_bcc (table, new_destinations);
 	e_destination_freev (new_destinations);
+
+	/* XXX We should NOT be checking specific account types here.
+	 *     Would prefer EAccount have a "send_method" enum item:
+	 *
+	 *         E_ACCOUNT_SEND_METHOD_MAIL
+	 *         E_ACCOUNT_SEND_METHOD_POST
+	 *
+	 *     And that would dictate which set of headers we show
+	 *     in the composer when an account is selected.  Alas,
+	 *     EAccount has no private storage, so it would require
+	 *     an ABI break and I don't want to deal with that now.
+	 *     (But would anything besides Evolution be affected?)
+	 *
+	 *     Currently only NNTP accounts use the "POST" fields.
+	 */
+	if (source_url == NULL)
+		composer_header_table_setup_mail_headers (table);
+	else if (g_ascii_strncasecmp (source_url, "nntp:", 5) == 0)
+		composer_header_table_setup_post_headers (table);
+	else
+		composer_header_table_setup_mail_headers (table);
 }
 
 static GObject *
@@ -380,6 +512,14 @@ composer_header_table_constructor (GType type,
 		priv->headers[ii]->input_widget,
 		"right-attach", 2, NULL);
 
+	e_binding_new (
+		G_OBJECT (priv->headers[ii]->input_widget), "visible",
+		G_OBJECT (priv->signature_label), "visible");
+
+	e_binding_new (
+		G_OBJECT (priv->headers[ii]->input_widget), "visible",
+		G_OBJECT (priv->signature_combo_box), "visible");
+
 	/* Now add the signature stuff. */
 	gtk_table_attach (
 		GTK_TABLE (object), priv->signature_label,
@@ -686,6 +826,24 @@ composer_header_table_class_init (EComposerHeaderTableClass *class)
 			element_spec,
 			G_PARAM_READWRITE));
 
+	/* floating reference */
+	element_spec = g_param_spec_string (
+		"value-array-element",
+		NULL,
+		NULL,
+		NULL,
+		G_PARAM_READWRITE);
+
+	g_object_class_install_property (
+		object_class,
+		PROP_POST_TO,
+		g_param_spec_value_array (
+			"post-to",
+			NULL,
+			NULL,
+			element_spec,
+			G_PARAM_READWRITE));
+
 	g_object_class_install_property (
 		object_class,
 		PROP_REPLY_TO,
@@ -733,6 +891,7 @@ composer_header_table_init (EComposerHeaderTable *table)
 	EComposerHeader *header;
 	ENameSelector *name_selector;
 	GtkWidget *widget;
+	gint ii;
 
 	table->priv = E_COMPOSER_HEADER_TABLE_GET_PRIVATE (table);
 
@@ -784,6 +943,22 @@ composer_header_table_init (EComposerHeaderTable *table)
 	gtk_label_set_mnemonic_widget (
 		GTK_LABEL (widget), table->priv->signature_combo_box);
 	table->priv->signature_label = g_object_ref_sink (widget);
+
+	/* XXX EComposerHeader ought to do this itself, but I need to
+	 *     make the title_widget and input_widget members private. */
+	for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) {
+		GObject *src_object;
+		GObject *dst_object;
+
+		header = table->priv->headers[ii];
+		src_object = G_OBJECT (header);
+
+		dst_object = G_OBJECT (header->title_widget);
+		e_binding_new (src_object, "visible", dst_object, "visible");
+
+		dst_object = G_OBJECT (header->input_widget);
+		e_binding_new (src_object, "visible", dst_object, "visible");
+	}
 }
 
 GType
@@ -829,126 +1004,103 @@ e_composer_header_table_get_header (EComposerHeaderTable *table,
 	return table->priv->headers[type];
 }
 
-gboolean
-e_composer_header_table_get_header_visible (EComposerHeaderTable *table,
-                                            EComposerHeaderType type)
-{
-	EComposerHeader *header;
-
-	header = e_composer_header_table_get_header (table, type);
-	return e_composer_header_get_visible (header);
-}
-
-void
-e_composer_header_table_set_header_visible (EComposerHeaderTable *table,
-                                            EComposerHeaderType type,
-                                            gboolean visible)
-{
-	EComposerHeader *header;
-
-	header = e_composer_header_table_get_header (table, type);
-	e_composer_header_set_visible (header, visible);
-
-	/* Signature widgets track the "From" header. */
-	if (type == E_COMPOSER_HEADER_FROM) {
-		if (visible) {
-			gtk_widget_show (table->priv->signature_label);
-			gtk_widget_show (table->priv->signature_combo_box);
-		} else {
-			gtk_widget_hide (table->priv->signature_label);
-			gtk_widget_hide (table->priv->signature_combo_box);
-		}
-	}
-}
-
-gboolean
-e_composer_header_table_get_header_sensitive (EComposerHeaderTable *table,
-                                              EComposerHeaderType type)
-{
-	EComposerHeader *header;
-
-	header = e_composer_header_table_get_header (table, type);
-	return e_composer_header_get_sensitive (header);
-}
-
-void
-e_composer_header_table_set_header_sensitive (EComposerHeaderTable *table,
-                                              EComposerHeaderType type,
-                                              gboolean sensitive)
-{
-	EComposerHeader *header;
-
-	header = e_composer_header_table_get_header (table, type);
-	e_composer_header_set_sensitive (header, sensitive);
-}
-
 EAccount *
 e_composer_header_table_get_account (EComposerHeaderTable *table)
 {
-	EComposerFromHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerFromHeader *from_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table);
-	return e_composer_from_header_get_active (header);
+	type = E_COMPOSER_HEADER_FROM;
+	header = e_composer_header_table_get_header (table, type);
+	from_header = E_COMPOSER_FROM_HEADER (header);
+
+	return e_composer_from_header_get_active (from_header);
 }
 
 gboolean
 e_composer_header_table_set_account (EComposerHeaderTable *table,
                                      EAccount *account)
 {
-	EComposerFromHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerFromHeader *from_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), FALSE);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table);
-	return e_composer_from_header_set_active (header, account);
+	type = E_COMPOSER_HEADER_FROM;
+	header = e_composer_header_table_get_header (table, type);
+	from_header = E_COMPOSER_FROM_HEADER (header);
+
+	return e_composer_from_header_set_active (from_header, account);
 }
 
 EAccountList *
 e_composer_header_table_get_account_list (EComposerHeaderTable *table)
 {
-	EComposerFromHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerFromHeader *from_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table);
-	return e_composer_from_header_get_account_list (header);
+	type = E_COMPOSER_HEADER_FROM;
+	header = e_composer_header_table_get_header (table, type);
+	from_header = E_COMPOSER_FROM_HEADER (header);
+
+	return e_composer_from_header_get_account_list (from_header);
 }
 
 void
 e_composer_header_table_set_account_list (EComposerHeaderTable *table,
                                           EAccountList *account_list)
 {
-	EComposerFromHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerFromHeader *from_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table);
-	e_composer_from_header_set_account_list (header, account_list);
+	type = E_COMPOSER_HEADER_FROM;
+	header = e_composer_header_table_get_header (table, type);
+	from_header = E_COMPOSER_FROM_HEADER (header);
+
+	e_composer_from_header_set_account_list (from_header, account_list);
 }
 
 const gchar *
 e_composer_header_table_get_account_name (EComposerHeaderTable *table)
 {
-	EComposerFromHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerFromHeader *from_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table);
-	return e_composer_from_header_get_active_name (header);
+	type = E_COMPOSER_HEADER_FROM;
+	header = e_composer_header_table_get_header (table, type);
+	from_header = E_COMPOSER_FROM_HEADER (header);
+
+	return e_composer_from_header_get_active_name (from_header);
 }
 
 gboolean
 e_composer_header_table_set_account_name (EComposerHeaderTable *table,
                                           const gchar *account_name)
 {
-	EComposerFromHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerFromHeader *from_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), FALSE);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table);
-	return e_composer_from_header_set_active_name (header, account_name);
+	type = E_COMPOSER_HEADER_FROM;
+	header = e_composer_header_table_get_header (table, type);
+	from_header = E_COMPOSER_FROM_HEADER (header);
+
+	return e_composer_from_header_set_active_name (from_header, account_name);
 }
 
 EDestination **
@@ -994,133 +1146,179 @@ e_composer_header_table_get_destinations (EComposerHeaderTable *table)
 EDestination **
 e_composer_header_table_get_destinations_bcc (EComposerHeaderTable *table)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table);
-	return e_composer_name_header_get_destinations (header);
+	type = E_COMPOSER_HEADER_BCC;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	return e_composer_name_header_get_destinations (name_header);
 }
 
 void
 e_composer_header_table_add_destinations_bcc (EComposerHeaderTable *table,
                                               EDestination **destinations)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table);
-	e_composer_name_header_add_destinations (header, destinations);
+	type = E_COMPOSER_HEADER_BCC;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	e_composer_name_header_add_destinations (name_header, destinations);
 
 	if (destinations != NULL && *destinations != NULL)
-		e_composer_header_table_set_header_visible (
-			table, E_COMPOSER_HEADER_BCC, TRUE);
+		e_composer_header_set_visible (header, TRUE);
 }
 
 void
 e_composer_header_table_set_destinations_bcc (EComposerHeaderTable *table,
                                               EDestination **destinations)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table);
-	e_composer_name_header_set_destinations (header, destinations);
+	type = E_COMPOSER_HEADER_BCC;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	e_composer_name_header_set_destinations (name_header, destinations);
 
 	if (destinations != NULL && *destinations != NULL)
-		e_composer_header_table_set_header_visible (
-			table, E_COMPOSER_HEADER_BCC, TRUE);
+		e_composer_header_set_visible (header, TRUE);
 }
 
 EDestination **
 e_composer_header_table_get_destinations_cc (EComposerHeaderTable *table)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table);
-	return e_composer_name_header_get_destinations (header);
+	type = E_COMPOSER_HEADER_CC;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	return e_composer_name_header_get_destinations (name_header);
 }
 
 void
 e_composer_header_table_add_destinations_cc (EComposerHeaderTable *table,
                                              EDestination **destinations)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table);
-	e_composer_name_header_add_destinations (header, destinations);
+	type = E_COMPOSER_HEADER_CC;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	e_composer_name_header_add_destinations (name_header, destinations);
 
 	if (destinations != NULL && *destinations != NULL)
-		e_composer_header_table_set_header_visible (
-			table, E_COMPOSER_HEADER_CC, TRUE);
+		e_composer_header_set_visible (header, TRUE);
 }
 
 void
 e_composer_header_table_set_destinations_cc (EComposerHeaderTable *table,
                                              EDestination **destinations)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table);
-	e_composer_name_header_set_destinations (header, destinations);
+	type = E_COMPOSER_HEADER_CC;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	e_composer_name_header_set_destinations (name_header, destinations);
 
 	if (destinations != NULL && *destinations != NULL)
-		e_composer_header_table_set_header_visible (
-			table, E_COMPOSER_HEADER_CC, TRUE);
+		e_composer_header_set_visible (header, TRUE);
 }
 
 EDestination **
 e_composer_header_table_get_destinations_to (EComposerHeaderTable *table)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table);
-	return e_composer_name_header_get_destinations (header);
+	type = E_COMPOSER_HEADER_TO;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	return e_composer_name_header_get_destinations (name_header);
 }
 
 void
 e_composer_header_table_add_destinations_to (EComposerHeaderTable *table,
                                              EDestination **destinations)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table);
-	e_composer_name_header_add_destinations (header, destinations);
+	type = E_COMPOSER_HEADER_TO;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	e_composer_name_header_add_destinations (name_header, destinations);
 }
 
 void
 e_composer_header_table_set_destinations_to (EComposerHeaderTable *table,
                                              EDestination **destinations)
 {
-	EComposerNameHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerNameHeader *name_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table);
-	e_composer_name_header_set_destinations (header, destinations);
+	type = E_COMPOSER_HEADER_TO;
+	header = e_composer_header_table_get_header (table, type);
+	name_header = E_COMPOSER_NAME_HEADER (header);
+
+	e_composer_name_header_set_destinations (name_header, destinations);
 }
 
 GList *
 e_composer_header_table_get_post_to (EComposerHeaderTable *table)
 {
-	EComposerPostHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerPostHeader *post_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table);
-	return e_composer_post_header_get_folders (header);
+	type = E_COMPOSER_HEADER_POST_TO;
+	header = e_composer_header_table_get_header (table, type);
+	post_header = E_COMPOSER_POST_HEADER (header);
+
+	return e_composer_post_header_get_folders (post_header);
 }
 
 void
@@ -1128,51 +1326,70 @@ e_composer_header_table_set_post_to_base (EComposerHeaderTable *table,
                                           const gchar *base_url,
                                           const gchar *folders)
 {
-	EComposerPostHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerPostHeader *post_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table);
-	e_composer_post_header_set_folders_base (header, base_url, folders);
+	type = E_COMPOSER_HEADER_POST_TO;
+	header = e_composer_header_table_get_header (table, type);
+	post_header = E_COMPOSER_POST_HEADER (header);
+
+	e_composer_post_header_set_folders_base (post_header, base_url, folders);
 }
 
 void
 e_composer_header_table_set_post_to_list (EComposerHeaderTable *table,
                                           GList *folders)
 {
-	EComposerPostHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerPostHeader *post_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table);
-	e_composer_post_header_set_folders (header, folders);
+	type = E_COMPOSER_HEADER_POST_TO;
+	header = e_composer_header_table_get_header (table, type);
+	post_header = E_COMPOSER_POST_HEADER (header);
+
+	e_composer_post_header_set_folders (post_header, folders);
 }
 
 const gchar *
 e_composer_header_table_get_reply_to (EComposerHeaderTable *table)
 {
-	EComposerTextHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerTextHeader *text_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table);
-	return e_composer_text_header_get_text (header);
+	type = E_COMPOSER_HEADER_REPLY_TO;
+	header = e_composer_header_table_get_header (table, type);
+	text_header = E_COMPOSER_TEXT_HEADER (header);
+
+	return e_composer_text_header_get_text (text_header);
 }
 
 void
 e_composer_header_table_set_reply_to (EComposerHeaderTable *table,
                                       const gchar *reply_to)
 {
-	EComposerTextHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerTextHeader *text_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table);
-	e_composer_text_header_set_text (header, reply_to);
+	type = E_COMPOSER_HEADER_REPLY_TO;
+	header = e_composer_header_table_get_header (table, type);
+	text_header = E_COMPOSER_TEXT_HEADER (header);
+
+	e_composer_text_header_set_text (text_header, reply_to);
 
 	if (reply_to != NULL && *reply_to != '\0')
-		e_composer_header_table_set_header_visible (
-			table, E_COMPOSER_HEADER_REPLY_TO, TRUE);
+		e_composer_header_set_visible (header, TRUE);
 }
 
 ESignature *
@@ -1224,22 +1441,32 @@ e_composer_header_table_set_signature_list (EComposerHeaderTable *table,
 const gchar *
 e_composer_header_table_get_subject (EComposerHeaderTable *table)
 {
-	EComposerTextHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerTextHeader *text_header;
 
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
 
-	header = E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER (table);
-	return e_composer_text_header_get_text (header);
+	type = E_COMPOSER_HEADER_SUBJECT;
+	header = e_composer_header_table_get_header (table, type);
+	text_header = E_COMPOSER_TEXT_HEADER (header);
+
+	return e_composer_text_header_get_text (text_header);
 }
 
 void
 e_composer_header_table_set_subject (EComposerHeaderTable *table,
                                      const gchar *subject)
 {
-	EComposerTextHeader *header;
+	EComposerHeader *header;
+	EComposerHeaderType type;
+	EComposerTextHeader *text_header;
 
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table));
 
-	header = E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER (table);
-	e_composer_text_header_set_text (header, subject);
+	type = E_COMPOSER_HEADER_SUBJECT;
+	header = e_composer_header_table_get_header (table, type);
+	text_header = E_COMPOSER_TEXT_HEADER (header);
+
+	e_composer_text_header_set_text (text_header, subject);
 }
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index 91d64fe22a..817863031c 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -79,20 +79,6 @@ GtkWidget *	e_composer_header_table_new	(void);
 EComposerHeader * e_composer_header_table_get_header
 						(EComposerHeaderTable *table,
 						 EComposerHeaderType type);
-gboolean	e_composer_header_table_get_header_sensitive
-						(EComposerHeaderTable *table,
-						 EComposerHeaderType type);
-void		e_composer_header_table_set_header_sensitive
-						(EComposerHeaderTable *table,
-						 EComposerHeaderType type,
-						 gboolean sensitive);
-gboolean	e_composer_header_table_get_header_visible
-						(EComposerHeaderTable *table,
-						 EComposerHeaderType type);
-void		e_composer_header_table_set_header_visible
-						(EComposerHeaderTable *table,
-						 EComposerHeaderType type,
-						 gboolean visible);
 EAccount *	e_composer_header_table_get_account
 						(EComposerHeaderTable *table);
 gboolean	e_composer_header_table_set_account
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index 8a6d553921..4719d6db7e 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -41,6 +41,9 @@ enum {
 struct _EComposerHeaderPrivate {
 	gchar *label;
 	gboolean button;
+
+	guint sensitive : 1;
+	guint visible   : 1;
 };
 
 static gpointer parent_class;
@@ -304,15 +307,9 @@ e_composer_header_get_label (EComposerHeader *header)
 gboolean
 e_composer_header_get_sensitive (EComposerHeader *header)
 {
-	gboolean sensitive;
-
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), FALSE);
 
-	sensitive = GTK_WIDGET_SENSITIVE (header->title_widget);
-	if (GTK_WIDGET_SENSITIVE (header->input_widget) != sensitive)
-		g_warning ("%s: Sensitivity is out of sync", G_STRFUNC);
-
-	return sensitive;
+	return header->priv->sensitive;
 }
 
 void
@@ -321,8 +318,7 @@ e_composer_header_set_sensitive (EComposerHeader *header,
 {
 	g_return_if_fail (E_IS_COMPOSER_HEADER (header));
 
-	gtk_widget_set_sensitive (header->title_widget, sensitive);
-	gtk_widget_set_sensitive (header->input_widget, sensitive);
+	header->priv->sensitive = sensitive;
 
 	g_object_notify (G_OBJECT (header), "sensitive");
 }
@@ -330,15 +326,9 @@ e_composer_header_set_sensitive (EComposerHeader *header,
 gboolean
 e_composer_header_get_visible (EComposerHeader *header)
 {
-	gboolean visible;
-
 	g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), FALSE);
 
-	visible = GTK_WIDGET_VISIBLE (header->title_widget);
-	if (GTK_WIDGET_VISIBLE (header->input_widget) != visible)
-		g_warning ("%s: Visibility is out of sync", G_STRFUNC);
-
-	return visible;
+	return header->priv->visible;
 }
 
 void
@@ -347,13 +337,7 @@ e_composer_header_set_visible (EComposerHeader *header,
 {
 	g_return_if_fail (E_IS_COMPOSER_HEADER (header));
 
-	if (visible) {
-		gtk_widget_show (header->title_widget);
-		gtk_widget_show (header->input_widget);
-	} else {
-		gtk_widget_hide (header->title_widget);
-		gtk_widget_hide (header->input_widget);
-	}
+	header->priv->visible = visible;
 
 	g_object_notify (G_OBJECT (header), "visible");
 }
diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h
index 4845816faf..e17c2a9f3a 100644
--- a/composer/e-composer-header.h
+++ b/composer/e-composer-header.h
@@ -63,7 +63,7 @@ struct _EComposerHeaderClass {
 GType		e_composer_header_get_type	(void);
 gchar *		e_composer_header_get_label	(EComposerHeader *header);
 gboolean	e_composer_header_get_sensitive	(EComposerHeader *header);
-void		e_composer_header_set_sensitive (EComposerHeader *header,
+void		e_composer_header_set_sensitive	(EComposerHeader *header,
 						 gboolean sensitive);
 gboolean	e_composer_header_get_visible	(EComposerHeader *header);
 void		e_composer_header_set_visible	(EComposerHeader *header,
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index baf459c43a..d7e44bf484 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -92,6 +92,7 @@ e_composer_private_init (EMsgComposer *composer)
 	GtkWidget *send_widget;
 	const gchar *path;
 	gchar *filename;
+	gint ii;
 	GError *error = NULL;
 
 	editor = GTKHTML_EDITOR (composer);
@@ -167,6 +168,46 @@ e_composer_private_init (EMsgComposer *composer)
 		GTK_BOX (container), widget, TRUE, TRUE, 0, GTK_PACK_START);
 
 	composer_setup_recent_menu (composer);
+
+	/* Bind headers to their corresponding actions. */
+
+	for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) {
+		EComposerHeaderTable *table;
+		EComposerHeader *header;
+		GtkAction *action;
+
+		table = E_COMPOSER_HEADER_TABLE (priv->header_table);
+		header = e_composer_header_table_get_header (table, ii);
+
+		switch (ii) {
+			case E_COMPOSER_HEADER_BCC:
+				action = ACTION (VIEW_BCC);
+				break;
+
+			case E_COMPOSER_HEADER_CC:
+				action = ACTION (VIEW_CC);
+				break;
+
+			case E_COMPOSER_HEADER_FROM:
+				action = ACTION (VIEW_FROM);
+				break;
+
+			case E_COMPOSER_HEADER_REPLY_TO:
+				action = ACTION (VIEW_REPLY_TO);
+				break;
+
+			default:
+				continue;
+		}
+
+		e_mutual_binding_new (
+			G_OBJECT (header), "sensitive",
+			G_OBJECT (action), "sensitive");
+
+		e_mutual_binding_new (
+			G_OBJECT (header), "visible",
+			G_OBJECT (action), "active");
+	}
 }
 
 void
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 5e303329c7..aec4e915c1 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -67,16 +67,6 @@
 	COMPOSER_GCONF_PREFIX "/send_html"
 #define COMPOSER_GCONF_SPELL_LANGUAGES_KEY \
 	COMPOSER_GCONF_PREFIX "/spell_languages"
-#define COMPOSER_GCONF_VIEW_BCC_KEY \
-	COMPOSER_GCONF_PREFIX "/view/Bcc"
-#define COMPOSER_GCONF_VIEW_CC_KEY \
-	COMPOSER_GCONF_PREFIX "/view/Cc"
-#define COMPOSER_GCONF_VIEW_FROM_KEY \
-	COMPOSER_GCONF_PREFIX "/view/From"
-#define COMPOSER_GCONF_VIEW_POST_TO_KEY \
-	COMPOSER_GCONF_PREFIX "/view/PostTo"
-#define COMPOSER_GCONF_VIEW_REPLY_TO_KEY \
-	COMPOSER_GCONF_PREFIX "/view/ReplyTo"
 #define COMPOSER_GCONF_WINDOW_PREFIX \
 	COMPOSER_GCONF_PREFIX "/window"
 
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 933b40c5aa..93bd6fdd3e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -93,37 +93,6 @@
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MSG_COMPOSER, EMsgComposerPrivate))
 
-#define E_MSG_COMPOSER_VISIBLE_MASK_SENDER \
-	(E_MSG_COMPOSER_VISIBLE_FROM | \
-	 E_MSG_COMPOSER_VISIBLE_REPLYTO)
-
-#define E_MSG_COMPOSER_VISIBLE_MASK_BASIC \
-	(E_MSG_COMPOSER_VISIBLE_MASK_SENDER | \
-	 E_MSG_COMPOSER_VISIBLE_SUBJECT)
-
-#define E_MSG_COMPOSER_VISIBLE_MASK_RECIPIENTS \
-	(E_MSG_COMPOSER_VISIBLE_TO | \
-	 E_MSG_COMPOSER_VISIBLE_CC | \
-	 E_MSG_COMPOSER_VISIBLE_BCC)
-
-#define E_MSG_COMPOSER_VISIBLE_MASK_MAIL \
-	(E_MSG_COMPOSER_VISIBLE_MASK_BASIC | \
-	 E_MSG_COMPOSER_VISIBLE_MASK_RECIPIENTS)
-
-#define E_MSG_COMPOSER_VISIBLE_MASK_POST \
-	(E_MSG_COMPOSER_VISIBLE_MASK_BASIC | \
-	 E_MSG_COMPOSER_VISIBLE_POSTTO)
-
-typedef enum {
-	E_MSG_COMPOSER_VISIBLE_FROM       = (1 << 0),
-	E_MSG_COMPOSER_VISIBLE_REPLYTO    = (1 << 1),
-	E_MSG_COMPOSER_VISIBLE_TO         = (1 << 2),
-	E_MSG_COMPOSER_VISIBLE_CC         = (1 << 3),
-	E_MSG_COMPOSER_VISIBLE_BCC        = (1 << 4),
-	E_MSG_COMPOSER_VISIBLE_POSTTO     = (1 << 5),
-	E_MSG_COMPOSER_VISIBLE_SUBJECT    = (1 << 7)
-} EMsgComposerHeaderVisibleFlags;
-
 enum {
 	SEND,
 	SAVE_DRAFT,
@@ -478,6 +447,7 @@ build_message_headers (EMsgComposer *composer,
                        gboolean redirect)
 {
 	EComposerHeaderTable *table;
+	EComposerHeader *header;
 	EAccount *account;
 	const gchar *subject;
 	const gchar *reply_to;
@@ -528,9 +498,9 @@ build_message_headers (EMsgComposer *composer,
 	}
 
 	/* To:, Cc:, Bcc: */
-	if (e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_TO) ||
-	    e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_CC) ||
-	    e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_BCC)) {
+	header = e_composer_header_table_get_header (
+		table, E_COMPOSER_HEADER_TO);
+	if (e_composer_header_get_visible (header)) {
 		EDestination **to, **cc, **bcc;
 
 		to = e_composer_header_table_get_destinations_to (table);
@@ -545,7 +515,9 @@ build_message_headers (EMsgComposer *composer,
 	}
 
 	/* X-Evolution-PostTo: */
-	if (e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_POST_TO)) {
+	header = e_composer_header_table_get_header (
+		table, E_COMPOSER_HEADER_POST_TO);
+	if (e_composer_header_get_visible (header)) {
 		CamelMedium *medium = CAMEL_MEDIUM (msg);
 		const gchar *name = "X-Evolution-PostTo";
 		GList *list, *iter;
@@ -1484,36 +1456,6 @@ msg_composer_constructor (GType type,
 		G_OBJECT (composer), "current-folder");
 	g_array_append_val (array, binding_id);
 
-	binding_id = gconf_bridge_bind_property (
-		gconf_bridge_get (),
-		COMPOSER_GCONF_VIEW_BCC_KEY,
-		G_OBJECT (ACTION (VIEW_BCC)), "active");
-	g_array_append_val (array, binding_id);
-
-	binding_id = gconf_bridge_bind_property (
-		gconf_bridge_get (),
-		COMPOSER_GCONF_VIEW_CC_KEY,
-		G_OBJECT (ACTION (VIEW_CC)), "active");
-	g_array_append_val (array, binding_id);
-
-	binding_id = gconf_bridge_bind_property (
-		gconf_bridge_get (),
-		COMPOSER_GCONF_VIEW_FROM_KEY,
-		G_OBJECT (ACTION (VIEW_FROM)), "active");
-	g_array_append_val (array, binding_id);
-
-	binding_id = gconf_bridge_bind_property (
-		gconf_bridge_get (),
-		COMPOSER_GCONF_VIEW_POST_TO_KEY,
-		G_OBJECT (ACTION (VIEW_POST_TO)), "active");
-	g_array_append_val (array, binding_id);
-
-	binding_id = gconf_bridge_bind_property (
-		gconf_bridge_get (),
-		COMPOSER_GCONF_VIEW_REPLY_TO_KEY,
-		G_OBJECT (ACTION (VIEW_REPLY_TO)), "active");
-	g_array_append_val (array, binding_id);
-
 	binding_id = gconf_bridge_bind_window (
 		gconf_bridge_get (),
 		COMPOSER_GCONF_WINDOW_PREFIX,
@@ -2254,88 +2196,6 @@ e_msg_composer_get_type (void)
 
 /* Callbacks.  */
 
-static EMsgComposer *
-create_composer (gint visible_mask)
-{
-	EMsgComposer *composer;
-	EComposerHeaderTable *table;
-	GtkToggleAction *action;
-	gboolean active;
-
-	composer = g_object_new (E_TYPE_MSG_COMPOSER, NULL);
-	table = E_COMPOSER_HEADER_TABLE (composer->priv->header_table);
-
-	/* Configure View Menu */
-
-	/* If we're mailing, you cannot disable "To". */
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_TO));
-	active = visible_mask & E_MSG_COMPOSER_VISIBLE_TO;
-	gtk_action_set_sensitive (ACTION (VIEW_TO), active);
-	gtk_toggle_action_set_active (action, active);
-
-	/* Ditto for "Post-To". */
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_POST_TO));
-	active = visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO;
-	gtk_action_set_sensitive (ACTION (VIEW_POST_TO), active);
-	gtk_toggle_action_set_active (action, active);
-
-	/* Disable "Cc" if we're posting. */
-	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_CC)) {
-		action = GTK_TOGGLE_ACTION (ACTION (VIEW_CC));
-		gtk_toggle_action_set_active (action, FALSE);
-	}
-
-	/* Disable "Bcc" if we're posting. */
-	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_BCC)) {
-		action = GTK_TOGGLE_ACTION (ACTION (VIEW_BCC));
-		gtk_toggle_action_set_active (action, FALSE);
-	}
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_SUBJECT));
-	gtk_toggle_action_set_active (action, TRUE);
-
-	return composer;
-}
-
-/**
- * e_msg_composer_new_with_type:
- * @type: the type of composer to create
- *
- * Create a new message composer widget. The type can be
- * E_MSG_COMPOSER_MAIL, E_MSG_COMPOSER_POST or E_MSG_COMPOSER_MAIL_POST.
- *
- * Returns: A pointer to the newly created widget
- **/
-
-EMsgComposer *
-e_msg_composer_new_with_type (gint type)
-{
-	EMsgComposer *composer;
-	gint visible_mask;
-
-	switch (type) {
-		case E_MSG_COMPOSER_MAIL:
-			visible_mask = E_MSG_COMPOSER_VISIBLE_MASK_MAIL;
-			break;
-
-		case E_MSG_COMPOSER_POST:
-			visible_mask = E_MSG_COMPOSER_VISIBLE_MASK_POST;
-			break;
-
-		default:
-			visible_mask =
-				E_MSG_COMPOSER_VISIBLE_MASK_MAIL |
-				E_MSG_COMPOSER_VISIBLE_MASK_POST;
-			break;
-	}
-
-	composer = create_composer (visible_mask);
-
-	set_editor_text (composer, "", TRUE);
-
-	return composer;
-}
-
 /**
  * e_msg_composer_new:
  *
@@ -2346,25 +2206,7 @@ e_msg_composer_new_with_type (gint type)
 EMsgComposer *
 e_msg_composer_new (void)
 {
-	return e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL);
-}
-
-static gboolean
-is_special_header (const gchar *hdr_name)
-{
-	/* Note: a header is a "special header" if it has any meaning:
-	   1. it's not a X-* header or
-	   2. it's an X-Evolution* header
-	*/
-	if (g_ascii_strncasecmp (hdr_name, "X-", 2))
-		return TRUE;
-
-	if (!g_ascii_strncasecmp (hdr_name, "X-Evolution", 11))
-		return TRUE;
-
-	/* we can keep all other X-* headers */
-
-	return FALSE;
+	return g_object_new (E_TYPE_MSG_COMPOSER, NULL);
 }
 
 static void
@@ -2792,25 +2634,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	GtkToggleAction *action;
 	struct _camel_header_raw *xev;
 	gint len, i;
-	EMsgComposerPrivate *p;
 
 	for (headers = CAMEL_MIME_PART (message)->headers;headers;headers = headers->next) {
 		if (!strcmp (headers->name, "X-Evolution-PostTo"))
 			postto = g_list_append (postto, g_strstrip (g_strdup (headers->value)));
 	}
 
-	if (postto != NULL)
-		composer = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_POST);
-	else
-		composer = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_MAIL);
-	p = composer->priv;
-
-	if (!composer) {
-		g_list_foreach (postto, (GFunc)g_free, NULL);
-		g_list_free (postto);
-		return NULL;
-	}
-
+	composer = e_msg_composer_new ();
 	table = e_msg_composer_get_header_table (composer);
 
 	if (postto) {
@@ -3014,11 +2844,14 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	/* set extra headers */
 	headers = CAMEL_MIME_PART (message)->headers;
 	while (headers) {
-		if (!is_special_header (headers->name) ||
-		    !g_ascii_strcasecmp (headers->name, "References") ||
-		    !g_ascii_strcasecmp (headers->name, "In-Reply-To")) {
-			g_ptr_array_add (p->extra_hdr_names, g_strdup (headers->name));
-			g_ptr_array_add (p->extra_hdr_values, g_strdup (headers->value));
+		if (g_ascii_strcasecmp (headers->name, "References") == 0 ||
+		    g_ascii_strcasecmp (headers->name, "In-Reply-To") == 0) {
+			g_ptr_array_add (
+				composer->priv->extra_hdr_names,
+				g_strdup (headers->name));
+			g_ptr_array_add (
+				composer->priv->extra_hdr_values,
+				g_strdup (headers->value));
 		}
 
 		headers = headers->next;
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 42f12bf973..c32342c7c0 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -67,13 +67,8 @@ struct _EMsgComposerClass {
 	GtkhtmlEditorClass parent_class;
 };
 
-#define E_MSG_COMPOSER_MAIL 1
-#define E_MSG_COMPOSER_POST 2
-#define E_MSG_COMPOSER_MAIL_POST E_MSG_COMPOSER_MAIL|E_MSG_COMPOSER_POST
-
 GType		e_msg_composer_get_type		(void);
 EMsgComposer *	e_msg_composer_new		(void);
-EMsgComposer *	e_msg_composer_new_with_type	(gint type);
 EMsgComposer *	e_msg_composer_new_with_message	(CamelMimeMessage *msg);
 EMsgComposer *	e_msg_composer_new_from_url	(const gchar *url);
 EMsgComposer *	e_msg_composer_new_redirect	(CamelMimeMessage *message,
diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui
index 44a0a5162f..1e72d9eafc 100644
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@ -11,19 +11,7 @@
         <menuitem action='save-draft'/>
         <placeholder name='template-holder'/>
         <separator/>
-	<placeholder name='external-editor-holder'/>
-        <separator/>
-        <separator/>
-	<placeholder name='external-editor-holder'/>
-        <separator/>
-        <separator/>
-	<placeholder name='external-editor-holder'/>
-        <separator/>
-        <separator/>
-	<placeholder name='external-editor-holder'/>
-        <separator/>
-        <separator/>
-	<placeholder name='external-editor-holder'/>
+        <placeholder name='external-editor-holder'/>
         <separator/>
         <separator/>
         <menuitem action='print-preview'/>
@@ -41,12 +29,9 @@
     <placeholder name='pre-insert-menu'>
       <menu action='view-menu'>
         <menuitem action='view-from'/>
-        <menuitem action='view-to'/>
-        <menuitem action='view-post-to'/>
         <menuitem action='view-reply-to'/>
         <menuitem action='view-cc'/>
         <menuitem action='view-bcc'/>
-        <menuitem action='view-subject'/>
       </menu>
     </placeholder>
     <menu action='insert-menu'>
diff --git a/configure.in b/configure.ac
index ab099f929b..b912c950b8 100644
--- a/configure.in
+++ b/configure.ac
@@ -1800,7 +1800,7 @@ plugins_standard_always="bbdb subject-thread save-calendar copy-tool mail-to-tas
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
-plugins_experimental_always="folder-unsubscribe external-editor hula-account-setup"
+plugins_experimental_always="face folder-unsubscribe external-editor hula-account-setup"
 plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN"
 all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
 
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 59880f3dbc..54b5f4bbf4 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -34,19 +34,19 @@ private_icons = \
 	hicolor_actions_16x16_folder-move.png \
 	hicolor_actions_16x16_mail-copy.png \
 	hicolor_actions_16x16_mail-move.png \
- 	hicolor_actions_16x16_go-today.png \
+	hicolor_actions_16x16_go-today.png \
 	hicolor_actions_16x16_view-calendar-day.png \
 	hicolor_actions_16x16_view-calendar-list.png \
 	hicolor_actions_16x16_view-calendar-month.png \
 	hicolor_actions_16x16_view-calendar-week.png \
 	hicolor_actions_16x16_view-calendar-workweek.png \
- 	hicolor_actions_22x22_go-today.png \
+	hicolor_actions_22x22_go-today.png \
 	hicolor_actions_22x22_view-calendar-day.png \
 	hicolor_actions_22x22_view-calendar-list.png \
 	hicolor_actions_22x22_view-calendar-month.png \
 	hicolor_actions_22x22_view-calendar-week.png \
 	hicolor_actions_22x22_view-calendar-workweek.png \
- 	hicolor_actions_24x24_go-today.png \
+	hicolor_actions_24x24_go-today.png \
 	hicolor_actions_24x24_query-free-busy.png \
 	hicolor_actions_24x24_view-calendar-day.png \
 	hicolor_actions_24x24_view-calendar-list.png \
@@ -88,19 +88,19 @@ private_icons = \
 # (toolkit/themes/gnomestripe/global/icons/wrap.png), which
 # contained the following notice:
 #
-#    All files in this directory are assumed to be licensed under the
-#    tri-license (MPL/GPL/LGPL) used throughout this codebase.
+#     All files in this directory are assumed to be licensed under the
+#     tri-license (MPL/GPL/LGPL) used throughout this codebase.
 #
 # There is no corresponding SVG file. */
 
 noinst_DATA = \
- 	hicolor_actions_16x16_go-today.svg \
+	hicolor_actions_16x16_go-today.svg \
 	hicolor_actions_16x16_view-calendar-day.svg \
 	hicolor_actions_16x16_view-calendar-list.svg \
 	hicolor_actions_16x16_view-calendar-month.svg \
 	hicolor_actions_16x16_view-calendar-week.svg \
 	hicolor_actions_16x16_view-calendar-workweek.svg \
- 	hicolor_actions_22x22_go-today.svg \
+	hicolor_actions_22x22_go-today.svg \
 	hicolor_actions_22x22_view-calendar-day.svg \
 	hicolor_actions_22x22_view-calendar-list.svg \
 	hicolor_actions_22x22_view-calendar-month.svg \
@@ -119,7 +119,7 @@ noinst_DATA = \
 	hicolor_places_22x22_mail-sent.svg \
 	hicolor_status_32x32_offline.svg \
 	hicolor_status_32x32_online.svg \
- 	$(NULL)
+	$(NULL)
 
 EXTRA_DIST = \
 	$(public_icons)		\
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index bf6834b278..20193465a3 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -672,13 +672,18 @@ create_new_composer (const char *subject, const char *fromuri)
 	EAccount *account = NULL;
 
 	composer = e_msg_composer_new ();
-	if (composer == NULL)
-		return NULL;
+	table = e_msg_composer_get_header_table (composer);
 
-	if (fromuri)
-		account = mail_config_get_account_by_source_url (fromuri);
+	if (fromuri != NULL) {
+		GList *list;
+
+		account = mail_config_get_account_by_source_url(fromuri);
+
+		list = g_list_prepend (NULL, (gpointer) fromuri);
+		e_composer_header_table_set_post_to_list (table, list);
+		g_list_free (list);
+	}
 
-	table = e_msg_composer_get_header_table (composer);
 	e_composer_header_table_set_account (table, account);
 	e_composer_header_table_set_subject (table, subject);
 
@@ -1701,18 +1706,12 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account,
 	g_return_val_if_fail (to == NULL || CAMEL_IS_INTERNET_ADDRESS (to), NULL);
 	g_return_val_if_fail (cc == NULL || CAMEL_IS_INTERNET_ADDRESS (cc), NULL);
 
+	composer = e_msg_composer_new ();
+
 	/* construct the tov/ccv */
 	tov = em_utils_camel_address_to_destination (to);
 	ccv = em_utils_camel_address_to_destination (cc);
 
-	if (tov || ccv) {
-		if (postto && camel_address_length((CamelAddress *)postto))
-			composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL_POST);
-		else
-			composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL);
-	} else
-		composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_POST);
-
 	/* Set the subject of the new message. */
 	if ((subject = (char *) camel_mime_message_get_subject (message))) {
 		if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0)
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index de4d48a77f..989206ae36 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -72,6 +72,7 @@
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-util-labels.h"
+#include "e-mail-search-bar.h"
 #include "em-utils.h"
 #include "em-composer-utils.h"
 #include "em-format-html-display.h"
@@ -99,6 +100,7 @@ CamelStore *vfolder_store; /* the 1 static vfolder store */
 struct _EMFolderBrowserPrivate {
 	GtkWidget *preview;	/* container for message display */
 	GtkWidget *scroll;
+	GtkWidget *search_bar;
 
 	GtkWidget *subscribe_editor;
 
@@ -156,7 +158,6 @@ static const EMFolderViewEnable emfb_enable_map[] = {
 	{ "FolderRename", EM_POPUP_SELECT_FOLDER },
 	{ "FolderRefresh", EM_POPUP_SELECT_FOLDER },
 	{ "ChangeFolderProperties", EM_POPUP_SELECT_FOLDER },
-	{ "MailPost", EM_POPUP_SELECT_FOLDER },
 	{ "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER },
 	{ "ViewHideSelected", EM_POPUP_SELECT_MANY },
 	{ "ViewThreadsCollapseAll", EM_FOLDER_VIEW_SELECT_THREADED},
@@ -209,7 +210,6 @@ static ESearchBarItem emfb_search_scope_items[] = {
 	E_FILTERBAR_CURRENT_FOLDER,
 	E_FILTERBAR_CURRENT_ACCOUNT,
 	E_FILTERBAR_ALL_ACCOUNTS,
-	E_FILTERBAR_CURRENT_MESSAGE,
 	{ NULL, -1, 0 }
 };
 
@@ -241,6 +241,7 @@ emfb_init(GObject *o)
 	EMFolderBrowser *emfb = (EMFolderBrowser *)o;
 	RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ());
 	struct _EMFolderBrowserPrivate *p;
+	GtkWidget *html;
 
 	EMEvent *eme;
 	EMEventTargetFolderBrowser *target;
@@ -325,6 +326,10 @@ emfb_init(GObject *o)
 //	gtk_paned_pack2 (GTK_PANED (emfb->vpane), p->preview, TRUE, FALSE);
 //	gtk_widget_show(p->preview);
 
+	g_signal_connect_swapped (
+		p->search_bar, "changed",
+		G_CALLBACK (em_format_redraw), emfb->view.preview);
+
 	/** @HookPoint-EMFolderBrower: Folder Browser
 	 * @Id: emfb.created
 	 * @Class: org.gnome.evolution.mail.events:1.0
@@ -386,7 +391,6 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state)
 	if ((emfb->view.preview_active ^ state) == 0
 	    || emfb->view.list == NULL) {
 		if (state && emfb->priv->scope_restricted && emfb->view.list->cursor_uid && *(emfb->view.list->cursor_uid)) {
-			e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, TRUE);
 			emfb->priv->scope_restricted = FALSE;
 		}
 
@@ -408,7 +412,6 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state)
 		if (emfb->view.list->cursor_uid) {
 			char *uid = g_alloca(strlen(emfb->view.list->cursor_uid)+1);
 
-			e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, TRUE);
 			emfb->priv->scope_restricted = FALSE;
 			strcpy(uid, emfb->view.list->cursor_uid);
 			em_folder_view_set_message(&emfb->view, uid, FALSE);
@@ -424,7 +427,6 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state)
 		emfb->view.displayed_uid = NULL;
 
 		gtk_widget_hide(emfb->priv->preview);
-		e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, FALSE);
 		emfb->priv->scope_restricted = TRUE;
 		/*
 		mail_display_set_message (emfb->mail_display, NULL, NULL, NULL);
@@ -618,18 +620,6 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
 	id = e_search_bar_get_search_scope (esb);
 
 	switch (id) {
-	    case E_FILTERBAR_CURRENT_MESSAGE_ID:
-		    word = e_search_bar_get_text (esb);
-		    if ( word && *word ) {
-			    gtk_widget_set_sensitive (esb->option_button, FALSE);
-			    em_format_html_display_search_with (emfb->view.preview, word);
-		    } else {
-			    em_format_html_display_search_close (emfb->view.preview);
-		    }
-		    g_free (word);
-		    return;
-		    break;
-
 	    case E_FILTERBAR_CURRENT_FOLDER_ID:
 		    g_object_get (esb, "query", &search_word, NULL);
 		    break;
@@ -825,10 +815,8 @@ emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *e
 		return;
 
 	if (uid && *uid && emfb->priv->scope_restricted && emfb->view.preview_active) {
-		e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, TRUE);
 		emfb->priv->scope_restricted = FALSE;
 	} else if ( !(uid && *uid) && !emfb->priv->scope_restricted) {
-		e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, FALSE);
 		emfb->priv->scope_restricted = TRUE;
 	}
 
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 5bea7c8e19..8da3b5dc98 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -144,7 +144,6 @@ static const EMFolderViewEnable emfv_enable_map[] = {
 	{ "MessageFollowUpClear",     EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_FLAG_CLEAR },
 //	{ "MessageMove",              EM_POPUP_SELECT_MANY },
 //	{ "MessageOpen",              EM_POPUP_SELECT_MANY },
-//	{ "MessagePostReply",         EM_POPUP_SELECT_ONE },
 //	{ "MessageReplyAll",          EM_POPUP_SELECT_ONE },
 //	{ "MessageReplyList",         EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST },
 //	{ "MessageReplySender",       EM_POPUP_SELECT_ONE },
diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h
index 77178aaf38..70c6c4335e 100644
--- a/mail/em-folder-view.h
+++ b/mail/em-folder-view.h
@@ -124,6 +124,8 @@ struct _EMFolderViewClass {
 	void (*set_folder)(EMFolderView *emfv, struct _CamelFolder *folder, const char *uri);
 	void (*set_message)(EMFolderView *emfv, const char *uid, int nomarkseen);
 
+	void (*show_search_bar)(EMFolderView *emfv);
+
 	/* Signals */
 	void (*on_url)(EMFolderView *emfv, const char *uri, const char *nice_uri);
 
@@ -156,6 +158,7 @@ guint32 em_folder_view_disable_mask(EMFolderView *emfv);
 void em_folder_view_set_statusbar(EMFolderView *emfv, gboolean statusbar);
 void em_folder_view_set_hide_deleted(EMFolderView *emfv, gboolean status);
 void em_folder_view_setup_view_instance (EMFolderView *emfv);
+void em_folder_view_show_search_bar (EMFolderView *emfv);
 
 G_END_DECLS
 
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 621417eb9b..e0895c330c 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -116,71 +116,91 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/From</key>
-      <applyto>/apps/evolution/mail/composer/view/From</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_mail_bcc</key>
+      <applyto>/apps/evolution/mail/composer/show_mail_bcc</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Show "Bcc" field when sending a mail message</short>
+         <long>
+           Show the "Bcc" field when sending a mail message.  This is
+           controlled from the View menu when a mail account is chosen.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/composer/show_mail_cc</key>
+      <applyto>/apps/evolution/mail/composer/show_mail_cc</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>View/From menu item is checked</short>
+         <short>Show "Cc" field when sending a mail message</short>
          <long>
-          View/From menu item is checked.
+           Show the "Cc" field when sending a mail message.  This is
+           controlled from the View menu when a mail account is chosen.
          </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/PostTo</key>
-      <applyto>/apps/evolution/mail/composer/view/PostTo</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_mail_from</key>
+      <applyto>/apps/evolution/mail/composer/show_mail_from</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>View/PostTo menu item is checked</short>
+         <short>Show "From" field when sending a mail message</short>
          <long>
-          View/PostTo menu item is checked.
+           Show the "From" field when sending a mail message.  This is
+           controlled from the View menu when a mail account is chosen.
          </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/ReplyTo</key>
-      <applyto>/apps/evolution/mail/composer/view/ReplyTo</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_mail_reply_to</key>
+      <applyto>/apps/evolution/mail/composer/show_mail_reply_to</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>View/ReplyTo menu item is checked</short>
+         <short>Show "Reply To" field when sending a mail message</short>
          <long>
-          View/ReplyTo menu item is checked.
+           Show the "Reply To" field when sending a mail message.  This
+           is controlled from the View menu when a mail account is chosen.
          </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/Cc</key>
-      <applyto>/apps/evolution/mail/composer/view/Cc</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_post_from</key>
+      <applyto>/apps/evolution/mail/composer/show_post_from</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
-         <short>View/Cc menu item is checked</short>
+         <short>Show "From" field when posting to a newsgroup</short>
          <long>
-          View/Cc menu item is checked.
+           Show the "From" field when posting to a newsgroup.  This is
+           controlled from the View menu when a news account is chosen.
          </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/Bcc</key>
-      <applyto>/apps/evolution/mail/composer/view/Bcc</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_post_reply_to</key>
+      <applyto>/apps/evolution/mail/composer/show_post_reply_to</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>View/Bcc menu item is checked</short>
+         <short>Show "Reply To" field when posting to a newsgroup</short>
          <long>
-          View/Bcc menu item is checked.
+           Show the "Reply To" field when posting to a newsgroup.  This
+           is controlled from the View menu when a news account is chosen.
          </long>
       </locale>
     </schema>
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 42b68c58ec..53b0ab6948 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -59,6 +59,7 @@ glade_DATA =			\
 
 error_DATA = 				\
 	org-gnome-shared-folder.error	\
+	org-gnome-process-meeting.error	\
 	org-gnome-proxy.error		\
 	org-gnome-proxy-login.error     \
 	org-gnome-mail-retract.error
@@ -72,6 +73,7 @@ EXTRA_DIST =						\
 	org-gnome-compose-send-options.xml		\
 	org-gnome-groupwise-features.eplug.xml		\
 	org-gnome-shared-folder.error.xml		\
+	org-gnome-process-meeting.error.xml		\
 	org-gnome-proxy.error.xml			\
 	org-gnome-proxy-login.error.xml     		\
 	org-gnome-mail-retract.error.xml
diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
index 7a707fdcc9..226872b6a8 100644
--- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
+++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
@@ -92,6 +92,11 @@
 			</menu>
 		</hook>
 
+		<hook class="org.gnome.evolution.calendar.popup:1.0">
+			<menu id="org.gnome.evolution.calendar.view.popup" target="select" factory = "org_gnome_retract_resend">
+			</menu>
+		</hook>
+
 		<hook class="org.gnome.evolution.mail.popup:1.0">
 		      <menu id="org.gnome.evolution.mail.folderview.popup" target="select"
 			factory = "org_gnome_retract_message">
diff --git a/plugins/groupwise-features/org-gnome-shared-folder.error.xml b/plugins/groupwise-features/org-gnome-shared-folder.error.xml
index ca63ad80aa..8ef056728b 100644
--- a/plugins/groupwise-features/org-gnome-shared-folder.error.xml
+++ b/plugins/groupwise-features/org-gnome-shared-folder.error.xml
@@ -15,23 +15,5 @@ You cannot share this folder with the specified user &quot;{0}&quot;
 </_secondary>
 </error>
 
-<error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES">
-<_primary>This is a recurring meeting</_primary>
-<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -->
-<_secondary>Would you like to accept it?</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button label="This instance" response="GTK_RESPONSE_NO"/>
- <button label="All instances" response="GTK_RESPONSE_YES"/>
-</error>
-
-<error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES">
-<_primary>This is a recurring meeting</_primary>
-<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -->
-<_secondary>Would you like to decline it?</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button label="This instance" response="GTK_RESPONSE_NO"/>
- <button label="All instances" response="GTK_RESPONSE_YES"/>
-</error>
-
 </error-list>
 
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 412502f0b3..bc046c0a05 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -43,9 +43,11 @@ typedef struct {
 ECalendarView *c_view;
 
 void org_gnome_accept(EPlugin *ep, ECalPopupTargetSelect *target);
+void org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target);
 static void on_accept_meeting (EPopup *ep, EPopupItem *pitem, void *data);
 static void on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, void *data);
 static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data);
+static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data);
 
 static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "41.accept", N_("Accept"), on_accept_meeting, NULL, GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE},
@@ -227,9 +229,9 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 			const char *msg;
 
 			if (status == ICAL_PARTSTAT_ACCEPTED || status == ICAL_PARTSTAT_TENTATIVE)
-				msg = "org.gnome.evolution.mail_shared_folder:recurrence-accept";
+				msg = "org.gnome.evolution.process_meeting:recurrence-accept";
 			else
-				msg = "org.gnome.evolution.mail_shared_folder:recurrence-decline";
+				msg = "org.gnome.evolution.process_meeting:recurrence-decline";
 
 			response = e_error_run (NULL, msg, NULL);
 			if (response == GTK_RESPONSE_YES) {
@@ -282,3 +284,261 @@ on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 
 	process_meeting (cal_view, ICAL_PARTSTAT_DECLINED);
 }
+
+static gboolean
+is_meeting_owner (ECalComponent *comp, ECal *client)
+{
+	ECalComponentOrganizer org;
+	char *email = NULL;
+	const char *strip = NULL;
+	gboolean ret_val = FALSE;
+
+	if (!(e_cal_component_has_attendees (comp) &&
+				e_cal_get_save_schedules (client)))
+		return ret_val;
+
+	e_cal_component_get_organizer (comp, &org);
+	strip = itip_strip_mailto (org.value);
+
+	if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
+		ret_val = TRUE;
+	}
+
+	if (!ret_val)
+		ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
+
+	g_free (email);
+	return ret_val;
+}
+
+
+typedef struct {
+	ECal *client;
+	ECalComponent *comp;
+	CalObjModType mod;
+} ThreadData;
+
+static EPopupItem retract_popup_items[] = {
+{ E_POPUP_ITEM, "49.resend", N_("Rese_nd Meeting..."), on_resend_meeting, NULL, GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING}
+};
+
+void 
+org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
+{
+	GSList *menus = NULL;
+	GList *selected;
+	int i = 0;
+	static int first = 0;
+	const char *uri = NULL;
+	ECalendarView *cal_view = E_CALENDAR_VIEW (target->target.widget);
+	ECalComponent *comp = NULL;
+	ECalendarViewEvent *event = NULL;
+
+	c_view = cal_view;
+	selected = e_calendar_view_get_selected_events (cal_view);
+	if (selected) {
+		event = (ECalendarViewEvent *) selected->data;
+
+		uri = e_cal_get_uri (event->comp_data->client);
+	} else
+		return;
+
+	if (!uri)
+		return;
+
+	if (! g_strrstr (uri, "groupwise://"))
+		return ;
+	
+	comp = e_cal_component_new ();
+	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
+
+	if (!is_meeting_owner (comp, event->comp_data->client)) {
+		g_object_unref (comp);
+		return;
+	}
+
+	/* for translation*/
+	if (!first) {
+		retract_popup_items[0].label =  _(retract_popup_items[0].label);
+	}
+
+	first++;
+
+	for (i = 0; i < sizeof (retract_popup_items) / sizeof (retract_popup_items[0]); i++)
+		menus = g_slist_prepend (menus, &retract_popup_items[i]);
+
+	e_popup_add_items (target->target.popup, menus, NULL, popup_free, NULL);
+
+	g_object_unref (comp);
+}
+
+static void
+add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModType mod)
+{
+	icalcomponent *icalcomp = NULL;
+	icalproperty *icalprop = NULL;
+
+	icalcomp = e_cal_component_get_icalcomponent (comp);
+	if (retract_comment && *retract_comment)
+		icalprop = icalproperty_new_x (retract_comment);
+	else
+		icalprop = icalproperty_new_x ("0");
+	icalproperty_set_x_name (icalprop, "X-EVOLUTION-RETRACT-COMMENT");
+	icalcomponent_add_property (icalcomp, icalprop);
+
+	if (mod == CALOBJ_MOD_ALL)
+		icalprop = icalproperty_new_x ("All");
+	else
+		icalprop = icalproperty_new_x ("This");
+	icalproperty_set_x_name (icalprop, "X-EVOLUTION-RECUR-MOD");
+	icalcomponent_add_property (icalcomp, icalprop);
+}
+
+static void 
+free_thread_data (ThreadData *data)
+{
+	if (data == NULL)
+		return;
+
+	if (data->client)
+		g_object_unref (data->client);
+
+	if (data->comp)
+		g_object_unref (data->comp);
+
+	g_free (data);
+}
+
+static gpointer
+retract_object (gpointer val)
+{
+	ThreadData *data = val;
+	icalcomponent *icalcomp = NULL, *mod_comp = NULL;
+	GList *users = NULL;
+	char *rid = NULL;
+	const char *uid;
+	GError *error = NULL;
+
+	add_retract_data (data->comp, NULL, data->mod);
+	
+	icalcomp = e_cal_component_get_icalcomponent (data->comp);
+	icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
+	
+	if (!e_cal_send_objects (data->client, icalcomp, &users,
+						&mod_comp, &error))	{
+		/* FIXME report error  */
+		g_warning ("Unable to retract the meeting \n");
+		g_clear_error (&error);
+		return GINT_TO_POINTER (1);
+	}
+
+	if (mod_comp)
+		icalcomponent_free (mod_comp);
+				
+	if (users) {
+		g_list_foreach (users, (GFunc) g_free, NULL);
+		g_list_free (users);
+	}
+	
+	rid = e_cal_component_get_recurid_as_string (data->comp);
+	e_cal_component_get_uid (data->comp, &uid);
+			
+	if (!e_cal_remove_object_with_mod (data->client, uid,
+				rid, data->mod, &error)) {
+		g_warning ("Unable to remove the item \n");
+		g_clear_error (&error);
+		return GINT_TO_POINTER (1);
+	}
+	g_free (rid);
+
+	free_thread_data (data)	;
+	return GINT_TO_POINTER (0);
+}
+
+static void
+object_created_cb (CompEditor *ce, gpointer data)
+{
+	GThread *thread = NULL;
+	int response;
+	GError *error = NULL;
+	
+	gtk_widget_hide (GTK_WIDGET (ce));
+
+	response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL);
+	if (response == GTK_RESPONSE_NO) {
+		free_thread_data (data)	;
+		return;
+	}
+
+	thread = g_thread_create ((GThreadFunc) retract_object, data , FALSE, &error);
+	if (!thread) {
+		g_warning (G_STRLOC ": %s", error->message);
+		g_error_free (error);
+	}
+}
+
+static void
+on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data)
+{
+	ECalendarView *cal_view = c_view;
+	GList *selected;
+
+	selected = e_calendar_view_get_selected_events (cal_view);
+	if (selected) {
+		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
+		ECalComponent *comp = e_cal_component_new ();
+		ECalComponent *new_comp = NULL;
+		gboolean recurring = FALSE;
+		CalObjModType mod = CALOBJ_MOD_THIS;
+		ThreadData *data = NULL;
+		gint response;
+		const char *msg;
+		/* inserting the boolean to share the code between resend and retract */
+		gboolean resend = TRUE;
+
+		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
+		if (e_cal_component_has_recurrences (comp) || e_cal_component_is_instance (comp))
+			recurring = TRUE;
+
+		if (recurring == TRUE)
+			msg = "org.gnome.evolution.process_meeting:resend-recurrence";
+		else
+			msg = "org.gnome.evolution.process_meeting:resend";
+
+		response = e_error_run (NULL, msg, NULL);
+		if (response == GTK_RESPONSE_YES) {
+			mod = CALOBJ_MOD_ALL;	
+		} else if (response == GTK_RESPONSE_CANCEL) {
+			g_object_unref (comp);
+			return;
+		}
+		
+		data = g_new0 (ThreadData, 1);
+		data->client = g_object_ref (event->comp_data->client);
+		data->comp = comp;
+		data->mod = mod;
+		
+		if (resend) 
+		{
+			guint flags = 0;
+			char *new_uid = NULL;
+			CompEditor *ce;
+			icalcomponent *icalcomp;
+
+			flags |= COMP_EDITOR_NEW_ITEM;
+			flags |= COMP_EDITOR_MEETING;
+			flags |= COMP_EDITOR_USER_ORG;
+
+			new_comp = e_cal_component_clone (comp);
+			new_uid = e_cal_component_gen_uid ();
+			e_cal_component_set_recurid (new_comp, NULL);
+			e_cal_component_set_uid (new_comp, new_uid);
+			icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (new_comp));
+			ce = e_calendar_view_open_event_with_flags (cal_view, data->client, icalcomp, flags);
+			
+			g_signal_connect (ce, "object_created", G_CALLBACK (object_created_cb), data);
+			g_object_unref (new_comp);
+			g_free (new_uid);
+		}
+	}
+}
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 6eebfdee92..04049ef6d5 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -38,6 +38,7 @@
 #include <camel/camel-multipart.h>
 #include <camel/camel-service.h>
 #include <camel/camel-store.h>
+#include <camel/camel-db.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserverui/e-source-selector.h>
@@ -831,9 +832,12 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp)
 		}
 	}
 
-	if (current_source)
+	if (current_source) {
 		l = sources_conflict;
-	else {
+		
+		pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
+				_("Opening the calendar. Please wait.."));
+	} else {
 		pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
 				_("Searching for an existing version of this appointment"));
 
@@ -1876,6 +1880,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 				camel_message_info_free (mi);
 				if (tag) {
 					int i = 0, count;
+					GSList *list = NULL;
 
 					count = camel_folder_summary_count (pitip->folder->summary);
 					for (i = 0; i < count; i++) {
@@ -1884,12 +1889,18 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 							continue;
 						camel_message_info_ref (mi);
 						if ( camel_message_info_user_tag (mi, "recurrence-key") && g_str_equal (camel_message_info_user_tag (mi, "recurrence-key"), tag)) {
+							camel_folder_summary_remove_uid_fast (pitip->folder->summary, (char *)(mi->uid));
+							camel_folder_change_info_remove_uid (changes, (char *) mi->uid);
+							list = g_slist_prepend (list, (gpointer) mi->uid);
 
-							camel_folder_summary_remove_uid(pitip->folder->summary, (char *)(mi->uid));
-							camel_folder_change_info_remove_uid (changes, (char *)(mi->uid));
+							/* step back once to have the right index */
+							count--;
+							i--;
 						}
 						camel_message_info_free (mi);
 					}
+					camel_db_delete_uids (pitip->folder->parent_store->cdb_w, pitip->folder->full_name, list, NULL);
+					g_slist_free (list);
 				}
 			} else {
 				/* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */
diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
index c54587d369..f9b2c1693e 100644
--- a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
+++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
@@ -14,11 +14,11 @@
     <hook class="org.gnome.evolution.mail.format:1.0">
       <group id="EMFormatHTMLDisplay">
         <item
-          mime_type="text/vCard"
+          mime_type="text/vcard"
           format="org_gnome_vcard_inline_format"
           flags="inline_disposition"/>
         <item
-          mime_type="text/x-vCard"
+          mime_type="text/x-vcard"
           format="org_gnome_vcard_inline_format"
           flags="inline_disposition"/>
       </group>
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 211eb69c2d..0e10b3a82a 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -224,8 +224,11 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format,
 	} else if (length > 2) {
 		gchar *text;
 
-		text = g_strdup_printf (
-			_("There are %d other contacts."), length - 1);
+		/* Translators: This will always be two or more. */
+		text = g_strdup_printf (ngettext (
+			"There is %d other contact.",
+			"There are %d other contacts.",
+			length - 1), length - 1);
 		gtk_label_set_text (GTK_LABEL (widget), text);
 		gtk_widget_show (widget);
 		g_free (text);
diff --git a/po/ChangeLog b/po/ChangeLog
index fe3f6aa629..721636a83f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -99,12 +99,10 @@
 
 	* or.po: Updated Oriya Translation.
 
-<<<<<<< .mine
 2009-03-16  Manoj Kumar Giri  <mgiri@redhat.com>
 
 	* or.po: Updated Oriya Translation.
 
-=======
 2009-03-16  Dwayne Bailey  <dwayne@translate.org.za>
 
 	* af.po: Fix msgfmt errors
@@ -115,7 +113,6 @@
 	Fixes bug #575466.
 	* LINGUAS: Added af.
 
->>>>>>> .r37444
 2009-03-15  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
@@ -696,11 +693,7 @@
 
 	* sk.po: Updated Slovak translation.
 
-<<<<<<< HEAD:po/ChangeLog
-2008-10-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>   
-=======
 2008-10-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 	* es.po: Updated Spanish translation
 
@@ -748,11 +741,7 @@
 
 2008-10-01  Robert-André Mauchin  <zebob.m@pengzone.org>
 
-<<<<<<< HEAD:po/ChangeLog
-	* fr.po: French translation update. Fixed #554548 
-=======
 	* fr.po: French translation update. Fixed #554548
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 	thanks to Hanka Zalska from Sun.
 
 2008-10-01  Priit Laes  <plaes at svn dot gnome dot org>
@@ -805,27 +794,12 @@
 
 	* pl.po: Updated Polish translation
 
-<<<<<<< HEAD:po/ChangeLog
-2008-09-21  Djihed Afifi <djihed@gmail.com> 
-=======
 2008-09-21  Djihed Afifi <djihed@gmail.com>
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 	* ar.po: Updated Arabic Translation by OsamaKhalid.
 
 2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
 
-<<<<<<< HEAD:po/ChangeLog
-        * hi.po: Updated Hindi Translation.
-        
-2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-        * hi.po: Updated Hindi Translation.
-        
-2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-        * hi.po: Updated Hindi Translation.
-=======
 	* hi.po: Updated Hindi Translation.
 
 2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
@@ -835,7 +809,6 @@
 2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
 
 	* hi.po: Updated Hindi Translation.
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 2008-09-21  Gabor Kelemen  <kelemeng@gnome.hu>
 
@@ -896,30 +869,18 @@
 
 2008-09-18  Shankar Prasad  <svenkate@redhat.com>
 
-<<<<<<< HEAD:po/ChangeLog
-        * kn.po: Updated Kannada translation
-=======
 	* kn.po: Updated Kannada translation
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 2008-09-18  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
 	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
 	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 
-<<<<<<< HEAD:po/ChangeLog
-2008-09-18  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Usama Akkad.
-
-2008-09-17  Djihed Afifi <djihed@gmail.com> 
-=======
 2008-09-18  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Usama Akkad.
 
 2008-09-17  Djihed Afifi <djihed@gmail.com>
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 	* ar.po: Updated Arabic Translation by Usama Akkad.
 
@@ -933,11 +894,7 @@
 
 2008-09-17  Shankar Prasad  <svenkate@redhat.com>
 
-<<<<<<< HEAD:po/ChangeLog
-        * kn.po: Updated Kannada translation
-=======
 	* kn.po: Updated Kannada translation
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8ebac02e3a..39a35ece46 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -477,6 +477,7 @@ widgets/menus/gal-view-new-dialog.glade
 widgets/misc/e-attachment.c
 widgets/misc/e-attachment-dialog.c
 widgets/misc/e-attachment-handler-image.c
+widgets/misc/e-attachment-handler-sendto.c
 widgets/misc/e-attachment-icon-view.c
 widgets/misc/e-attachment-paned.c
 widgets/misc/e-attachment-store.c
diff --git a/po/es.po b/po/es.po
index d2c8accd34..5a6ad30fbd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2009-05-06 15:05+0000\n"
-"PO-Revision-Date: 2009-05-08 21:01+0200\n"
+"POT-Creation-Date: 2009-05-17 03:19+0000\n"
+"PO-Revision-Date: 2009-05-18 23:02+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -388,10 +388,6 @@ msgid "Could not remove address book."
 msgstr "No se pudo eliminar la libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:11
-#| msgid ""
-#| "Currently you can access only GroupWise System Address Book from "
-#| "Evolution. Please use some other GroupWise mail client once, to get your "
-#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -803,7 +799,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-config.c:1022
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
@@ -1147,7 +1143,6 @@ msgid "Search _filter:"
 msgstr "_Filtro de búsqueda:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
 #| msgid ""
 #| "Search filter is the type of the objects searched for, while performing "
 #| "the search. If this is not modified, by  default search will be performed "
@@ -1156,9 +1151,9 @@ msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"Filtro de búsqueda es el tipo de los objetos buscados, mientras se realiza "
-"la búsqueda. Si esto no se modifica, la búsqueda por omisión se realizará "
-"sobre la clase de objetos de tipo «person»."
+"El filtro de búsqueda es el tipo de los objetos que buscar. Si no se "
+"modifica, la búsqueda predeterminada se realizará sobre la clase de objetos "
+"de tipo «person»."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
@@ -2264,16 +2259,16 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2756
+#: ../mail/em-folder-view.c:2755
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "_Enviar un mensaje nuevo a…"
 
@@ -2331,7 +2326,7 @@ msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Disponibilidad"
@@ -2669,22 +2664,22 @@ msgstr "Mover contactos a"
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
+#: ../addressbook/gui/widgets/eab-gui-util.c:903
 msgid "Multiple vCards"
 msgstr "vCards múltiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
+#: ../addressbook/gui/widgets/eab-gui-util.c:910
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
+#: ../addressbook/gui/widgets/eab-gui-util.c:922
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
+#: ../addressbook/gui/widgets/eab-gui-util.c:950
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -3442,7 +3437,7 @@ msgid "_Dismiss"
 msgstr "_Descartar"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1021
+#: ../calendar/gui/dialogs/comp-editor.c:1019
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -4566,14 +4561,14 @@ msgid "A_dd"
 msgstr "Aña_dir"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alertas"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
 #: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:545
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir mostrar automáticamente el adjunto"
 
@@ -4584,7 +4579,7 @@ msgstr "Adjuntar archivo(s)"
 #. an empty string is the same as 'None'
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:137
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:186
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #: ../calendar/gui/dialogs/event-page.c:2968
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-day-view-time-item.c:788
@@ -4659,25 +4654,21 @@ msgstr "<span weight=\"bold\">Tiempo</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Semana laboral</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "Ajustar a la hora de _verano"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Day _ends:"
 msgstr "La jornada _acaba a las:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
 msgstr "Mostrar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/recurrence-page.c:1107
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "viernes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -4687,13 +4678,13 @@ msgstr ""
 "horas\n"
 "días"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1103
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "lunes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -4711,182 +4702,182 @@ msgstr ""
 "sábado\n"
 "domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../mail/mail-config.glade.h:117
 msgid "Pick a color"
 msgstr "Elija un color"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: ../calendar/gui/dialogs/recurrence-page.c:1108
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sc_roll Month View by a week"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Se_cond zone:"
 msgstr "Zona se_cundaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione los calendarios para las alertas de notificación"
 
 #. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un recordatorio"
 
 #. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Show a _reminder"
 msgstr "Mostrar un _recordatorio"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Mostrar los n_úmeros de las semanas en la Vista diaria y en la Vista de la "
 "semana laboral"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1109
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_asks due today:"
 msgstr "Ta_reas que vencen hoy:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "T_hu"
 msgstr "_Jue"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.c:1106
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.c:1104
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Use s_ystem time zone"
 msgstr "Usar la zona horaria del s_istema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 #: ../calendar/gui/dialogs/recurrence-page.c:1105
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "miércoles"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Wee_k starts on:"
 msgstr "La _semana empieza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "Work days:"
 msgstr "Días laborables:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ación al borrar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Fri"
 msgstr "_Vie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Tue"
 msgstr "_Mar"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
 msgid "_Wed"
 msgstr "M_ié"
 
 #. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversario/cumpleaños"
 
 #. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -5019,211 +5010,211 @@ msgid "Due "
 msgstr "Vence "
 
 #: ../calendar/gui/dialogs/comp-editor.c:245
-#: ../calendar/gui/dialogs/comp-editor.c:2677 ../mail/em-utils.c:373
+#: ../calendar/gui/dialogs/comp-editor.c:2675 ../mail/em-utils.c:373
 #: ../plugins/prefer-plain/prefer-plain.c:91
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:476
+#: ../calendar/gui/dialogs/comp-editor.c:474
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:563
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:572
+#: ../calendar/gui/dialogs/comp-editor.c:570
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:574
+#: ../calendar/gui/dialogs/comp-editor.c:572
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:580
+#: ../calendar/gui/dialogs/comp-editor.c:578
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:580
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:587
+#: ../calendar/gui/dialogs/comp-editor.c:585
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:603
+#: ../calendar/gui/dialogs/comp-editor.c:601
 msgid "No Summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:745
+#: ../calendar/gui/dialogs/comp-editor.c:743
 msgid "Keep original item?"
 msgstr "¿Mantener el elemento original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:949
 msgid "Click here to close the current window"
 msgstr "Pulse aquí para cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:958
+#: ../calendar/gui/dialogs/comp-editor.c:956
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:963
 msgid "Cut selected text to the clipboard"
 msgstr "Corta el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:972
+#: ../calendar/gui/dialogs/comp-editor.c:970
 msgid "Click here to view help available"
 msgstr "Pulse aquí para ver la ayuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:979
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Paste text from the clipboard"
 msgstr "Pega texto desde el portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1000
+#: ../calendar/gui/dialogs/comp-editor.c:998
 msgid "Click here to save the current window"
 msgstr "Pulse aquí para guardar la vista actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1005
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1014
+#: ../calendar/gui/dialogs/comp-editor.c:1012
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1028
+#: ../calendar/gui/dialogs/comp-editor.c:1026
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1035
+#: ../calendar/gui/dialogs/comp-editor.c:1033
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1042
+#: ../calendar/gui/dialogs/comp-editor.c:1040
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:1047
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/em-folder-tree.c:2115
+#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2115
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1064
 #: ../composer/e-composer-actions.c:413
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "Click here to attach a file"
 msgstr "Pulse aquí para adjuntar un archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../calendar/gui/dialogs/comp-editor.c:1074
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1076
 msgid "Toggles whether to display categories"
 msgstr "Conmuta cuando se muestran las categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../calendar/gui/dialogs/comp-editor.c:1082
 msgid "Time _Zone"
 msgstr "_Zona horaria"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 msgid "Toggles whether the time zone is displayed"
 msgstr "Conmuta cuando se muestra la «Zona horaria»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1100
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1111
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "R_ole Field"
 msgstr "Campo «_Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Toggles whether the Role field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "_RSVP"
 msgstr "_Confirmar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Confirmar»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/comp-editor.c:1133
 msgid "_Status Field"
 msgstr "Campo de _estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1135
 msgid "Toggles whether the Status field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Estado»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Type Field"
 msgstr "Campo de _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1169
+#: ../calendar/gui/dialogs/comp-editor.c:1167
 #: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1595
+#: ../calendar/gui/dialogs/comp-editor.c:1593
 #: ../composer/e-composer-actions.c:640
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1906
-#: ../calendar/gui/dialogs/comp-editor.c:2708
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:2706
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2737
+#: ../calendar/gui/dialogs/comp-editor.c:2735
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
@@ -6000,7 +5991,7 @@ msgid "I_mport to Tasks"
 msgstr "I_mportar a las tareas"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3272
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3271
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -6114,7 +6105,6 @@ msgstr "Fecha de terminación"
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
-#| msgid "Modified"
 msgid "Last modified"
 msgstr ""
 
@@ -6130,7 +6120,7 @@ msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
 #: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Busy"
 msgstr "Ocupada"
 
@@ -6284,7 +6274,7 @@ msgstr "Abrir página _web"
 
 #: ../calendar/gui/e-calendar-table.c:1600
 #: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:498
+#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
@@ -6443,7 +6433,7 @@ msgstr "_Responder"
 
 #: ../calendar/gui/e-calendar-view.c:1831
 #: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:503 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
@@ -6478,7 +6468,7 @@ msgstr "Rehusado"
 #: ../calendar/gui/e-calendar-view.c:2294
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Tentative"
 msgstr "Provisional"
 
@@ -7073,7 +7063,7 @@ msgstr "En proceso"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2126
+#: ../calendar/gui/e-meeting-time-sel.c:2125
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -7082,7 +7072,7 @@ msgstr "%A, %d de %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2157
+#: ../calendar/gui/e-meeting-time-sel.c:2156
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7092,67 +7082,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "A_ttendees..."
 msgstr "_Participantes…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:435
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:452
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:477
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:492
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:510
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:525
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
@@ -9644,15 +9634,15 @@ msgstr "Conmutador que indica si se muestra el campo «Para»"
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header-table.c:65
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:67
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:70
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -9660,35 +9650,35 @@ msgstr ""
 "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:742
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:751
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:755
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:760
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:765
 msgid "_Bcc:"
 msgstr "Cc_o:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:770
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:774
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:783
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
@@ -9723,11 +9713,11 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2311
+#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2218
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3533
+#: ../composer/e-msg-composer.c:3440
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10502,7 +10492,7 @@ msgid "_Mail"
 msgstr "Co_rreo"
 
 #: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:505 ../ui/evolution-mail-message.xml.h:109
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "Reen_viar"
 
@@ -10687,14 +10677,14 @@ msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje."
 
-#: ../mail/em-composer-utils.c:2065
+#: ../mail/em-composer-utils.c:2068
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2112
+#: ../mail/em-composer-utils.c:2115
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10702,7 +10692,7 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:2255
+#: ../mail/em-composer-utils.c:2258
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
@@ -11382,33 +11372,29 @@ msgstr "No se pudo obtener el mensaje"
 msgid "Retrieving Message..."
 msgstr "Obteniendo mensaje…"
 
-#: ../mail/em-folder-view.c:2755
-msgid "C_all To..."
-msgstr "Ll_amar a…"
-
-#: ../mail/em-folder-view.c:2758
+#: ../mail/em-folder-view.c:2757
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2758
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2759
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:3253
+#: ../mail/em-folder-view.c:3252
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:3265
+#: ../mail/em-folder-view.c:3264
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../mail/em-folder-view.c:3270
+#: ../mail/em-folder-view.c:3269
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
@@ -11670,7 +11656,7 @@ msgstr "Cco"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-mailer-prefs.c:1439
 msgid "Mailer"
 msgstr "Transporte"
 
@@ -11809,20 +11795,20 @@ msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "El complemento %s está disponible y el binario está instalado."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "El complemento %s no está disponible. Compruebe si el paquete está instalado."
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1096
 msgid "No Junk plugin available"
 msgstr "No hay complemento para SPAM disponible"
 
@@ -11916,55 +11902,55 @@ msgstr ""
 "No es posible leer la configuración de la instalación anterior de Evolution, "
 "«evolution/config.xmldb» no existe o está corrompido."
 
-#: ../mail/em-popup.c:368
+#: ../mail/em-popup.c:364
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../mail/em-popup.c:393
+#: ../mail/em-popup.c:389
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
-#: ../mail/em-popup.c:499 ../widgets/misc/e-attachment-handler-image.c:147
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
 msgid "Set as _Background"
 msgstr "Establecer como _fondo"
 
-#: ../mail/em-popup.c:501
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../mail/em-popup.c:502 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:551 ../mail/em-popup.c:751
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:747
 msgid "_Add to Address Book"
 msgstr "_Añadir a la libreta de direcciones"
 
-#: ../mail/em-popup.c:730
+#: ../mail/em-popup.c:726
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s…"
 
-#: ../mail/em-subscribe-editor.c:604
+#: ../mail/em-subscribe-editor.c:605
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacén no soporta suscripciones, o no están activadas."
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:638
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: ../mail/em-subscribe-editor.c:641
+#: ../mail/em-subscribe-editor.c:642
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:857
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:893
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
@@ -12234,7 +12220,6 @@ msgid "Enable or disable magic space bar"
 msgstr "Activa o desactiva la barra espaciadora mágica"
 
 #: ../mail/evolution-mail.schemas.in.h:49
-#| msgid "It disables/enables the prompt while marking multiple messages."
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes."
 
@@ -12279,10 +12264,6 @@ msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
 
 #: ../mail/evolution-mail.schemas.in.h:58
-#| msgid ""
-#| "Encode file names in the mail headers same as Outlook or GMail does, to "
-#| "let them understand localized file names sent by Evolution, because they "
-#| "do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -15293,7 +15274,6 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:645
-#| msgid "_Auto-create address book entries when replying to messages"
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones al enviar "
@@ -16642,7 +16622,6 @@ msgstr ""
 "puede enviar correos en texto plano."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
-#| msgid "Default External Editor"
 msgid "External Editor"
 msgstr "Editor externo"
 
@@ -16696,7 +16675,6 @@ msgstr ""
 
 #: ../plugins/external-editor/external-editor.c:308
 #: ../plugins/external-editor/external-editor.c:310
-#| msgid "Compose in _External Editor"
 msgid "Compose in External Editor"
 msgstr "Redactar en un editor externo"
 
@@ -17961,7 +17939,6 @@ msgid "_Inherit reminder"
 msgstr "_Heredar recordatorio"
 
 #: ../plugins/itip-formatter/itip-view.c:1914
-#| msgid "_Memos"
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18175,9 +18152,6 @@ msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:350
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18194,9 +18168,6 @@ msgstr ""
 "tarea en él. Seleccione otro origen."
 
 #: ../plugins/mail-to-task/mail-to-task.c:356
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18211,7 +18182,6 @@ msgstr "No se pudo crear el objeto. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:555
 #, c-format
-#| msgid "Cannot open source \"{2}\"."
 msgid "Cannot get source list. %s"
 msgstr "No se pudo obtener la lista de origen. %s"
 
@@ -18254,17 +18224,14 @@ msgid "Mail to task"
 msgstr "Correo a tarea"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-#| msgid "Convert the selected message to a new task"
 msgid "Convert the selected message to a new event"
 msgstr "Convertir el mensaje seleccionado en un acontecimiento nuevo"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-#| msgid "Convert the selected message to a new task"
 msgid "Convert the selected message to a new meeting"
 msgstr "Convertir el mensaje seleccionado en una reunión nueva"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-#| msgid "Convert the selected message to a new task"
 msgid "Convert the selected message to a new memo"
 msgstr "Convertir el mensaje seleccionado en una nota nueva"
 
@@ -18709,7 +18676,6 @@ msgid "Service _type:"
 msgstr "_Tipo de servicio:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#| msgid "Time _zone:"
 msgid "Time _duration:"
 msgstr "_Duración:"
 
@@ -18734,11 +18700,6 @@ msgid "_Username:"
 msgstr "_Usuario:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:29
-#| msgid ""
-#| "day(s)\n"
-#| "week(s)\n"
-#| "month(s)\n"
-#| "year(s)"
 msgid ""
 "days\n"
 "weeks\n"
@@ -18795,51 +18756,47 @@ msgstr "Un complemento que carga otros complementos escritos en Python."
 msgid "Python Loader"
 msgstr "Cargador de Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:111
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (integrado)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "No se encontró SpamAssasin, código: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:145
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:153
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Falló al crear la tubería: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:192
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Error después de bifurcar: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:249
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:240
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:258
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:249
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Falló la tubería hacia SpamAssasin, código de error: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:521
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:512
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssasin no está disponible."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:913
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:904
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:919
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
 msgid "I_nclude remote tests"
 msgstr "I_ncluir tests remotos"
 
@@ -19198,7 +19155,7 @@ msgstr "Vista inicial de adjunto"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Initial file chooser folder"
-msgstr ""
+msgstr "Carpeta inicial del selector de archivos"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial folder for GtkFileChooser dialogs."
@@ -19506,7 +19463,6 @@ msgstr ""
 
 #: ../shell/e-shell-window-commands.c:78
 #, c-format
-#| msgid "Error executing %s."
 msgid "Error executing %s. (%s)"
 msgstr "Error al ejecutar %s. (%s)"
 
@@ -21907,56 +21863,54 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment.c:936
-#| msgid "Attached message"
-#| msgid_plural "%d attached messages"
+#: ../widgets/misc/e-attachment.c:940
 msgid "Attached message"
 msgstr "Mensaje adjunto"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1709 ../widgets/misc/e-attachment.c:2258
-#: ../widgets/misc/e-attachment-store.c:627
+#: ../widgets/misc/e-attachment.c:1719 ../widgets/misc/e-attachment.c:2270
+#: ../widgets/misc/e-attachment-store.c:635
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1756 ../widgets/misc/e-attachment.c:2560
+#: ../widgets/misc/e-attachment.c:1766 ../widgets/misc/e-attachment.c:2572
 msgid "A load operation is already in progress"
 msgstr "Existe una operación de carga en progreso"
 
-#: ../widgets/misc/e-attachment.c:1764 ../widgets/misc/e-attachment.c:2568
+#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2580
 msgid "A save operation is already in progress"
 msgstr "Existe una operación de guardado en progreso"
 
-#: ../widgets/misc/e-attachment.c:1857
+#: ../widgets/misc/e-attachment.c:1867
 #, c-format
 msgid "Could not load '%s'"
 msgstr "No se pudo cargar «%s»"
 
-#: ../widgets/misc/e-attachment.c:1860
+#: ../widgets/misc/e-attachment.c:1870
 #, c-format
 msgid "Could not load the attachment"
 msgstr "No se pudo cargar el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2135
+#: ../widgets/misc/e-attachment.c:2147
 #, c-format
 msgid "Could not open '%s'"
 msgstr "No se pudo abrir «%s»"
 
-#: ../widgets/misc/e-attachment.c:2138
+#: ../widgets/misc/e-attachment.c:2150
 #, c-format
 msgid "Could not open the attachment"
 msgstr "No se pudo abrir el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2576
+#: ../widgets/misc/e-attachment.c:2588
 msgid "Attachment contents not loaded"
 msgstr "No se cargó el contenido del adjunto"
 
-#: ../widgets/misc/e-attachment.c:2653
+#: ../widgets/misc/e-attachment.c:2665
 #, c-format
 msgid "Could not save '%s'"
 msgstr "No se pudo guardar «%s»"
 
-#: ../widgets/misc/e-attachment.c:2656
+#: ../widgets/misc/e-attachment.c:2668
 #, c-format
 msgid "Could not save the attachment"
 msgstr "No se pudo guardar el adjunto"
@@ -21996,15 +21950,15 @@ msgstr "Ocultar _barra de adjuntos"
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../widgets/misc/e-attachment-store.c:533
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "Add Attachment"
 msgstr "Añadir adjunto"
 
-#: ../widgets/misc/e-attachment-store.c:536
+#: ../widgets/misc/e-attachment-store.c:544
 msgid "A_ttach"
 msgstr "_Adjuntar"
 
-#: ../widgets/misc/e-attachment-store.c:598
+#: ../widgets/misc/e-attachment-store.c:606
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Guarda el adjunto"
@@ -22020,7 +21974,6 @@ msgstr "_Añadir adjunto…"
 
 #: ../widgets/misc/e-attachment-view.c:646
 #, c-format
-#| msgid "Opening %s"
 msgid "Open with \"%s\""
 msgstr "Abrir con «%s»"
 
@@ -23024,6 +22977,15 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Ajustar a la hora de _verano"
+
+#~ msgid "C_all To..."
+#~ msgstr "Ll_amar a…"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (integrado)"
+
 #~ msgid ""
 #~ "Enable side bar search feature so that you can start interactive "
 #~ "searching by typing in the text. Use is that you can easily find a folder "
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 0acbc44647..f90e737c24 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -127,13 +127,6 @@
      _tip="Open the selected messages in a new window"
      accel="*Control*o"/>
 
-    <cmd name="MailPost"
-     _tip="Post a message to a Public folder"/>
-
-    <cmd name="MessagePostReply"
-     _tip="Post a reply to a message in a Public folder"
-     accel=""/>
-
     <cmd name="MessageRedirect"
      _tip="Redirect (bounce) the selected message to someone"
      accel=""/>
@@ -301,7 +294,6 @@
       <submenu name="Message" _label="_Message">
         <placeholder name="MessageTopActions">
           <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/>
-          <menuitem name="MailPost" verb="" _label="Pos_t New Message to Folder"/>
           <menuitem name="MessageOpen" verb="" _label="_Open in New Window"/>
           <menuitem name="MessageEdit" verb="" _label="_Edit as New Message..."/>
           <menuitem name="AddSenderToAddressbook" verb="" _label="A_dd Sender to Address Book"/>
@@ -325,7 +317,6 @@
           <menuitem name="MessageReplySender" verb="" _label="_Reply to Sender"/>
           <menuitem name="MessageReplyList" verb="" _label="Reply to _List"/>
           <menuitem name="MessageReplyAll" verb="" _label="Reply to _All"/>
-          <menuitem name="MessagePostReply" verb="" _label="Post a Repl_y"/>
           <menuitem name="MessageForward" verb="" _label="_Forward"/>
           <submenu name="ForwardAs" _label="F_orward As...">
             <menuitem verb="MessageForwardAttached" _label="_Attached"/>
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 6d4bff46ca..b842bc86d0 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -214,13 +214,9 @@ option_changed (ESearchBar *search_bar, void *data)
 	int id = e_search_bar_get_item_id (search_bar);
 	char *query;
 
-	if (search_bar->scopeitem_id == E_FILTERBAR_CURRENT_MESSAGE_ID) {
-		gtk_widget_set_sensitive (search_bar->option_button, FALSE);
-	} else {
-		gtk_widget_set_sensitive (search_bar->option_button, TRUE);
-	}
+	d(printf("option changed, id = %d, setquery = %s %d\n", id, efb->setquery ? "true" : "false", esb->block_search));
 
-	if (filter_bar->setquery)
+	if (efb->setquery)
 		return;
 
 	switch (id) {
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index 957eea3d0b..b41f24e293 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -104,7 +104,6 @@ enum {
 
 	/* preset option options */
 	E_FILTERBAR_ADVANCED_ID = -5,
-	E_FILTERBAR_CURRENT_MESSAGE_ID = -6,
 	E_FILTERBAR_CURRENT_FOLDER_ID = -7,
 	E_FILTERBAR_CURRENT_ACCOUNT_ID = -8,
 	E_FILTERBAR_ALL_ACCOUNTS_ID = -9
@@ -113,10 +112,9 @@ enum {
 #define E_FILTERBAR_SAVE      { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, 0 }
 #define E_FILTERBAR_EDIT      { N_("_Edit Saved Searches..."), E_FILTERBAR_EDIT_ID, 0 }
 #define E_FILTERBAR_ADVANCED  { N_("_Advanced Search..."), E_FILTERBAR_ADVANCED_ID, 0 }
-#define E_FILTERBAR_ALL_ACCOUNTS { N_("All Accounts"), E_FILTERBAR_ALL_ACCOUNTS_ID }
-#define E_FILTERBAR_CURRENT_ACCOUNT { N_("Current Account"), E_FILTERBAR_CURRENT_ACCOUNT_ID }
-#define E_FILTERBAR_CURRENT_FOLDER { N_("Current Folder"), E_FILTERBAR_CURRENT_FOLDER_ID }
-#define E_FILTERBAR_CURRENT_MESSAGE { N_("Current Message"), E_FILTERBAR_CURRENT_MESSAGE_ID }
+#define E_FILTERBAR_ALL_ACCOUNTS { N_("All Accounts"), E_FILTERBAR_ALL_ACCOUNTS_ID, ESB_ITEMTYPE_RADIO }
+#define E_FILTERBAR_CURRENT_ACCOUNT { N_("Current Account"), E_FILTERBAR_CURRENT_ACCOUNT_ID, ESB_ITEMTYPE_RADIO }
+#define E_FILTERBAR_CURRENT_FOLDER { N_("Current Folder"), E_FILTERBAR_CURRENT_FOLDER_ID, ESB_ITEMTYPE_RADIO }
 #define E_FILTERBAR_SEPARATOR { NULL, 0, 0 }
 
 #ifdef JUST_FOR_TRANSLATORS
diff --git a/win32/libemiscwidgets.def b/win32/libemiscwidgets.def
index c91c7b81fc..2681060858 100644
--- a/win32/libemiscwidgets.def
+++ b/win32/libemiscwidgets.def
@@ -1,20 +1,98 @@
 EXPORTS
+	e_account_combo_box_get_account_list
+	e_account_combo_box_get_active
+	e_account_combo_box_get_active_name
+	e_account_combo_box_get_type
+	e_account_combo_box_new
+	e_account_combo_box_set_account_list
+	e_account_combo_box_set_active
+	e_account_combo_box_set_active_name
+	e_account_combo_box_set_session
+	e_activity_handler_attach_task_bar
+	e_activity_handler_cancelable_operation_started
+	e_activity_handler_get_type
+	e_activity_handler_make_error
+	e_activity_handler_new
+	e_activity_handler_operation_finished
+	e_activity_handler_operation_progressing
+	e_activity_handler_operation_set_error
+	e_activity_handler_operation_started
+	e_activity_handler_set_error_flush_time
+	e_activity_handler_set_logger
+	e_activity_handler_set_message
+	e_activity_handler_unset_message
+	e_attachment_bar_add_attachment
+	e_attachment_bar_add_attachment_silent
+	e_attachment_bar_attach
+	e_attachment_bar_attach_mime_part
+	e_attachment_bar_attach_remote_file
+	e_attachment_bar_bonobo_ui_populate_with_recent
+	e_attachment_bar_create_attachment_cache
+	e_attachment_bar_edit_selected
+	e_attachment_bar_get_all_attachments
+	e_attachment_bar_get_attachment
+	e_attachment_bar_get_download_count
+	e_attachment_bar_get_num_attachments
+	e_attachment_bar_get_parts
+	e_attachment_bar_get_selected
+	e_attachment_bar_get_selector
+	e_attachment_bar_get_type
+	e_attachment_bar_new
+	e_attachment_bar_recent_action_new
+	e_attachment_bar_refresh
+	e_attachment_bar_remove_selected
+	e_attachment_bar_set_width
+	e_attachment_bar_to_multipart
+	e_attachment_build_remote_file
+	e_attachment_edit
+	e_attachment_get_type
+	e_attachment_new
+	e_attachment_new_from_mime_part
+	e_attachment_new_remote_file
+	e_auto_kill_popup_menu_on_selection_done
+	e_black DATA
+	e_calendar_get_border_size
+	e_calendar_get_type
+	e_calendar_item_clear_marks
 	e_calendar_item_get_date_range
+	e_calendar_item_get_days_start_week_sel
+	e_calendar_item_get_display_popup
+	e_calendar_item_get_first_month
+	e_calendar_item_get_max_days_sel
 	e_calendar_item_get_selection
 	e_calendar_item_get_type
 	e_calendar_item_get_week_number
+	e_calendar_item_mark_day
+	e_calendar_item_mark_days
 	e_calendar_item_normalize_date
+	e_calendar_item_set_days_start_week_sel
+	e_calendar_item_set_display_popup
+	e_calendar_item_set_first_month
+	e_calendar_item_set_get_time_callback
+	e_calendar_item_set_max_days_sel
 	e_calendar_item_set_selection
+	e_calendar_item_set_style_callback
+	e_calendar_item_style_set
+	e_calendar_new
+	e_calendar_set_focusable
+	e_calendar_set_maximum_size
+	e_calendar_set_minimum_size
 	e_canvas_background_get_type
 	e_canvas_get_type
 	e_canvas_hide_tooltip
+	e_canvas_item_add_selection
 	e_canvas_item_area_shown
 	e_canvas_item_grab
 	e_canvas_item_grab_focus
 	e_canvas_item_move_absolute
+	e_canvas_item_remove_selection
 	e_canvas_item_request_parent_reflow
 	e_canvas_item_request_reflow
+	e_canvas_item_set_cursor
+	e_canvas_item_set_cursor_end
 	e_canvas_item_set_reflow_callback
+	e_canvas_item_set_selection_callback
+	e_canvas_item_set_selection_compare_callback
 	e_canvas_item_show_area
 	e_canvas_item_show_area_delayed
 	e_canvas_item_ungrab
@@ -23,42 +101,212 @@ EXPORTS
 	e_canvas_vbox_add_item
 	e_canvas_vbox_add_item_start
 	e_canvas_vbox_get_type
+	e_cell_date_edit_freeze
+	e_cell_date_edit_get_type
+	e_cell_date_edit_new
+	e_cell_date_edit_set_get_time_callback
+	e_cell_date_edit_thaw
+	e_cell_percent_get_type
+	e_cell_percent_new
+	e_cell_renderer_combo_get_type
+	e_cell_renderer_combo_new
+	e_charset_add_radio_actions
+	e_charset_picker_bonobo_ui_populate
+	e_charset_picker_dialog
+	e_charset_picker_get_charset
+	e_charset_picker_new
+	e_color_alloc_gdk
+	e_color_alloc_name
+	e_color_init
+	e_combo_button_construct
 	e_combo_button_get_label
 	e_combo_button_get_type
+	e_combo_button_new
+	e_combo_button_pack_hbox
+	e_combo_button_pack_vbox
 	e_combo_button_popup_menu
+	e_combo_button_set_icon
+	e_combo_button_set_label
+	e_combo_button_set_menu
+	e_combo_cell_editable_cancelled
+	e_combo_cell_editable_get_list
+	e_combo_cell_editable_get_text
+	e_combo_cell_editable_get_type
+	e_combo_cell_editable_new
+	e_combo_cell_editable_set_list
+	e_combo_cell_editable_set_text
+	e_config_page_get_type
+	e_config_page_new
+	e_container_change_tab_order
+	e_container_focus_nth_entry
+	e_container_foreach_leaf
 	e_cursor_get
+	e_cursors_init
+	e_cursors_shutdown
+	e_dark_gray DATA
+	e_date_edit_date_is_valid
+	e_date_edit_get_allow_no_date_set
+	e_date_edit_get_date
+	e_date_edit_get_entry
+	e_date_edit_get_make_time_insensitive
+	e_date_edit_get_show_date
+	e_date_edit_get_show_time
+	e_date_edit_get_show_week_numbers
+	e_date_edit_get_time
+	e_date_edit_get_time_of_day
+	e_date_edit_get_time_popup_range
+	e_date_edit_get_twodigit_year_can_future
+	e_date_edit_get_type
+	e_date_edit_get_use_24_hour_format
+	e_date_edit_get_week_start_day
+	e_date_edit_have_time
+	e_date_edit_new
+	e_date_edit_set_allow_no_date_set
+	e_date_edit_set_date
+	e_date_edit_set_date_and_time_of_day
+	e_date_edit_set_editable
+	e_date_edit_set_get_time_callback
+	e_date_edit_set_make_time_insensitive
+	e_date_edit_set_show_date
+	e_date_edit_set_show_time
+	e_date_edit_set_show_week_numbers
+	e_date_edit_set_time
+	e_date_edit_set_time_of_day
+	e_date_edit_set_time_popup_range
+	e_date_edit_set_twodigit_year_can_future
+	e_date_edit_set_use_24_hour_format
+	e_date_edit_set_week_start_day
+	e_date_edit_time_is_valid
+	e_dropdown_button_construct
+	e_dropdown_button_get_type
+	e_dropdown_button_new
+	e_expander_get_expanded
+	e_expander_get_label
+	e_expander_get_label_widget
+	e_expander_get_spacing
 	e_expander_get_type
+	e_expander_get_use_underline
+	e_expander_new
+	e_expander_new_with_mnemonic
+	e_expander_set_expanded
+	e_expander_set_label
+	e_expander_set_label_widget
+	e_expander_set_spacing
+	e_expander_set_use_underline
+	e_glade_xml_connect_widget
+	e_glade_xml_set_sensitive
+	e_hsv_to_rgb
 	e_hsv_tweak
+	e_icon_entry_create_button
+	e_icon_entry_get_entry
+	e_icon_entry_get_type
+	e_icon_entry_new
+	e_icon_entry_pack_widget
+	e_image_chooser_get_image_data
+	e_image_chooser_get_type
+	e_image_chooser_new
+	e_image_chooser_set_editable
+	e_image_chooser_set_from_file
+	e_image_chooser_set_image_data
+	e_info_label_get_type
+	e_info_label_new
+	e_info_label_set_info
 	e_map_add_point
+	e_map_freeze
 	e_map_get_closest_point
 	e_map_get_magnification
+	e_map_get_smooth_zoom
+	e_map_get_type
 	e_map_new
 	e_map_point_get_color_rgba
+	e_map_point_get_data
 	e_map_point_get_location
+	e_map_point_get_name
+	e_map_point_is_in_view
 	e_map_point_set_color_rgba
+	e_map_point_set_data
+	e_map_remove_point
+	e_map_set_smooth_zoom
+	e_map_thaw
 	e_map_window_to_world
+	e_map_world_to_window
 	e_map_zoom_out
 	e_map_zoom_to_location
+	e_multi_config_dialog_add_page
+	e_multi_config_dialog_get_type
+	e_multi_config_dialog_new
+	e_multi_config_dialog_show_page
+	e_online_button_get_online
+	e_online_button_get_type
+	e_online_button_new
+	e_online_button_set_online
 	e_popup_menu
+	e_popup_menu_copy
+	e_popup_menu_copy_1
+	e_popup_menu_create
 	e_popup_menu_create_with_domain
+	e_popup_menu_free
+	e_popup_menu_free_1
+	e_popup_menu_run
 	e_printable_data_left
+	e_printable_get_type
 	e_printable_height
 	e_printable_new
 	e_printable_print_page
 	e_printable_reset
 	e_printable_will_fit
 	e_reflow_get_type
+	e_reflow_model_changed
+	e_reflow_model_compare
+	e_reflow_model_comparison_changed
+	e_reflow_model_count
+	e_reflow_model_get_type
+	e_reflow_model_height
+	e_reflow_model_incarnate
+	e_reflow_model_item_changed
+	e_reflow_model_item_removed
+	e_reflow_model_items_inserted
+	e_reflow_model_reincarnate
+	e_reflow_model_set_width
+	e_rgb_to_hsv
+	e_search_bar_add_menu
+	e_search_bar_construct
+	e_search_bar_get_item_id
+	e_search_bar_get_search_scope
+	e_search_bar_get_selected_viewitem
+	e_search_bar_get_text
+	e_search_bar_get_type
+	e_search_bar_get_viewitem_id
+	e_search_bar_new
+	e_search_bar_paint
+	e_search_bar_scope_enable
+	e_search_bar_set_ids
+	e_search_bar_set_item_id
+	e_search_bar_set_item_menu
+	e_search_bar_set_menu
+	e_search_bar_set_menu_sensitive
+	e_search_bar_set_option
+	e_search_bar_set_scopeoption
+	e_search_bar_set_scopeoption_menu
+	e_search_bar_set_search_scope
+	e_search_bar_set_text
+	e_search_bar_set_ui_component
+	e_search_bar_set_viewitem_id
+	e_search_bar_set_viewoption
+	e_search_bar_set_viewoption_menu
+	e_search_bar_set_viewoption_menufunc
 	e_selection_model_array_confirm_row_count
 	e_selection_model_array_delete_rows
+	e_selection_model_array_get_row_count
 	e_selection_model_array_get_type
 	e_selection_model_array_insert_rows
+	e_selection_model_array_move_row
 	e_selection_model_change_cursor
 	e_selection_model_change_one_row
 	e_selection_model_clear
 	e_selection_model_cursor_activated
 	e_selection_model_cursor_changed
 	e_selection_model_cursor_col
-	e_selection_model_cursor_col
 	e_selection_model_cursor_row
 	e_selection_model_do_something
 	e_selection_model_foreach
@@ -67,19 +315,86 @@ EXPORTS
 	e_selection_model_is_row_selected
 	e_selection_model_key_press
 	e_selection_model_maybe_do_something
+	e_selection_model_move_selection_end
 	e_selection_model_right_click_down
 	e_selection_model_right_click_up
-	e_selection_model_right_key_press
+	e_selection_model_row_count
 	e_selection_model_select_all
 	e_selection_model_select_as_key_press
 	e_selection_model_select_single_row
 	e_selection_model_selected_count
 	e_selection_model_selection_changed
 	e_selection_model_selection_row_changed
+	e_selection_model_set_selection_end
+	e_selection_model_simple_delete_rows
+	e_selection_model_simple_get_type
+	e_selection_model_simple_insert_rows
+	e_selection_model_simple_move_row
+	e_selection_model_simple_new
+	e_selection_model_simple_set_row_count
 	e_selection_model_toggle_single_row
+	e_sendoptions_dialog_get_type
+	e_sendoptions_dialog_new
+	e_sendoptions_dialog_run
+	e_sendoptions_get_need_general_options
+	e_sendoptions_set_global
+	e_sendoptions_set_need_general_options
+	e_signature_combo_box_get_active
+	e_signature_combo_box_get_signature_list
+	e_signature_combo_box_get_type
+	e_signature_combo_box_new
+	e_signature_combo_box_set_active
+	e_signature_combo_box_set_signature_list
+	e_spinner_new_spinning_small_shown
+	e_task_bar_construct
+	e_task_bar_get_task_widget
+	e_task_bar_get_task_widget_from_id
+	e_task_bar_get_type
+	e_task_bar_new
+	e_task_bar_prepend_task
+	e_task_bar_remove_task
+	e_task_bar_remove_task_from_id
+	e_task_bar_set_message
+	e_task_bar_unset_message
+	e_task_widget_construct
+	e_task_widget_get_component_id
+	e_task_widget_get_type
+	e_task_widget_new
+	e_task_widget_new_with_cancel
+	e_task_widget_update
+	e_task_widget_update_image
+	e_task_wiget_alert
+	e_task_wiget_unalert
+	e_unichar_to_utf8
+	e_unicode_get_utf8
+	e_url_entry_get_entry
+	e_url_entry_get_type
+	e_url_entry_new
+	e_utf8_from_charset_string
+	e_utf8_from_charset_string_sized
 	e_utf8_from_gtk_event_key
+	e_utf8_from_iconv_string
+	e_utf8_from_iconv_string_sized
+	e_utf8_from_locale_string
+	e_utf8_from_locale_string_sized
+	e_utf8_gtk_editable_get_chars
+	e_utf8_gtk_editable_get_text
+	e_utf8_gtk_editable_insert_text
+	e_utf8_gtk_editable_set_text
+	e_utf8_gtk_entry_get_text
+	e_utf8_gtk_entry_set_text
+	e_utf8_is_ascii
+	e_utf8_strstrcase
+	e_utf8_strstrcasedecomp
+	e_utf8_to_charset_string
+	e_utf8_to_charset_string_sized
+	e_utf8_to_iconv_string
+	e_utf8_to_iconv_string_sized
 	e_utf8_to_locale_string
-	gal_combo_text_add_item
-	gal_combo_text_get_type
-	gal_combo_text_new
-	gal_combo_text_set_text
+	e_utf8_to_locale_string_sized
+	e_utf8_xml1_decode
+	e_utf8_xml1_encode
+	e_white DATA
+	e_xml_get_translated_utf8_string_prop_by_name
+	icon_data DATA
+	send_options_make_dateedit
diff --git a/win32/libetable.def b/win32/libetable.def
index ce00472e0e..f735270ee0 100644
--- a/win32/libetable.def
+++ b/win32/libetable.def
@@ -1,40 +1,508 @@
 EXPORTS
+	e_cell_checkbox_get_type
+	e_cell_checkbox_new
+	e_cell_combo_get_type
+	e_cell_combo_new
+	e_cell_combo_set_popdown_strings
+	e_cell_date_get_type
+	e_cell_date_new
+	e_cell_draw
+	e_cell_enter_edit
+	e_cell_event
+	e_cell_free_state
+	e_cell_get_bg_color
+	e_cell_get_type
+	e_cell_hbox_append
+	e_cell_hbox_get_type
+	e_cell_hbox_new
 	e_cell_height
+	e_cell_kill_view
+	e_cell_leave_edit
+	e_cell_load_state
+	e_cell_max_width
+	e_cell_max_width_by_row
+	e_cell_max_width_by_row_implemented
+	e_cell_new_view
+	e_cell_number_get_type
+	e_cell_number_new
+	e_cell_pixbuf_construct
+	e_cell_pixbuf_get_type
+	e_cell_pixbuf_new
+	e_cell_popup_get_child
 	e_cell_popup_get_type
+	e_cell_popup_new
+	e_cell_popup_queue_cell_redraw
+	e_cell_popup_set_child
+	e_cell_popup_set_shown
+	e_cell_print
+	e_cell_print_height
+	e_cell_realize
+	e_cell_save_state
+	e_cell_show_tooltip
+	e_cell_size_get_type
+	e_cell_size_new
+	e_cell_style_set
+	e_cell_text_construct
 	e_cell_text_copy_clipboard
 	e_cell_text_delete_selection
+	e_cell_text_free_text
 	e_cell_text_get_selection
+	e_cell_text_get_text
 	e_cell_text_get_text_by_view
 	e_cell_text_get_type
+	e_cell_text_new
 	e_cell_text_paste_clipboard
 	e_cell_text_set_selection
 	e_cell_text_set_value
+	e_cell_toggle_construct
+	e_cell_toggle_get_type
+	e_cell_toggle_new
+	e_cell_tree_construct
+	e_cell_tree_get_type
+	e_cell_tree_new
 	e_cell_tree_view_get_subcell_view
+	e_cell_unrealize
+	e_cell_vbox_append
+	e_cell_vbox_get_type
+	e_cell_vbox_new
+	e_table_click_to_add_commit
 	e_table_click_to_add_get_type
 	e_table_col_get_type
+	e_table_col_new
+	e_table_col_new_with_pixbuf
+	e_table_column_specification_get_type
+	e_table_column_specification_load_from_node
+	e_table_column_specification_new
+	e_table_column_specification_save_to_node
+	e_table_commit_click_to_add
+	e_table_config_construct
+	e_table_config_get_type
+	e_table_config_new
+	e_table_config_raise
+	e_table_construct
+	e_table_construct_from_spec_file
+	e_table_drag_begin
+	e_table_drag_dest_set
+	e_table_drag_dest_set_proxy
+	e_table_drag_dest_unset
+	e_table_drag_get_data
+	e_table_drag_highlight
+	e_table_drag_source_set
+	e_table_drag_source_unset
+	e_table_drag_unhighlight
+	e_table_extras_add_cell
+	e_table_extras_add_compare
+	e_table_extras_add_pixbuf
+	e_table_extras_add_search
+	e_table_extras_get_cell
+	e_table_extras_get_compare
+	e_table_extras_get_pixbuf
+	e_table_extras_get_search
+	e_table_extras_get_type
+	e_table_extras_new
+	e_table_field_chooser_dialog_get_type
+	e_table_field_chooser_dialog_new
+	e_table_field_chooser_get_type
+	e_table_field_chooser_item_get_type
+	e_table_field_chooser_new
 	e_table_get_cell_at
 	e_table_get_cell_geometry
+	e_table_get_cursor_row
+	e_table_get_mouse_over_cell
+	e_table_get_next_row
+	e_table_get_prev_row
+	e_table_get_printable
+	e_table_get_selection_model
+	e_table_get_state
+	e_table_get_state_object
 	e_table_get_type
+	e_table_group_add
+	e_table_group_add_all
+	e_table_group_add_array
+	e_table_group_apply_to_leafs
+	e_table_group_click
+	e_table_group_compute_location
+	e_table_group_construct
+	e_table_group_container_construct
 	e_table_group_container_get_type
+	e_table_group_container_new
+	e_table_group_cursor_activated
+	e_table_group_cursor_change
+	e_table_group_decrement
+	e_table_group_double_click
+	e_table_group_get_cell_geometry
+	e_table_group_get_focus
+	e_table_group_get_focus_column
+	e_table_group_get_header
+	e_table_group_get_mouse_over
+	e_table_group_get_printable
 	e_table_group_get_type
+	e_table_group_increment
+	e_table_group_key_press
 	e_table_group_leaf_get_type
+	e_table_group_leaf_new
+	e_table_group_new
+	e_table_group_remove
+	e_table_group_right_click
+	e_table_group_row_count
+	e_table_group_set_focus
+	e_table_group_start_drag
+	e_table_header_add_column
+	e_table_header_col_diff
+	e_table_header_compute_height
+	e_table_header_count
+	e_table_header_draw_button
 	e_table_header_get_column
+	e_table_header_get_column_by_col_idx
 	e_table_header_get_columns
+	e_table_header_get_index_at
+	e_table_header_get_selected
+	e_table_header_get_type
+	e_table_header_index
 	e_table_header_item_get_type
+	e_table_header_min_width
+	e_table_header_move
+	e_table_header_new
+	e_table_header_prioritized_column
+	e_table_header_prioritized_column_selected
+	e_table_header_remove
+	e_table_header_set_selection
+	e_table_header_set_size
+	e_table_header_total_width
+	e_table_header_update_horizontal
+	e_table_header_width_extras
+	e_table_invert_selection
+	e_table_item_compute_location
+	e_table_item_compute_mouse_over
 	e_table_item_enter_edit
 	e_table_item_get_cell_geometry
+	e_table_item_get_focused_column
+	e_table_item_get_printable
 	e_table_item_get_type
+	e_table_item_leave_edit
+	e_table_item_redraw_range
+	e_table_item_row_diff
+	e_table_item_set_cursor
+	e_table_load_state
+	e_table_memory_callbacks_get_type
+	e_table_memory_callbacks_new
+	e_table_memory_clear
+	e_table_memory_freeze
+	e_table_memory_get_data
+	e_table_memory_get_type
+	e_table_memory_insert
+	e_table_memory_new
+	e_table_memory_remove
+	e_table_memory_set_data
+	e_table_memory_store_adopt_value_at
+	e_table_memory_store_change
+	e_table_memory_store_change_adopt
+	e_table_memory_store_change_adopt_array
+	e_table_memory_store_change_array
+	e_table_memory_store_clear
+	e_table_memory_store_construct
+	e_table_memory_store_get_type
+	e_table_memory_store_insert
+	e_table_memory_store_insert_adopt
+	e_table_memory_store_insert_adopt_array
+	e_table_memory_store_insert_array
+	e_table_memory_store_new
+	e_table_memory_store_remove
+	e_table_memory_thaw
+	e_table_model_append_row
+	e_table_model_cell_changed
+	e_table_model_changed
 	e_table_model_column_count
+	e_table_model_duplicate_value
+	e_table_model_free_value
+	e_table_model_freeze
+	e_table_model_get_save_id
+	e_table_model_get_type
+	e_table_model_has_change_pending
+	e_table_model_has_save_id
+	e_table_model_initialize_value
 	e_table_model_is_cell_editable
+	e_table_model_no_change
+	e_table_model_pre_change
+	e_table_model_row_changed
+	e_table_model_row_count
+	e_table_model_row_deleted
+	e_table_model_row_inserted
+	e_table_model_rows_deleted
+	e_table_model_rows_inserted
+	e_table_model_set_value_at
+	e_table_model_thaw
+	e_table_model_to_view_row
 	e_table_model_value_at
+	e_table_model_value_is_empty
+	e_table_model_value_to_string
+	e_table_new
+	e_table_new_from_spec_file
+	e_table_one_commit
+	e_table_one_get_type
+	e_table_one_new
+	e_table_proxy_etable_available_new
+	e_table_proxy_etable_shown_new
+	e_table_proxy_gtk_combo_text_new
+	e_table_right_click_up
+	e_table_save_state
+	e_table_scrolled_construct
+	e_table_scrolled_construct_from_spec_file
+	e_table_scrolled_get_table
+	e_table_scrolled_get_type
+	e_table_scrolled_new
+	e_table_scrolled_new_from_spec_file
+	e_table_search_backspace
+	e_table_search_get_type
+	e_table_search_input_character
+	e_table_search_new
+	e_table_select_all
+	e_table_selected_count
+	e_table_selected_row_foreach
+	e_table_selection_model_get_type
+	e_table_selection_model_new
+	e_table_set_cursor_row
+	e_table_set_state
+	e_table_set_state_object
+	e_table_simple_get_type
+	e_table_simple_new
+	e_table_simple_string_duplicate_value
+	e_table_simple_string_free_value
+	e_table_simple_string_initialize_value
+	e_table_simple_string_value_is_empty
+	e_table_simple_string_value_to_string
+	e_table_sort_info_duplicate
+	e_table_sort_info_freeze
+	e_table_sort_info_get_can_group
+	e_table_sort_info_get_type
+	e_table_sort_info_grouping_get_count
+	e_table_sort_info_grouping_get_nth
+	e_table_sort_info_grouping_set_nth
+	e_table_sort_info_grouping_truncate
+	e_table_sort_info_load_from_node
+	e_table_sort_info_new
+	e_table_sort_info_save_to_node
+	e_table_sort_info_set_can_group
+	e_table_sort_info_sorting_get_count
+	e_table_sort_info_sorting_get_nth
+	e_table_sort_info_sorting_set_nth
+	e_table_sort_info_sorting_truncate
+	e_table_sort_info_thaw
+	e_table_sorted_get_type
+	e_table_sorted_new
+	e_table_sorted_variable_get_type
+	e_table_sorted_variable_new
+	e_table_sorter_get_type
+	e_table_sorter_new
+	e_table_sorting_utils_affects_sort
+	e_table_sorting_utils_check_position
+	e_table_sorting_utils_insert
+	e_table_sorting_utils_sort
+	e_table_sorting_utils_tree_check_position
+	e_table_sorting_utils_tree_insert
+	e_table_sorting_utils_tree_sort
+	e_table_spec_to_full_header
+	e_table_specification_duplicate
+	e_table_specification_get_type
+	e_table_specification_load_from_file
+	e_table_specification_load_from_node
+	e_table_specification_load_from_string
+	e_table_specification_new
+	e_table_specification_save_to_file
+	e_table_specification_save_to_node
+	e_table_specification_save_to_string
+	e_table_state_duplicate
+	e_table_state_get_type
+	e_table_state_load_from_file
+	e_table_state_load_from_node
+	e_table_state_load_from_string
+	e_table_state_new
+	e_table_state_save_to_file
+	e_table_state_save_to_node
+	e_table_state_save_to_string
+	e_table_state_to_header
+	e_table_state_vanilla
+	e_table_subset_construct
+	e_table_subset_get_toplevel
 	e_table_subset_get_type
+	e_table_subset_model_to_view_row
+	e_table_subset_new
+	e_table_subset_print_debugging
+	e_table_subset_variable_add
+	e_table_subset_variable_add_all
+	e_table_subset_variable_add_array
+	e_table_subset_variable_clear
+	e_table_subset_variable_construct
+	e_table_subset_variable_decrement
+	e_table_subset_variable_get_type
+	e_table_subset_variable_increment
+	e_table_subset_variable_new
+	e_table_subset_variable_remove
+	e_table_subset_variable_set_allocation
+	e_table_subset_view_to_model_row
+	e_table_util_calculate_current_search_col
+	e_table_view_to_model_row
+	e_table_without_construct
+	e_table_without_get_type
+	e_table_without_hide
+	e_table_without_hide_adopt
+	e_table_without_new
+	e_table_without_show
+	e_table_without_show_all
+	e_tree_construct
+	e_tree_construct_from_spec_file
+	e_tree_drag_begin
+	e_tree_drag_dest_set
+	e_tree_drag_dest_set_proxy
+	e_tree_drag_dest_unset
+	e_tree_drag_get_data
+	e_tree_drag_highlight
+	e_tree_drag_source_set
+	e_tree_drag_source_unset
+	e_tree_drag_unhighlight
+	e_tree_find_next
+	e_tree_force_expanded_state
 	e_tree_get_cell_at
 	e_tree_get_cell_geometry
+	e_tree_get_cursor
 	e_tree_get_header_item
 	e_tree_get_item
 	e_tree_get_model
+	e_tree_get_next_row
+	e_tree_get_prev_row
+	e_tree_get_printable
+	e_tree_get_selection_model
+	e_tree_get_spec
+	e_tree_get_state
+	e_tree_get_state_object
+	e_tree_get_table_adapter
+	e_tree_get_tooltip
 	e_tree_get_type
+	e_tree_load_expanded_state
+	e_tree_load_expanded_state_xml
+	e_tree_load_state
+	e_tree_memory_callbacks_get_type
+	e_tree_memory_callbacks_new
+	e_tree_memory_construct
+	e_tree_memory_freeze
+	e_tree_memory_get_type
+	e_tree_memory_new
+	e_tree_memory_node_get_data
+	e_tree_memory_node_insert
+	e_tree_memory_node_insert_before
+	e_tree_memory_node_insert_id
+	e_tree_memory_node_remove
+	e_tree_memory_node_set_data
+	e_tree_memory_set_expanded_default
+	e_tree_memory_set_node_destroy_func
+	e_tree_memory_sort_node
+	e_tree_memory_thaw
+	e_tree_model_column_count
+	e_tree_model_duplicate_value
+	e_tree_model_free_value
+	e_tree_model_get_expanded_default
+	e_tree_model_get_node_by_id
+	e_tree_model_get_root
+	e_tree_model_get_save_id
+	e_tree_model_get_type
+	e_tree_model_has_change_pending
+	e_tree_model_has_get_node_by_id
+	e_tree_model_has_save_id
+	e_tree_model_icon_at
+	e_tree_model_initialize_value
+	e_tree_model_new
+	e_tree_model_no_change
+	e_tree_model_node_changed
+	e_tree_model_node_col_changed
+	e_tree_model_node_data_changed
+	e_tree_model_node_deleted
+	e_tree_model_node_depth
+	e_tree_model_node_find
+	e_tree_model_node_get_children
+	e_tree_model_node_get_first_child
+	e_tree_model_node_get_last_child
+	e_tree_model_node_get_next
+	e_tree_model_node_get_parent
+	e_tree_model_node_get_prev
+	e_tree_model_node_inserted
+	e_tree_model_node_is_editable
 	e_tree_model_node_is_expandable
+	e_tree_model_node_is_root
+	e_tree_model_node_removed
+	e_tree_model_node_request_collapse
+	e_tree_model_node_traverse
+	e_tree_model_node_traverse_preorder
+	e_tree_model_pre_change
+	e_tree_model_set_value_at
+	e_tree_model_sort_value_at
+	e_tree_model_to_view_row
+	e_tree_model_value_at
+	e_tree_model_value_is_empty
+	e_tree_model_value_to_string
+	e_tree_new
+	e_tree_new_from_spec_file
+	e_tree_node_at_row
+	e_tree_node_is_expanded
+	e_tree_node_set_expanded
+	e_tree_node_set_expanded_recurse
+	e_tree_path_foreach
+	e_tree_right_click_up
+	e_tree_root_node_is_visible
+	e_tree_root_node_set_visible
+	e_tree_row_count
+	e_tree_row_of_node
+	e_tree_save_expanded_state
+	e_tree_save_expanded_state_xml
+	e_tree_save_state
+	e_tree_scrolled_construct
+	e_tree_scrolled_construct_from_spec_file
+	e_tree_scrolled_get_tree
+	e_tree_scrolled_get_type
+	e_tree_scrolled_new
+	e_tree_scrolled_new_from_spec_file
+	e_tree_selected_path_foreach
+	e_tree_selected_row_foreach
+	e_tree_selection_model_add_to_selection
+	e_tree_selection_model_change_cursor
+	e_tree_selection_model_foreach
+	e_tree_selection_model_get_cursor
+	e_tree_selection_model_get_type
+	e_tree_selection_model_new
+	e_tree_selection_model_select_paths
+	e_tree_selection_model_select_single_path
+	e_tree_set_cursor
+	e_tree_set_info_message
+	e_tree_set_search_column
+	e_tree_set_state
+	e_tree_set_state_object
+	e_tree_show_node
+	e_tree_sorted_construct
+	e_tree_sorted_get_sort_info
+	e_tree_sorted_get_type
+	e_tree_sorted_model_to_view_path
+	e_tree_sorted_new
+	e_tree_sorted_node_num_children
+	e_tree_sorted_node_resorted
+	e_tree_sorted_orig_position
+	e_tree_sorted_set_sort_info
+	e_tree_sorted_view_to_model_path
+	e_tree_table_adapter_construct
+	e_tree_table_adapter_force_expanded_state
+	e_tree_table_adapter_get_type
+	e_tree_table_adapter_load_expanded_state
+	e_tree_table_adapter_load_expanded_state_xml
+	e_tree_table_adapter_new
+	e_tree_table_adapter_node_at_row
+	e_tree_table_adapter_node_get_next
 	e_tree_table_adapter_node_is_expanded
 	e_tree_table_adapter_node_set_expanded
+	e_tree_table_adapter_node_set_expanded_recurse
+	e_tree_table_adapter_root_node_is_visible
+	e_tree_table_adapter_root_node_set_visible
+	e_tree_table_adapter_row_of_node
+	e_tree_table_adapter_save_expanded_state
+	e_tree_table_adapter_save_expanded_state_xml
+	e_tree_table_adapter_set_sort_info
+	e_tree_table_adapter_show_node
+	e_tree_view_to_model_row
 	ethi_change_sort_state
diff --git a/win32/libetext.def b/win32/libetext.def
index 69d1176c28..038263b1d3 100644
--- a/win32/libetext.def
+++ b/win32/libetext.def
@@ -1,10 +1,35 @@
 EXPORTS
+	e_repos_absolute
+	e_repos_clamp
 	e_repos_delete_shift
 	e_repos_insert_shift
+	e_repos_shift
+	e_text_cancel_editing
 	e_text_copy_clipboard
+	e_text_cut_clipboard
 	e_text_delete_selection
 	e_text_get_type
-	e_text_get_type
+	e_text_model_activate_nth_object
+	e_text_model_append
+	e_text_model_cancel_completion
+	e_text_model_changed
+	e_text_model_delete
+	e_text_model_get_nth_object
+	e_text_model_get_nth_object_bounds
+	e_text_model_get_object_at_offset
+	e_text_model_get_object_at_pointer
 	e_text_model_get_text
+	e_text_model_get_text_length
+	e_text_model_get_type
+	e_text_model_insert
+	e_text_model_insert_length
+	e_text_model_new
+	e_text_model_object_count
+	e_text_model_prepend
+	e_text_model_reposition
 	e_text_model_set_text
+	e_text_model_strdup_nth_object
+	e_text_model_validate_position
 	e_text_paste_clipboard
+	e_text_select_all
+	e_text_stop_editing
diff --git a/win32/libevolution-addressbook.def b/win32/libevolution-addressbook.def
index c29ec7fad9..6610055249 100644
--- a/win32/libevolution-addressbook.def
+++ b/win32/libevolution-addressbook.def
@@ -1,14 +1,155 @@
 EXPORTS
+	Bonobo_Plugin_info DATA
+	_eab_contact_merging_create_contact_display
+	addressbook_component_get_type
+	addressbook_component_peek
+	addressbook_component_peek_base_directory
+	addressbook_component_peek_gconf_client
+	addressbook_config_create_new_source
+	addressbook_config_edit_source
 	addressbook_load
 	addressbook_load_cancel
 	addressbook_load_default_book
+	addressbook_migrate
+	addressbook_view_edit_contact
+	addressbook_view_get_type
+	addressbook_view_new
+	addressbook_view_peek_activity_handler
+	addressbook_view_peek_folder_view
+	addressbook_view_peek_info_label
+	addressbook_view_peek_sidebar
+	addressbook_view_peek_statusbar
+	autocompletion_config_control_new
+	e_addressbook_reflow_adapter_construct
+	e_addressbook_reflow_adapter_get_contact
+	e_addressbook_reflow_adapter_get_type
+	e_addressbook_reflow_adapter_new
+	e_contact_print
+	e_contact_print_style_editor_get_type
+	e_contact_print_style_editor_new
 	e_minicard_activate_editor
+	e_minicard_compare
+	e_minicard_get_card_id
 	e_minicard_get_type
+	e_minicard_label_get_type
+	e_minicard_label_new
+	e_minicard_selected
+	e_minicard_view_get_card_list
 	e_minicard_view_get_type
+	e_minicard_view_jump_to_letter
+	e_minicard_view_remove_selection
+	e_minicard_view_widget_get_selection_model
+	e_minicard_view_widget_get_type
+	e_minicard_view_widget_get_view
+	e_minicard_view_widget_new
+	eab_config_get_type
+	eab_config_hook_get_type
+	eab_config_new
+	eab_config_target_new_source
+	eab_contact_compare
+	eab_contact_compare_address
+	eab_contact_compare_email
+	eab_contact_compare_file_as
+	eab_contact_compare_name
+	eab_contact_compare_name_to_string
+	eab_contact_compare_name_to_string_full
+	eab_contact_compare_nickname
+	eab_contact_compare_telephone
+	eab_contact_display_get_type
+	eab_contact_display_new
+	eab_contact_display_render
+	eab_contact_list_save
+	eab_contact_locate_match
+	eab_contact_locate_match_full
+	eab_contact_save
+	eab_create_image_chooser_widget
+	eab_error_dialog
 	eab_load_error_dialog
+	eab_marshal_INT__POINTER
+	eab_marshal_VOID__INT_INT
+	eab_menu_get_type
+	eab_menu_hook_get_type
+	eab_menu_new
+	eab_menu_target_new_select
 	eab_merging_book_add_contact
 	eab_merging_book_commit_contact
+	eab_model_can_stop
+	eab_model_contact_at
+	eab_model_contact_count
+	eab_model_editable
+	eab_model_force_folder_bar_message
+	eab_model_get_contact
+	eab_model_get_ebook
+	eab_model_get_type
+	eab_model_new
+	eab_model_stop
+	eab_parse_qp_email
+	eab_parse_qp_email_to_html
+	eab_popup_control_construct
+	eab_popup_control_get_type
+	eab_popup_control_new
+	eab_popup_get_type
+	eab_popup_hook_get_type
+	eab_popup_new
+	eab_popup_target_new_select
+	eab_popup_target_new_select_names
+	eab_popup_target_new_source
+	eab_popup_target_new_uri
 	eab_prompt_save_dialog
+	eab_search_result_dialog
+	eab_select_source
+	eab_send_contact
+	eab_send_contact_list
 	eab_show_contact_editor
 	eab_show_contact_list_editor
+	eab_show_multiple_contacts
+	eab_table_adapter_construct
+	eab_table_adapter_get_type
+	eab_table_adapter_new
+	eab_transfer_contacts
+	eab_vcard_control_new
+	eab_view_can_copy
+	eab_view_can_copy_to_folder
+	eab_view_can_create
+	eab_view_can_cut
+	eab_view_can_delete
+	eab_view_can_move_to_folder
+	eab_view_can_paste
+	eab_view_can_print
+	eab_view_can_save_as
+	eab_view_can_select_all
+	eab_view_can_send
+	eab_view_can_send_to
+	eab_view_can_stop
+	eab_view_can_view
+	eab_view_copy
+	eab_view_copy_to_folder
+	eab_view_cut
+	eab_view_delete_selection
+	eab_view_discard_menus
+	eab_view_get_menu_target
 	eab_view_get_type
+	eab_view_move_to_folder
+	eab_view_new
+	eab_view_paste
+	eab_view_peek_search_context
+	eab_view_peek_search_rule
+	eab_view_print
+	eab_view_save_as
+	eab_view_select_all
+	eab_view_send
+	eab_view_send_to
+	eab_view_setup_menus
+	eab_view_show_all
+	eab_view_show_contact_preview
+	eab_view_stop
+	eab_view_view
+	gal_view_factory_minicard_construct
+	gal_view_factory_minicard_get_type
+	gal_view_factory_minicard_new
+	gal_view_minicard_attach
+	gal_view_minicard_construct
+	gal_view_minicard_detach
+	gal_view_minicard_get_type
+	gal_view_minicard_new
+	supported_bases_create_table
diff --git a/win32/libevolution-calendar.def b/win32/libevolution-calendar.def
index ac9e2fb41d..b4cfde7282 100644
--- a/win32/libevolution-calendar.def
+++ b/win32/libevolution-calendar.def
@@ -1,30 +1,1122 @@
 EXPORTS
+	Bonobo_Plugin_info DATA
+	EMeetingTimeSelectorHours DATA
+	EMeetingTimeSelectorHours12 DATA
+	GNOME_Evolution_Calendar_AlarmNotify__classid DATA
+	GNOME_Evolution_Calendar_AlarmNotify__iinterface DATA
+	GNOME_Evolution_Calendar_CalFactory__classid DATA
+	GNOME_Evolution_Calendar_CalFactory__iinterface DATA
+	GNOME_Evolution_Calendar_CalFactory__imethods DATA
+	GNOME_Evolution_Calendar_CalFactory_getCal
+	GNOME_Evolution_Calendar_CalListener__classid DATA
+	GNOME_Evolution_Calendar_CalListener__iinterface DATA
+	GNOME_Evolution_Calendar_CalListener__imethods DATA
+	GNOME_Evolution_Calendar_CalListener_notifyAlarmDiscarded
+	GNOME_Evolution_Calendar_CalListener_notifyAlarmEmailAddress
+	GNOME_Evolution_Calendar_CalListener_notifyAttachmentListRequested
+	GNOME_Evolution_Calendar_CalListener_notifyAuthRequired
+	GNOME_Evolution_Calendar_CalListener_notifyCalAddress
+	GNOME_Evolution_Calendar_CalListener_notifyCalOpened
+	GNOME_Evolution_Calendar_CalListener_notifyCalRemoved
+	GNOME_Evolution_Calendar_CalListener_notifyCalSetMode
+	GNOME_Evolution_Calendar_CalListener_notifyChanges
+	GNOME_Evolution_Calendar_CalListener_notifyDefaultObjectRequested
+	GNOME_Evolution_Calendar_CalListener_notifyDefaultTimezoneSet
+	GNOME_Evolution_Calendar_CalListener_notifyErrorOccurred
+	GNOME_Evolution_Calendar_CalListener_notifyFreeBusy
+	GNOME_Evolution_Calendar_CalListener_notifyLDAPAttribute
+	GNOME_Evolution_Calendar_CalListener_notifyObjectCreated
+	GNOME_Evolution_Calendar_CalListener_notifyObjectListRequested
+	GNOME_Evolution_Calendar_CalListener_notifyObjectModified
+	GNOME_Evolution_Calendar_CalListener_notifyObjectRemoved
+	GNOME_Evolution_Calendar_CalListener_notifyObjectRequested
+	GNOME_Evolution_Calendar_CalListener_notifyObjectsReceived
+	GNOME_Evolution_Calendar_CalListener_notifyObjectsSent
+	GNOME_Evolution_Calendar_CalListener_notifyQuery
+	GNOME_Evolution_Calendar_CalListener_notifyReadOnly
+	GNOME_Evolution_Calendar_CalListener_notifyStaticCapabilities
+	GNOME_Evolution_Calendar_CalListener_notifyTimezoneAdded
+	GNOME_Evolution_Calendar_CalListener_notifyTimezoneRequested
+	GNOME_Evolution_Calendar_CalViewListener__classid DATA
+	GNOME_Evolution_Calendar_CalViewListener__iinterface DATA
+	GNOME_Evolution_Calendar_CalViewListener__imethods DATA
+	GNOME_Evolution_Calendar_CalViewListener_notifyObjectsAdded
+	GNOME_Evolution_Calendar_CalViewListener_notifyObjectsModified
+	GNOME_Evolution_Calendar_CalViewListener_notifyObjectsRemoved
+	GNOME_Evolution_Calendar_CalViewListener_notifyQueryDone
+	GNOME_Evolution_Calendar_CalViewListener_notifyQueryProgress
+	GNOME_Evolution_Calendar_CalView__classid DATA
+	GNOME_Evolution_Calendar_CalView__iinterface DATA
+	GNOME_Evolution_Calendar_CalView__imethods DATA
+	GNOME_Evolution_Calendar_CalView_start
+	GNOME_Evolution_Calendar_Cal__classid DATA
+	GNOME_Evolution_Calendar_Cal__get_uri
+	GNOME_Evolution_Calendar_Cal__iinterface DATA
+	GNOME_Evolution_Calendar_Cal__imethods DATA
+	GNOME_Evolution_Calendar_Cal_addTimezone
+	GNOME_Evolution_Calendar_Cal_createObject
+	GNOME_Evolution_Calendar_Cal_discardAlarm
+	GNOME_Evolution_Calendar_Cal_getAlarmEmailAddress
+	GNOME_Evolution_Calendar_Cal_getAttachmentList
+	GNOME_Evolution_Calendar_Cal_getCalAddress
+	GNOME_Evolution_Calendar_Cal_getChanges
+	GNOME_Evolution_Calendar_Cal_getDefaultObject
+	GNOME_Evolution_Calendar_Cal_getFreeBusy
+	GNOME_Evolution_Calendar_Cal_getLdapAttribute
+	GNOME_Evolution_Calendar_Cal_getObject
+	GNOME_Evolution_Calendar_Cal_getObjectList
+	GNOME_Evolution_Calendar_Cal_getQuery
+	GNOME_Evolution_Calendar_Cal_getStaticCapabilities
+	GNOME_Evolution_Calendar_Cal_getTimezone
+	GNOME_Evolution_Calendar_Cal_isReadOnly
+	GNOME_Evolution_Calendar_Cal_modifyObject
+	GNOME_Evolution_Calendar_Cal_open
+	GNOME_Evolution_Calendar_Cal_receiveObjects
+	GNOME_Evolution_Calendar_Cal_remove
+	GNOME_Evolution_Calendar_Cal_removeObject
+	GNOME_Evolution_Calendar_Cal_sendObjects
+	GNOME_Evolution_Calendar_Cal_setDefaultTimezone
+	GNOME_Evolution_Calendar_Cal_setMode
+	GNOME_Evolution_Calendar_CompEditorFactory__classid DATA
+	GNOME_Evolution_Calendar_CompEditorFactory__iinterface DATA
+	GNOME_Evolution_Calendar_CompEditorFactory__imethods DATA
+	GNOME_Evolution_Calendar_CompEditorFactory_editExisting
+	GNOME_Evolution_Calendar_CompEditorFactory_editNew
+	POA_GNOME_Evolution_Calendar_AlarmNotify__fini
+	POA_GNOME_Evolution_Calendar_AlarmNotify__init
+	POA_GNOME_Evolution_Calendar_CalFactory__fini
+	POA_GNOME_Evolution_Calendar_CalFactory__init
+	POA_GNOME_Evolution_Calendar_CalListener__fini
+	POA_GNOME_Evolution_Calendar_CalListener__init
+	POA_GNOME_Evolution_Calendar_CalViewListener__fini
+	POA_GNOME_Evolution_Calendar_CalViewListener__init
+	POA_GNOME_Evolution_Calendar_CalView__fini
+	POA_GNOME_Evolution_Calendar_CalView__init
+	POA_GNOME_Evolution_Calendar_Cal__fini
+	POA_GNOME_Evolution_Calendar_Cal__init
+	POA_GNOME_Evolution_Calendar_CompEditorFactory__fini
+	POA_GNOME_Evolution_Calendar_CompEditorFactory__init
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObjChange_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObjID_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObjInstance_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObj_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_User_struct DATA
+	TC_GNOME_Evolution_Calendar_AlarmNotify_struct DATA
+	TC_GNOME_Evolution_Calendar_CalAlarmUID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalFactory_InvalidURI_struct DATA
+	TC_GNOME_Evolution_Calendar_CalFactory_NilListener_struct DATA
+	TC_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod_struct DATA
+	TC_GNOME_Evolution_Calendar_CalFactory_struct DATA
+	TC_GNOME_Evolution_Calendar_CalListener_SetModeStatus_struct DATA
+	TC_GNOME_Evolution_Calendar_CalListener_struct DATA
+	TC_GNOME_Evolution_Calendar_CalMode_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjChangeSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjChangeType_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjChange_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjIDSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjInstanceSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjInstance_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjModType_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjType_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjUIDSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjUID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObj_struct DATA
+	TC_GNOME_Evolution_Calendar_CalRecurID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalTimezoneObjUID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalTimezoneObj_struct DATA
+	TC_GNOME_Evolution_Calendar_CalViewListener_struct DATA
+	TC_GNOME_Evolution_Calendar_CalView_struct DATA
+	TC_GNOME_Evolution_Calendar_Cal_InvalidRange_struct DATA
+	TC_GNOME_Evolution_Calendar_Cal_NotFound_struct DATA
+	TC_GNOME_Evolution_Calendar_Cal_struct DATA
+	TC_GNOME_Evolution_Calendar_CallStatus_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_BackendContactError_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_InvalidURI_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_UnsupportedType_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_struct DATA
+	TC_GNOME_Evolution_Calendar_StringSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_Time_t_struct DATA
+	TC_GNOME_Evolution_Calendar_UserList_struct DATA
+	TC_GNOME_Evolution_Calendar_User_struct DATA
+	TC_GNOME_Evolution_Calendar_stringlist_struct DATA
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalFactory_getCal
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyAlarmDiscarded
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyAlarmEmailAddress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyAttachmentListRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyAuthRequired
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyCalAddress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyCalOpened
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyCalRemoved
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyCalSetMode
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyChanges
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyDefaultObjectRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyDefaultTimezoneSet
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyErrorOccurred
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyFreeBusy
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyLDAPAttribute
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectCreated
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectListRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectModified
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectRemoved
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectsReceived
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectsSent
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyQuery
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyReadOnly
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyStaticCapabilities
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyTimezoneAdded
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyTimezoneRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyObjectsAdded
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyObjectsModified
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyObjectsRemoved
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyQueryDone
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyQueryProgress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalView_start
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal__get_uri
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_addTimezone
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_createObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_discardAlarm
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getAlarmEmailAddress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getAttachmentList
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getCalAddress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getChanges
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getDefaultObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getFreeBusy
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getLdapAttribute
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getObjectList
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getQuery
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getStaticCapabilities
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getTimezone
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_isReadOnly
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_modifyObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_open
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_receiveObjects
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_remove
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_removeObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_sendObjects
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_setDefaultTimezone
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_setMode
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CompEditorFactory_editExisting
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CompEditorFactory_editNew
+	alarm_dialog_run
+	alarm_list_dialog_peek
+	alarm_list_dialog_run
+	alarm_list_dialog_set_client
+	auth_cal_forget_password
+	auth_new_cal_from_default
+	auth_new_cal_from_source
+	auth_new_cal_from_uri
+	cal_comp_event_new_with_current_time
+	cal_comp_event_new_with_defaults
+	cal_comp_is_on_server
+	cal_comp_memo_new_with_defaults
+	cal_comp_process_source_list_drop
+	cal_comp_selection_get_string_list
+	cal_comp_selection_set_string_list
+	cal_comp_set_dtend_with_oldzone
+	cal_comp_set_dtstart_with_oldzone
+	cal_comp_task_new_with_defaults
+	cal_comp_util_add_exdate
+	cal_comp_util_compare_event_timezones
+	cal_comp_util_get_n_icons
+	cal_prefs_dialog_create_time_edit
+	cal_search_bar_construct
+	cal_search_bar_get_category
+	cal_search_bar_get_time_range
+	cal_search_bar_get_type
+	cal_search_bar_new
+	cal_search_bar_set_categories
+	calculate_time
+	calendar_command_print
+	calendar_component_get_type
+	calendar_component_peek
+	calendar_component_peek_activity_handler
+	calendar_component_peek_base_directory
+	calendar_component_peek_config_directory
+	calendar_component_peek_source_list
+	calendar_component_show_logger
+	calendar_config_add_notification_24_hour_format
+	calendar_config_add_notification_calendars_selected
+	calendar_config_add_notification_compress_weekend
+	calendar_config_add_notification_day_end_hour
+	calendar_config_add_notification_day_end_minute
+	calendar_config_add_notification_day_second_zone
+	calendar_config_add_notification_day_start_hour
+	calendar_config_add_notification_day_start_minute
+	calendar_config_add_notification_daylight_saving
+	calendar_config_add_notification_dnav_show_week_no
+	calendar_config_add_notification_dview_show_week_no
+	calendar_config_add_notification_free_busy_template
+	calendar_config_add_notification_hide_completed_tasks
+	calendar_config_add_notification_hide_completed_tasks_units
+	calendar_config_add_notification_hide_completed_tasks_value
+	calendar_config_add_notification_marcus_bains
+	calendar_config_add_notification_memos_selected
+	calendar_config_add_notification_preview_state
+	calendar_config_add_notification_primary_calendar
+	calendar_config_add_notification_primary_memos
+	calendar_config_add_notification_primary_tasks
+	calendar_config_add_notification_show_event_end
+	calendar_config_add_notification_tasks_selected
+	calendar_config_add_notification_time_divisions
+	calendar_config_add_notification_timezone
+	calendar_config_add_notification_week_start_day
+	calendar_config_add_notification_working_days
+	calendar_config_free_day_second_zones
+	calendar_config_get_24_hour_format
+	calendar_config_get_ba_reminder
+	calendar_config_get_calendars_selected
+	calendar_config_get_compress_weekend
+	calendar_config_get_confirm_delete
+	calendar_config_get_confirm_purge
+	calendar_config_get_day_end_hour
+	calendar_config_get_day_end_minute
+	calendar_config_get_day_second_zone
+	calendar_config_get_day_second_zones
+	calendar_config_get_day_start_hour
+	calendar_config_get_day_start_minute
+	calendar_config_get_daylight_saving
+	calendar_config_get_default_reminder_interval
+	calendar_config_get_default_reminder_units
+	calendar_config_get_dir_path
+	calendar_config_get_dnav_show_week_no
+	calendar_config_get_dview_show_week_no
+	calendar_config_get_free_busy_template
+	calendar_config_get_hide_completed_tasks
+	calendar_config_get_hide_completed_tasks_sexp
+	calendar_config_get_hide_completed_tasks_units
+	calendar_config_get_hide_completed_tasks_value
+	calendar_config_get_hpane_pos
+	calendar_config_get_icaltimezone
+	calendar_config_get_marcus_bains
+	calendar_config_get_memos_selected
+	calendar_config_get_month_hpane_pos
+	calendar_config_get_month_vpane_pos
+	calendar_config_get_preview_state
+	calendar_config_get_primary_calendar
+	calendar_config_get_primary_memos
+	calendar_config_get_primary_tasks
+	calendar_config_get_show_categories
+	calendar_config_get_show_event_end
+	calendar_config_get_show_role
+	calendar_config_get_show_rsvp
+	calendar_config_get_show_status
+	calendar_config_get_show_timezone
+	calendar_config_get_show_type
+	calendar_config_get_tag_vpane_pos
+	calendar_config_get_task_vpane_pos
+	calendar_config_get_tasks_due_today_color
+	calendar_config_get_tasks_overdue_color
+	calendar_config_get_tasks_selected
+	calendar_config_get_time_divisions
+	calendar_config_get_timezone
+	calendar_config_get_use_default_reminder
+	calendar_config_get_vpane_pos
+	calendar_config_get_week_start_day
+	calendar_config_get_working_days
+	calendar_config_locale_supports_12_hour_format
+	calendar_config_remove_notification
+	calendar_config_select_day_second_zone
+	calendar_config_set_24_hour_format
+	calendar_config_set_ba_reminder
+	calendar_config_set_calendars_selected
+	calendar_config_set_compress_weekend
+	calendar_config_set_confirm_delete
+	calendar_config_set_confirm_purge
+	calendar_config_set_day_end_hour
+	calendar_config_set_day_end_minute
+	calendar_config_set_day_second_zone
+	calendar_config_set_day_start_hour
+	calendar_config_set_day_start_minute
+	calendar_config_set_daylight_saving
+	calendar_config_set_default_reminder_interval
+	calendar_config_set_default_reminder_units
+	calendar_config_set_dir_path
+	calendar_config_set_dnav_show_week_no
+	calendar_config_set_dview_show_week_no
+	calendar_config_set_free_busy_template
+	calendar_config_set_hide_completed_tasks
+	calendar_config_set_hide_completed_tasks_units
+	calendar_config_set_hide_completed_tasks_value
+	calendar_config_set_hpane_pos
+	calendar_config_set_memos_selected
+	calendar_config_set_month_hpane_pos
+	calendar_config_set_month_vpane_pos
+	calendar_config_set_preview_state
+	calendar_config_set_primary_calendar
+	calendar_config_set_primary_memos
+	calendar_config_set_primary_tasks
+	calendar_config_set_show_categories
+	calendar_config_set_show_event_end
+	calendar_config_set_show_role
+	calendar_config_set_show_rsvp
+	calendar_config_set_show_status
+	calendar_config_set_show_timezone
+	calendar_config_set_show_type
+	calendar_config_set_tag_vpane_pos
+	calendar_config_set_task_vpane_pos
+	calendar_config_set_tasks_due_today_color
+	calendar_config_set_tasks_overdue_color
+	calendar_config_set_tasks_selected
+	calendar_config_set_time_divisions
+	calendar_config_set_timezone
+	calendar_config_set_use_default_reminder
+	calendar_config_set_vpane_pos
+	calendar_config_set_week_start_day
+	calendar_config_set_working_days
+	calendar_control_activate
+	calendar_control_deactivate
+	calendar_control_sensitize_calendar_commands
+	calendar_goto_today
+	calendar_prefs_dialog_get_type
+	calendar_prefs_dialog_new
+	calendar_setup_edit_calendar
+	calendar_setup_edit_memo_list
+	calendar_setup_edit_task_list
+	calendar_setup_new_calendar
+	calendar_setup_new_memo_list
+	calendar_setup_new_task_list
+	calendar_view_construct
+	calendar_view_factory_construct
+	calendar_view_factory_get_type
+	calendar_view_factory_new
+	calendar_view_get_type
+	calendar_view_get_view_type
+	calendar_view_new
+	cancel_component_dialog
+	changed_component_dialog
+	comp_editor_append_page
+	comp_editor_close
+	comp_editor_date_label
+	comp_editor_dates
+	comp_editor_delete_comp
+	comp_editor_edit_comp
+	comp_editor_factory_get_type
+	comp_editor_factory_new
+	comp_editor_free_dates
+	comp_editor_get_action
+	comp_editor_get_action_group
+	comp_editor_get_changed
+	comp_editor_get_classification
+	comp_editor_get_client
+	comp_editor_get_comp
+	comp_editor_get_current_comp
+	comp_editor_get_current_time
+	comp_editor_get_existing_org
+	comp_editor_get_flags
+	comp_editor_get_group_item
+	comp_editor_get_managed_widget
+	comp_editor_get_mime_attach_list
+	comp_editor_get_needs_send
+	comp_editor_get_summary
+	comp_editor_get_type
+	comp_editor_get_ui_manager
+	comp_editor_get_user_org
+	comp_editor_new_date_edit
+	comp_editor_page_changed
+	comp_editor_page_display_validation_error
+	comp_editor_page_fill_component
+	comp_editor_page_fill_timezones
+	comp_editor_page_fill_widgets
+	comp_editor_page_focus_main_widget
+	comp_editor_page_get_editor
+	comp_editor_page_get_type
+	comp_editor_page_get_updating
+	comp_editor_page_get_widget
+	comp_editor_page_notify_dates_changed
+	comp_editor_page_set_dates
+	comp_editor_page_set_updating
+	comp_editor_registry DATA
+	comp_editor_remove_page
+	comp_editor_save_comp
+	comp_editor_select_file
+	comp_editor_select_file_attachments
+	comp_editor_send_comp
+	comp_editor_set_changed
+	comp_editor_set_classification
+	comp_editor_set_client
+	comp_editor_set_existing_org
+	comp_editor_set_flags
+	comp_editor_set_group_item
+	comp_editor_set_needs_send
+	comp_editor_set_summary
+	comp_editor_set_user_org
+	comp_editor_show_page
+	comp_editor_strip_categories
+	comp_util_sanitize_recurrence_master
+	control_factory_new_control
+	copy_source_dialog
+	delete_component_dialog
+	delete_error_dialog
+	draw_curved_rectangle
+	e_alarm_list_append
+	e_alarm_list_clear
+	e_alarm_list_get_alarm
+	e_alarm_list_get_type
+	e_alarm_list_new
+	e_alarm_list_remove
+	e_alarm_list_set_alarm
+	e_cal_comp_preview_url_requested_cb
+	e_cal_component_memo_preview_clear
+	e_cal_component_memo_preview_display
+	e_cal_component_memo_preview_get_default_timezone
+	e_cal_component_memo_preview_get_html
+	e_cal_component_memo_preview_get_type
+	e_cal_component_memo_preview_new
+	e_cal_component_memo_preview_set_default_timezone
+	e_cal_component_preview_clear
+	e_cal_component_preview_display
+	e_cal_component_preview_get_default_timezone
+	e_cal_component_preview_get_html
+	e_cal_component_preview_get_type
+	e_cal_component_preview_new
+	e_cal_component_preview_set_default_timezone
+	e_cal_config_get_type
+	e_cal_config_hook_get_type
+	e_cal_config_new
+	e_cal_config_target_new_prefs
+	e_cal_config_target_new_source
+	e_cal_event_get_type
+	e_cal_event_hook_get_type
+	e_cal_event_peek
+	e_cal_event_target_new_component
+	e_cal_list_view_config_get_type
+	e_cal_list_view_config_get_view
+	e_cal_list_view_config_new
+	e_cal_list_view_config_set_view
+	e_cal_list_view_construct
+	e_cal_list_view_get_range_shown
+	e_cal_list_view_get_type
+	e_cal_list_view_load_state
+	e_cal_list_view_new
+	e_cal_list_view_save_state
+	e_cal_menu_get_type
+	e_cal_menu_hook_get_type
+	e_cal_menu_new
+	e_cal_menu_target_new_select
+	e_cal_model_add_client
+	e_cal_model_calendar_get_type
+	e_cal_model_calendar_new
+	e_cal_model_component_get_type
+	e_cal_model_copy_component_data
+	e_cal_model_create_component_with_defaults
+	e_cal_model_date_value_to_string
+	e_cal_model_free_component_data
+	e_cal_model_generate_instances
+	e_cal_model_get_client_for_uri
+	e_cal_model_get_client_list
+	e_cal_model_get_color_for_component
+	e_cal_model_get_component_at
+	e_cal_model_get_component_for_uid
+	e_cal_model_get_component_kind
+	e_cal_model_get_default_client
+	e_cal_model_get_flags
+	e_cal_model_get_object_array
+	e_cal_model_get_rgb_color_for_component
+	e_cal_model_get_search_query
+	e_cal_model_get_time_range
+	e_cal_model_get_timezone
+	e_cal_model_get_type
+	e_cal_model_get_use_24_hour_format
+	e_cal_model_memos_get_type
+	e_cal_model_memos_new
+	e_cal_model_remove_all_clients
+	e_cal_model_remove_client
+	e_cal_model_set_component_kind
+	e_cal_model_set_default_category
+	e_cal_model_set_default_client
+	e_cal_model_set_default_time_func
+	e_cal_model_set_flags
+	e_cal_model_set_instance_times
+	e_cal_model_set_search_query
+	e_cal_model_set_search_query_with_time_range
+	e_cal_model_set_time_range
+	e_cal_model_set_timezone
+	e_cal_model_set_use_24_hour_format
+	e_cal_model_tasks_get_type
+	e_cal_model_tasks_mark_comp_complete
+	e_cal_model_tasks_mark_comp_incomplete
+	e_cal_model_tasks_new
+	e_cal_model_tasks_update_due_tasks
+	e_cal_model_test_row_editable
+	e_cal_popup_get_type
+	e_cal_popup_hook_get_type
+	e_cal_popup_new
+	e_cal_popup_target_new_attachments
+	e_cal_popup_target_new_select
+	e_cal_popup_target_new_source
+	e_calendar_marshal_VOID__ENUM_ENUM
+	e_calendar_marshal_VOID__ENUM_STRING
+	e_calendar_marshal_VOID__INT_BOOLEAN
+	e_calendar_marshal_VOID__INT_INT
+	e_calendar_marshal_VOID__INT_OBJECT
+	e_calendar_marshal_VOID__INT_POINTER
+	e_calendar_marshal_VOID__INT_STRING
+	e_calendar_marshal_VOID__LONG_LONG
+	e_calendar_marshal_VOID__POINTER_ENUM
+	e_calendar_marshal_VOID__POINTER_POINTER
+	e_calendar_marshal_VOID__POINTER_STRING
+	e_calendar_marshal_VOID__STRING_BOOLEAN_INT_INT
+	e_calendar_marshal_VOID__STRING_INT
+	e_calendar_marshal_VOID__STRING_INT_INT
+	e_calendar_marshal_VOID__STRING_POINTER_POINTER
+	e_calendar_marshal_VOID__STRING_STRING
+	e_calendar_marshal_VOID__STRING_STRING_STRING
+	e_calendar_table_complete_selected
+	e_calendar_table_config_get_table
+	e_calendar_table_config_get_type
+	e_calendar_table_config_new
+	e_calendar_table_config_set_table
+	e_calendar_table_copy_clipboard
+	e_calendar_table_cut_clipboard
+	e_calendar_table_delete_selected
+	e_calendar_table_get_model
+	e_calendar_table_get_selected
+	e_calendar_table_get_selected_comp
+	e_calendar_table_get_table
+	e_calendar_table_get_type
+	e_calendar_table_load_state
+	e_calendar_table_new
+	e_calendar_table_open_selected
+	e_calendar_table_open_task
+	e_calendar_table_paste_clipboard
+	e_calendar_table_process_completed_tasks
+	e_calendar_table_save_state
+	e_calendar_table_set_activity_handler
+	e_calendar_table_set_status_message
+	e_calendar_utils_show_error_silent
+	e_calendar_utils_show_info_silent
+	e_calendar_view_add_event
+	e_calendar_view_copy_clipboard
+	e_calendar_view_create_popup_menu
+	e_calendar_view_cut_clipboard
+	e_calendar_view_delete_selected_event
+	e_calendar_view_delete_selected_events
+	e_calendar_view_delete_selected_occurrence
+	e_calendar_view_edit_appointment
+	e_calendar_view_get_attendees_status_info
 	e_calendar_view_get_calendar
+	e_calendar_view_get_default_category
+	e_calendar_view_get_icalcomponent_summary
+	e_calendar_view_get_model
+	e_calendar_view_get_selected_events
 	e_calendar_view_get_selected_time_range
+	e_calendar_view_get_timezone
+	e_calendar_view_get_tooltips
 	e_calendar_view_get_type
+	e_calendar_view_get_use_24_hour_format
+	e_calendar_view_get_visible_time_range
+	e_calendar_view_modify_and_send
+	e_calendar_view_move_tip
 	e_calendar_view_new_appointment
 	e_calendar_view_new_appointment_for
+	e_calendar_view_new_appointment_full
+	e_calendar_view_open_event
+	e_calendar_view_paste_clipboard
+	e_calendar_view_set_activity_handler
+	e_calendar_view_set_calendar
+	e_calendar_view_set_default_category
+	e_calendar_view_set_model
+	e_calendar_view_set_selected_time_range
+	e_calendar_view_set_status_message
+	e_calendar_view_set_timezone
+	e_calendar_view_set_use_24_hour_format
+	e_calendar_view_update_query
+	e_cell_date_edit_config_get_cell
+	e_cell_date_edit_config_get_type
+	e_cell_date_edit_config_new
+	e_cell_date_edit_config_set_cell
+	e_cell_date_edit_text_get_type
+	e_cell_date_edit_text_new
+	e_cell_date_edit_text_set_timezone
+	e_cell_date_edit_text_set_use_24_hour_format
+	e_comp_editor_registry_add
+	e_comp_editor_registry_close_all
+	e_comp_editor_registry_find
+	e_comp_editor_registry_get_type
+	e_comp_editor_registry_new
+	e_date_edit_config_get_edit
+	e_date_edit_config_get_type
+	e_date_edit_config_new
+	e_date_edit_config_set_edit
+	e_date_time_list_append
+	e_date_time_list_clear
+	e_date_time_list_get_date_time
+	e_date_time_list_get_type
+	e_date_time_list_new
+	e_date_time_list_remove
+	e_date_time_list_set_date_time
+	e_day_view_check_auto_scroll
+	e_day_view_check_layout
+	e_day_view_config_get_type
+	e_day_view_config_get_view
+	e_day_view_config_new
+	e_day_view_config_set_view
 	e_day_view_convert_time_to_display
+	e_day_view_convert_time_to_position
+	e_day_view_convert_time_to_row
 	e_day_view_ensure_rows_visible
+	e_day_view_event_sort_func
 	e_day_view_find_event_from_item
+	e_day_view_find_long_event_days
+	e_day_view_finish_selection
+	e_day_view_get_days_shown
 	e_day_view_get_event_position
+	e_day_view_get_event_rows
 	e_day_view_get_long_event_position
+	e_day_view_get_mins_per_row
+	e_day_view_get_num_events_selected
+	e_day_view_get_show_event_end_times
+	e_day_view_get_show_marcus_bains
+	e_day_view_get_show_week_number
+	e_day_view_get_time_string_width
 	e_day_view_get_type
+	e_day_view_get_week_start_day
+	e_day_view_get_work_week_view
+	e_day_view_get_working_day
+	e_day_view_get_working_days
+	e_day_view_layout_day_events
+	e_day_view_layout_long_events
 	e_day_view_main_item_get_type
+	e_day_view_new
+	e_day_view_set_days_shown
+	e_day_view_set_marcus_bains
+	e_day_view_set_mins_per_row
+	e_day_view_set_show_event_end_times
+	e_day_view_set_show_week_number
+	e_day_view_set_week_start_day
+	e_day_view_set_work_week_view
+	e_day_view_set_working_day
+	e_day_view_set_working_days
+	e_day_view_start_selection
+	e_day_view_stop_auto_scroll
+	e_day_view_time_item_get_column_width
+	e_day_view_time_item_get_type
 	e_day_view_top_item_get_day_label
+	e_day_view_top_item_get_type
 	e_day_view_update_calendar_selection_time
+	e_day_view_update_marcus_bains
+	e_day_view_update_selection
+	e_delegate_dialog_construct
+	e_delegate_dialog_get_delegate
+	e_delegate_dialog_get_delegate_name
+	e_delegate_dialog_get_toplevel
+	e_delegate_dialog_get_type
+	e_delegate_dialog_new
+	e_itip_control_get_calendar_uid
+	e_itip_control_get_data
+	e_itip_control_get_data_size
+	e_itip_control_get_delegator_address
+	e_itip_control_get_delegator_name
+	e_itip_control_get_from_address
+	e_itip_control_get_type
+	e_itip_control_get_view_only
+	e_itip_control_new
+	e_itip_control_set_calendar_uid
+	e_itip_control_set_data
+	e_itip_control_set_delegator_address
+	e_itip_control_set_delegator_name
+	e_itip_control_set_from_address
+	e_itip_control_set_view_only
+	e_meeting_attendee_add_busy_period
+	e_meeting_attendee_as_e_cal_component_attendee
+	e_meeting_attendee_clear_busy_periods
+	e_meeting_attendee_find_first_busy_period
+	e_meeting_attendee_get_address
+	e_meeting_attendee_get_atype
+	e_meeting_attendee_get_busy_periods
+	e_meeting_attendee_get_cn
+	e_meeting_attendee_get_cutype
+	e_meeting_attendee_get_delfrom
+	e_meeting_attendee_get_delto
+	e_meeting_attendee_get_edit_level
+	e_meeting_attendee_get_end_busy_range
+	e_meeting_attendee_get_fburi
+	e_meeting_attendee_get_has_calendar_info
+	e_meeting_attendee_get_language
+	e_meeting_attendee_get_member
+	e_meeting_attendee_get_role
+	e_meeting_attendee_get_rsvp
+	e_meeting_attendee_get_sentby
+	e_meeting_attendee_get_start_busy_range
+	e_meeting_attendee_get_status
+	e_meeting_attendee_get_type
+	e_meeting_attendee_is_set_address
+	e_meeting_attendee_is_set_cn
+	e_meeting_attendee_is_set_delfrom
+	e_meeting_attendee_is_set_delto
+	e_meeting_attendee_is_set_language
+	e_meeting_attendee_is_set_member
+	e_meeting_attendee_is_set_sentby
+	e_meeting_attendee_new
+	e_meeting_attendee_new_from_e_cal_component_attendee
+	e_meeting_attendee_set_address
+	e_meeting_attendee_set_cn
+	e_meeting_attendee_set_cutype
+	e_meeting_attendee_set_delfrom
+	e_meeting_attendee_set_delto
+	e_meeting_attendee_set_edit_level
+	e_meeting_attendee_set_end_busy_range
+	e_meeting_attendee_set_fburi
+	e_meeting_attendee_set_has_calendar_info
+	e_meeting_attendee_set_language
+	e_meeting_attendee_set_member
+	e_meeting_attendee_set_role
+	e_meeting_attendee_set_rsvp
+	e_meeting_attendee_set_sentby
+	e_meeting_attendee_set_start_busy_range
+	e_meeting_attendee_set_status
+	e_meeting_list_view_add_attendee_to_name_selector
+	e_meeting_list_view_column_set_visible
+	e_meeting_list_view_edit
+	e_meeting_list_view_get_name_selector
+	e_meeting_list_view_get_type
+	e_meeting_list_view_invite_others_dialog
+	e_meeting_list_view_new
+	e_meeting_list_view_remove_all_attendees_from_name_selector
+	e_meeting_list_view_remove_attendee_from_name_selector
+	e_meeting_list_view_set_editable
+	e_meeting_list_view_set_name_selector
+	e_meeting_store_add_attendee
+	e_meeting_store_add_attendee_with_defaults
+	e_meeting_store_count_actual_attendees
+	e_meeting_store_find_attendee
+	e_meeting_store_find_attendee_at_row
+	e_meeting_store_find_attendee_path
+	e_meeting_store_get_attendees
+	e_meeting_store_get_e_cal
+	e_meeting_store_get_fb_uri
+	e_meeting_store_get_num_queries
+	e_meeting_store_get_type
+	e_meeting_store_get_zone
+	e_meeting_store_new
+	e_meeting_store_refresh_all_busy_periods
+	e_meeting_store_refresh_busy_periods
+	e_meeting_store_remove_all_attendees
+	e_meeting_store_remove_attendee
+	e_meeting_store_set_e_cal
+	e_meeting_store_set_fb_uri
+	e_meeting_store_set_value
+	e_meeting_store_set_zone
+	e_meeting_time_compare_times
+	e_meeting_time_selector_calculate_day_and_position
+	e_meeting_time_selector_calculate_time
+	e_meeting_time_selector_calculate_time_position
+	e_meeting_time_selector_construct
+	e_meeting_time_selector_convert_day_position_to_hours_and_mins
+	e_meeting_time_selector_drag_meeting_time
+	e_meeting_time_selector_fix_time_overflows
+	e_meeting_time_selector_get_autopick_option
+	e_meeting_time_selector_get_meeting_time
+	e_meeting_time_selector_get_meeting_time_positions
+	e_meeting_time_selector_get_type
+	e_meeting_time_selector_item_get_type
+	e_meeting_time_selector_item_set_normal_cursor
+	e_meeting_time_selector_new
+	e_meeting_time_selector_refresh_free_busy
+	e_meeting_time_selector_remove_timeout
+	e_meeting_time_selector_set_all_day
+	e_meeting_time_selector_set_autopick_option
+	e_meeting_time_selector_set_meeting_time
+	e_meeting_time_selector_set_read_only
+	e_meeting_time_selector_set_working_hours
+	e_meeting_time_selector_set_working_hours_only
+	e_meeting_time_selector_set_zoomed_out
+	e_memo_table_config_get_table
+	e_memo_table_config_get_type
+	e_memo_table_config_new
+	e_memo_table_config_set_table
+	e_memo_table_copy_clipboard
+	e_memo_table_cut_clipboard
+	e_memo_table_delete_selected
+	e_memo_table_get_model
+	e_memo_table_get_selected
+	e_memo_table_get_table
+	e_memo_table_get_type
+	e_memo_table_load_state
+	e_memo_table_new
+	e_memo_table_open_selected
+	e_memo_table_paste_clipboard
+	e_memo_table_save_state
+	e_memo_table_set_activity_handler
+	e_memo_table_set_status_message
+	e_memos_add_memo_source
+	e_memos_delete_selected
+	e_memos_discard_view_menus
+	e_memos_get_calendar_table
+	e_memos_get_default_client
+	e_memos_get_preview
+	e_memos_get_type
+	e_memos_new
+	e_memos_new_memo
+	e_memos_open_memo
+	e_memos_remove_memo_source
+	e_memos_set_default_source
+	e_memos_set_ui_component
+	e_memos_setup_view_menus
+	e_mini_calendar_config_get_calendar
+	e_mini_calendar_config_get_type
+	e_mini_calendar_config_new
+	e_mini_calendar_config_set_calendar
+	e_select_names_editable_get_email
+	e_select_names_editable_get_emails
+	e_select_names_editable_get_name
+	e_select_names_editable_get_names
+	e_select_names_editable_get_type
+	e_select_names_editable_new
+	e_select_names_editable_set_address
+	e_select_names_renderer_get_type
+	e_select_names_renderer_new
+	e_sendoptions_utils_fill_component
+	e_sendoptions_utils_set_default_data
+	e_tasks_add_todo_source
+	e_tasks_complete_selected
+	e_tasks_delete_completed
+	e_tasks_delete_selected
+	e_tasks_discard_view_menus
+	e_tasks_get_calendar_table
+	e_tasks_get_default_client
+	e_tasks_get_preview
+	e_tasks_get_tasks_menu
+	e_tasks_get_type
+	e_tasks_new
+	e_tasks_new_task
+	e_tasks_open_task
+	e_tasks_open_task_id
+	e_tasks_remove_todo_source
+	e_tasks_set_default_source
+	e_tasks_set_ui_component
+	e_tasks_setup_view_menus
+	e_tasks_show_preview
+	e_timezone_entry_get_timezone
+	e_timezone_entry_get_type
+	e_timezone_entry_new
+	e_timezone_entry_set_default_timezone
+	e_timezone_entry_set_timezone
+	e_week_view_config_get_type
+	e_week_view_config_get_view
+	e_week_view_config_new
+	e_week_view_config_set_view
+	e_week_view_convert_time_to_display
+	e_week_view_event_item_get_type
+	e_week_view_event_sort_func
 	e_week_view_find_event_from_item
+	e_week_view_get_compress_weekend
+	e_week_view_get_day_position
+	e_week_view_get_first_day_shown
+	e_week_view_get_multi_week_view
+	e_week_view_get_num_events_selected
+	e_week_view_get_show_event_end_times
 	e_week_view_get_span_position
+	e_week_view_get_time_string_width
 	e_week_view_get_type
+	e_week_view_get_update_base_date
+	e_week_view_get_week_start_day
+	e_week_view_get_weeks_shown
+	e_week_view_is_jump_button_visible
+	e_week_view_is_one_day_event
 	e_week_view_jump_to_button_item
+	e_week_view_layout_events
+	e_week_view_layout_get_day_position
+	e_week_view_layout_get_span_position
 	e_week_view_main_item_get_type
+	e_week_view_new
+	e_week_view_set_compress_weekend
+	e_week_view_set_first_day_shown
+	e_week_view_set_multi_week_view
+	e_week_view_set_selected_time_range_visible
+	e_week_view_set_show_event_end_times
+	e_week_view_set_update_base_date
+	e_week_view_set_week_start_day
+	e_week_view_set_weeks_shown
+	e_week_view_show_popup_menu
+	e_week_view_start_editing_event
+	e_week_view_stop_editing_event
+	e_week_view_titles_item_get_type
+	ec_query_tooltip
+	ev DATA
+	event_editor_get_type
+	event_editor_new
+	event_editor_show_meeting
+	event_page_add_attendee
+	event_page_construct
+	event_page_create_source_combo_box
+	event_page_get_cancel_comp
+	event_page_get_name_selector
+	event_page_get_type
+	event_page_hide_options
+	event_page_new
+	event_page_remove_all_attendees
+	event_page_sendoptions_clicked_cb
+	event_page_set_all_day_event
+	event_page_set_delegate
+	event_page_set_info_string
+	event_page_set_meeting
+	event_page_set_show_categories
+	event_page_set_show_time_busy
+	event_page_set_show_timezone
+	event_page_set_view_role
+	event_page_set_view_rsvp
+	event_page_set_view_status
+	event_page_set_view_type
+	event_page_show_alarm
+	event_page_show_options
+	get_position_in_array
+	get_uri_without_password
+	gnome_calendar_add_source
+	gnome_calendar_construct
+	gnome_calendar_copy_clipboard
+	gnome_calendar_cut_clipboard
+	gnome_calendar_dayjump
+	gnome_calendar_delete_selected_occurrence
+	gnome_calendar_delete_selection
+	gnome_calendar_discard_view_menus
+	gnome_calendar_edit_appointment
+	gnome_calendar_emit_user_created_signal
+	gnome_calendar_get_calendar_menu
+	gnome_calendar_get_calendar_model
+	gnome_calendar_get_current_time_range
 	gnome_calendar_get_current_view_widget
+	gnome_calendar_get_default_client
 	gnome_calendar_get_e_calendar_widget
+	gnome_calendar_get_memopad_menu
+	gnome_calendar_get_num_events_selected
+	gnome_calendar_get_num_tasks_selected
 	gnome_calendar_get_search_bar_widget
+	gnome_calendar_get_selected_time_range
+	gnome_calendar_get_tag
 	gnome_calendar_get_task_pad
+	gnome_calendar_get_taskpad_menu
 	gnome_calendar_get_timezone
 	gnome_calendar_get_type
 	gnome_calendar_get_view
 	gnome_calendar_get_view_notebook_widget
 	gnome_calendar_get_visible_time_range
+	gnome_calendar_goto
+	gnome_calendar_goto_today
+	gnome_calendar_new
+	gnome_calendar_new_task
+	gnome_calendar_next
+	gnome_calendar_paste_clipboard
+	gnome_calendar_previous
+	gnome_calendar_purge
+	gnome_calendar_remove_source
+	gnome_calendar_remove_source_by_uid
+	gnome_calendar_set_activity_handler
+	gnome_calendar_set_default_source
+	gnome_calendar_set_selected_time_range
+	gnome_calendar_set_ui_component
+	gnome_calendar_set_view
+	gnome_calendar_setup_view_menus
+	gnome_calendar_view_popup_factory
 	goto_dialog
+	is_icalcomp_on_the_server
+	is_icalcomp_valid
+	itip_addresses_get
+	itip_addresses_get_default
+	itip_bonobo_control_new
+	itip_get_comp_attendee
+	itip_organizer_is_user
+	itip_organizer_is_user_ex
+	itip_publish_begin
+	itip_publish_comp
+	itip_send_comp
+	itip_sentby_is_user
+	itip_strip_mailto
+	ldata DATA
+	make_date_edit
+	make_exdate_date_edit
+	make_status_icons
+	make_timezone_entry
+	memo_editor_get_type
+	memo_editor_new
+	memo_page_construct
+	memo_page_create_date_edit
+	memo_page_create_source_combo_box
+	memo_page_get_type
+	memo_page_new
+	memo_page_set_info_string
+	memo_page_set_show_categories
+	memos_component_get_type
+	memos_component_peek
+	memos_component_peek_base_directory
+	memos_component_peek_config_directory
+	memos_component_peek_source_list
+	memos_control_activate
+	memos_control_deactivate
+	memos_control_new
+	memos_control_sensitize_commands
+	migrate_calendars
+	migrate_memos
+	migrate_tasks
+	orb DATA
+	print_calendar
+	print_comp
+	print_table
+	prompt_retract_dialog
+	recur_component_dialog
+	recurrence_page_construct
+	recurrence_page_get_type
+	recurrence_page_new
+	reply_to_calendar_comp
+	save_component_dialog
+	schedule_page_construct
+	schedule_page_get_type
+	schedule_page_new
+	schedule_page_set_meeting_time
+	schedule_page_set_name_selector
+	schedule_page_update_free_busy
+	select_source_dialog
+	send_component_dialog
+	send_component_prompt_subject
+	string_is_empty
+	tag_calendar_by_client
+	tag_calendar_by_comp
+	task_details_page_construct
+	task_details_page_create_date_edit
+	task_details_page_get_type
+	task_details_page_new
+	task_editor_get_type
+	task_editor_new
+	task_editor_show_assignment
+	task_page_add_attendee
+	task_page_construct
+	task_page_create_date_edit
+	task_page_create_source_combo_box
+	task_page_get_cancel_comp
+	task_page_get_type
+	task_page_hide_options
+	task_page_new
+	task_page_sendoptions_clicked_cb
+	task_page_set_assignment
+	task_page_set_info_string
+	task_page_set_show_categories
+	task_page_set_show_timezone
+	task_page_set_view_role
+	task_page_set_view_rsvp
+	task_page_set_view_status
+	task_page_set_view_type
+	task_page_show_options
+	tasks_component_get_type
+	tasks_component_peek
+	tasks_component_peek_base_directory
+	tasks_component_peek_config_directory
+	tasks_component_peek_source_list
+	tasks_control_activate
+	tasks_control_deactivate
+	tasks_control_new
+	tasks_control_sensitize_commands
+	weekday_picker_get_blocked_days
+	weekday_picker_get_days
+	weekday_picker_get_type
+	weekday_picker_get_week_start_day
+	weekday_picker_new
+	weekday_picker_set_blocked_days
+	weekday_picker_set_days
+	weekday_picker_set_week_start_day
+	
diff --git a/win32/libevolution-mail.def b/win32/libevolution-mail.def
index edcd38bdb3..9e630a836e 100644
--- a/win32/libevolution-mail.def
+++ b/win32/libevolution-mail.def
@@ -1,28 +1,683 @@
 EXPORTS
+	Bonobo_Plugin_info DATA
+	GNOME_Evolution_MailComponent__classid DATA
+	GNOME_Evolution_MailComponent__iinterface DATA
+	GNOME_Evolution_MailComponent__imethods DATA
+	GNOME_Evolution_MailComponent_test
+	POA_GNOME_Evolution_MailComponent__fini
+	POA_GNOME_Evolution_MailComponent__init
+	TC_GNOME_Evolution_MailComponent_struct
+	_ORBIT_skel_small_GNOME_Evolution_MailComponent_test
+	create_combo_text_widget
+	e_composer_actions_init
+	e_composer_autosave_find_orphans
+	e_composer_autosave_get_enabled
+	e_composer_autosave_get_fd
+	e_composer_autosave_get_filename
+	e_composer_autosave_get_saved
+	e_composer_autosave_register
+	e_composer_autosave_set_enabled
+	e_composer_autosave_set_saved
+	e_composer_autosave_snapshot
+	e_composer_autosave_unregister
+	e_composer_find_data_file
+	e_composer_from_header_get_account_list
+	e_composer_from_header_get_active
+	e_composer_from_header_get_active_name
+	e_composer_from_header_get_type
+	e_composer_from_header_new
+	e_composer_from_header_set_account_list
+	e_composer_from_header_set_active
+	e_composer_from_header_set_active_name
+	e_composer_get_default_charset
+	e_composer_header_get_label
+	e_composer_header_get_sensitive
+	e_composer_header_get_type
+	e_composer_header_get_visible
+	e_composer_header_set_input_tooltip
+	e_composer_header_set_sensitive
+	e_composer_header_set_title_tooltip
+	e_composer_header_set_visible
+	e_composer_header_table_add_destinations_bcc
+	e_composer_header_table_add_destinations_cc
+	e_composer_header_table_add_destinations_to
+	e_composer_header_table_get_account
+	e_composer_header_table_get_account_list
+	e_composer_header_table_get_account_name
+	e_composer_header_table_get_destinations
+	e_composer_header_table_get_destinations_bcc
+	e_composer_header_table_get_destinations_cc
+	e_composer_header_table_get_destinations_to
+	e_composer_header_table_get_header
+	e_composer_header_table_get_header_sensitive
+	e_composer_header_table_get_header_visible
+	e_composer_header_table_get_post_to
+	e_composer_header_table_get_reply_to
+	e_composer_header_table_get_signature
+	e_composer_header_table_get_signature_list
+	e_composer_header_table_get_subject
+	e_composer_header_table_get_type
+	e_composer_header_table_new
+	e_composer_header_table_set_account
+	e_composer_header_table_set_account_list
 	e_composer_header_table_set_account_name
 	e_composer_header_table_set_destinations_bcc
+	e_composer_header_table_set_destinations_cc
 	e_composer_header_table_set_destinations_to
+	e_composer_header_table_set_header_sensitive
+	e_composer_header_table_set_header_visible
+	e_composer_header_table_set_post_to_base
+	e_composer_header_table_set_post_to_list
+	e_composer_header_table_set_reply_to
+	e_composer_header_table_set_signature
+	e_composer_header_table_set_signature_list
 	e_composer_header_table_set_subject
-	e_composer_header_table_set_subject
+	e_composer_name_header_add_destinations
+	e_composer_name_header_get_destinations
+	e_composer_name_header_get_name_selector
+	e_composer_name_header_get_type
+	e_composer_name_header_new
+	e_composer_name_header_set_destinations
+	e_composer_post_header_get_account
+	e_composer_post_header_get_folders
+	e_composer_post_header_get_type
+	e_composer_post_header_new
+	e_composer_post_header_set_account
+	e_composer_post_header_set_folders
+	e_composer_post_header_set_folders_base
+	e_composer_private_dispose
+	e_composer_private_finalize
+	e_composer_private_init
+	e_composer_text_header_get_text
+	e_composer_text_header_get_type
+	e_composer_text_header_new_button
+	e_composer_text_header_new_label
+	e_composer_text_header_set_text
+	e_load_spell_languages
+	e_msg_composer_add_header
+	e_msg_composer_add_inline_image_from_file
+	e_msg_composer_add_inline_image_from_mime_part
+	e_msg_composer_add_message_attachments
 	e_msg_composer_attach
+	e_msg_composer_check_autosave
+	e_msg_composer_clear_inlined_table
+	e_msg_composer_get_attachment_bar
+	e_msg_composer_get_from
 	e_msg_composer_get_header_table
+	e_msg_composer_get_message
+	e_msg_composer_get_message_draft
+	e_msg_composer_get_message_print
+	e_msg_composer_get_raw_message_text
+	e_msg_composer_get_remote_download_count
+	e_msg_composer_get_reply_to
+	e_msg_composer_get_sig_file_content
+	e_msg_composer_get_type
+	e_msg_composer_is_exiting
+	e_msg_composer_load_from_file
+	e_msg_composer_modify_header
 	e_msg_composer_new
+	e_msg_composer_new_from_url
+	e_msg_composer_new_redirect
+	e_msg_composer_new_with_message
+	e_msg_composer_new_with_type
+	e_msg_composer_remove_header
+	e_msg_composer_reply_indent
+	e_msg_composer_request_close_all
+	e_msg_composer_save_draft
 	e_msg_composer_send
+	e_msg_composer_set_alternative
 	e_msg_composer_set_body
 	e_msg_composer_set_body_text
+	e_msg_composer_set_enable_autosave
+	e_msg_composer_set_send_options
+	e_msg_composer_show_sig_file
+	e_save_spell_languages
+	e_searching_tokenizer_add_primary_search_string
+	e_searching_tokenizer_add_secondary_search_string
+	e_searching_tokenizer_get_type
+	e_searching_tokenizer_match_count
+	e_searching_tokenizer_new
+	e_searching_tokenizer_set_primary_case_sensitivity
+	e_searching_tokenizer_set_primary_search_string
+	e_searching_tokenizer_set_secondary_case_sensitivity
+	e_searching_tokenizer_set_secondary_search_string
+	e_signature_editor_get_signature
+	e_signature_editor_get_type
+	e_signature_editor_new
+	e_signature_editor_set_signature
+	efhd_mnemonic_show_bar
+	em_account_editor_dropdown_new
+	em_account_editor_folder_selector_button_new
+	em_account_editor_get_type
+	em_account_editor_new
+	em_account_editor_ssl_selector_new
+	em_account_prefs_get_type
+	em_account_prefs_new
+	em_account_prefs_treeview_new
+	em_composer_prefs_get_type
+	em_composer_prefs_new
+	em_composer_prefs_new_signature
 	em_composer_utils_setup_callbacks
+	em_config_get_type
+	em_config_hook_get_type
+	em_config_new
+	em_config_target_new_account
+	em_config_target_new_folder
+	em_config_target_new_prefs
+	em_event_get_type
+	em_event_hook_get_type
+	em_event_peek
+	em_event_target_new_composer
+	em_event_target_new_custom_icon
+	em_event_target_new_folder
+	em_event_target_new_folder_browser
+	em_event_target_new_message
+	em_event_target_new_send_receive
+	em_filename_make_safe
+	em_filter_context_add_action
+	em_filter_context_create_action
+	em_filter_context_find_action
+	em_filter_context_get_type
+	em_filter_context_new
+	em_filter_context_next_action
+	em_filter_editor_construct
+	em_filter_editor_get_type
+	em_filter_editor_new
+	em_filter_folder_element_get_type
+	em_filter_folder_element_new
+	em_filter_folder_element_set_value
+	em_filter_rule_add_action
+	em_filter_rule_build_action
+	em_filter_rule_get_type
+	em_filter_rule_new
+	em_filter_rule_remove_action
+	em_filter_rule_replace_action
+	em_filter_source_element_get_type
+	em_filter_source_element_new
+	em_folder_browser_get_type
+	em_folder_browser_get_wide
+	em_folder_browser_new
+	em_folder_browser_show_preview
+	em_folder_browser_show_wide
+	em_folder_browser_suppress_message_selection
+	em_folder_properties_show
+	em_folder_selection_button_get_multiselect
 	em_folder_selection_button_get_selection
+	em_folder_selection_button_get_selection_mult
+	em_folder_selection_button_get_type
 	em_folder_selection_button_new
+	em_folder_selection_button_set_multiselect
 	em_folder_selection_button_set_selection
+	em_folder_selection_button_set_selection_mult
+	em_folder_selector_construct
+	em_folder_selector_create_new
+	em_folder_selector_get_selected_path
+	em_folder_selector_get_selected_paths
+	em_folder_selector_get_selected_uri
+	em_folder_selector_get_selected_uris
+	em_folder_selector_get_type
+	em_folder_selector_new
+	em_folder_selector_set_selected
+	em_folder_selector_set_selected_list
+	em_folder_tree_enable_drag_and_drop
+	em_folder_tree_get_model
+	em_folder_tree_get_model_storeinfo
+	em_folder_tree_get_selected_folder
+	em_folder_tree_get_selected_folder_info
+	em_folder_tree_get_selected_path
+	em_folder_tree_get_selected_paths
+	em_folder_tree_get_selected_uri
+	em_folder_tree_get_selected_uris
+	em_folder_tree_get_type
+	em_folder_tree_model_add_store
+	em_folder_tree_model_expand_foreach
+	em_folder_tree_model_get_expanded
+	em_folder_tree_model_get_expanded_uri
+	em_folder_tree_model_get_folder_name
+	em_folder_tree_model_get_selected
+	em_folder_tree_model_get_type
+	em_folder_tree_model_is_type_inbox
+	em_folder_tree_model_new
+	em_folder_tree_model_remove_folders
+	em_folder_tree_model_remove_store
+	em_folder_tree_model_save_state
+	em_folder_tree_model_set_expanded
+	em_folder_tree_model_set_expanded_uri
+	em_folder_tree_model_set_folder_info
+	em_folder_tree_model_set_selected
+	em_folder_tree_model_set_unread_count
+	em_folder_tree_new
+	em_folder_tree_new_with_model
+	em_folder_tree_select_next_path
+	em_folder_tree_select_prev_path
+	em_folder_tree_set_excluded
+	em_folder_tree_set_excluded_func
+	em_folder_tree_set_multiselect
+	em_folder_tree_set_selected
+	em_folder_tree_set_selected_list
+	em_folder_utils_copy_folder
+	em_folder_utils_copy_folders
+	em_folder_utils_create_folder
+	em_folder_utils_delete_folder
+	em_folder_utils_rename_folder
+	em_folder_view_get_popup_target
+	em_folder_view_get_type
+	em_folder_view_mark_selected
+	em_folder_view_new
+	em_folder_view_open_selected
+	em_folder_view_print
+	em_folder_view_set_hide_deleted
+	em_folder_view_set_statusbar
+	em_folder_view_setup_view_instance
+	em_format_add_header
+	em_format_add_puri
+	em_format_class_add_handler
+	em_format_class_remove_handler
+	em_format_clear_headers
+	em_format_clear_puri_tree
+	em_format_default_headers
+	em_format_describe_part
+	em_format_fallback_handler
+	em_format_find_puri
+	em_format_find_visible_puri
+	em_format_format_content
+	em_format_format_error
+	em_format_format_secure
+	em_format_format_text
+	em_format_get_type
+	em_format_hook_get_type
+	em_format_hook_register_type
+	em_format_html_add_pobject
+	em_format_html_clear_pobject
+	em_format_html_display_copy
+	em_format_html_display_cut
+	em_format_html_display_get_bar
+	em_format_html_display_get_type
+	em_format_html_display_goto_anchor
+	em_format_html_display_new
+	em_format_html_display_paste
+	em_format_html_display_popup_menu
+	em_format_html_display_search
+	em_format_html_display_search_close
+	em_format_html_display_search_with
+	em_format_html_display_set_animate
+	em_format_html_display_set_caret_mode
+	em_format_html_display_set_search
+	em_format_html_display_zoom_in
+	em_format_html_display_zoom_out
+	em_format_html_display_zoom_reset
+	em_format_html_file_part
+	em_format_html_find_pobject
+	em_format_html_find_pobject_func
+	em_format_html_get_search_dialog
+	em_format_html_get_type
+	em_format_html_job_new
+	em_format_html_job_queue
+	em_format_html_load_http
+	em_format_html_new
+	em_format_html_print_get_type
+	em_format_html_print_message
+	em_format_html_print_new
+	em_format_html_print_raw_message
+	em_format_html_remove_pobject
+	em_format_html_set_load_http
+	em_format_html_set_mark_citations
+	em_format_is_attachment
+	em_format_is_inline
+	em_format_merge_handler
+	em_format_part
+	em_format_part_as
+	em_format_pull_level
+	em_format_push_level
+	em_format_quote_get_type
+	em_format_quote_new
+	em_format_set_charset
+	em_format_set_default_charset
+	em_format_set_inline
+	em_format_set_mode
+	em_format_set_session
+	em_html_stream_get_type
+	em_html_stream_new
+	em_html_stream_set_flags
+	em_icon_stream_clear_cache
+	em_icon_stream_get_image
+	em_icon_stream_get_type
+	em_icon_stream_is_resized
+	em_icon_stream_new
+	em_inline_filter_get_multipart
+	em_inline_filter_get_type
+	em_inline_filter_new
+	em_junk_error_quark
+	em_junk_hook_get_type
+	em_junk_hook_register_type
+	em_mailer_prefs_get_type
+	em_mailer_prefs_header_free
+	em_mailer_prefs_header_from_xml
+	em_mailer_prefs_header_to_xml
+	em_mailer_prefs_new
+	em_marshal_BOOLEAN__BOXED_POINTER_POINTER
+	em_marshal_BOOLEAN__POINTER
+	em_marshal_VOID__POINTER_POINTER
+	em_marshal_VOID__STRING_STRING
+	em_marshal_VOID__STRING_STRING_UINT
+	em_menu_get_type
+	em_menu_hook_get_type
+	em_menu_new
+	em_menu_target_new_select
+	em_menu_target_new_widget
+	em_message_browser_get_type
+	em_message_browser_new
+	em_message_browser_window_new
+	em_migrate
+	em_network_prefs_get_type
+	em_network_prefs_new
+	em_popup_get_type
+	em_popup_hook_get_type
 	em_popup_new
 	em_popup_target_new_attachments
+	em_popup_target_new_folder
+	em_popup_target_new_part
+	em_popup_target_new_select
+	em_popup_target_new_uri
+	em_search_context_get_type
+	em_search_context_new
+	em_select_folder
+	em_stripsig_filter_get_type
+	em_stripsig_filter_new
+	em_subscribe_editor_new
+	em_sync_stream_get_type
+	em_sync_stream_set_buffer_size
+	em_uri_from_camel
+	em_uri_to_camel
+	em_utils_add_address
+	em_utils_add_vcard
+	em_utils_adjustment_page
+	em_utils_check_user_can_send_mail
+	em_utils_clear_get_password_canceled_accounts_flag
+	em_utils_compose_new_message
+	em_utils_compose_new_message_with_mailto
+	em_utils_composer_save_draft_cb
+	em_utils_composer_send_cb
+	em_utils_configure_account
+	em_utils_contact_photo
+	em_utils_edit_filters
+	em_utils_edit_message
+	em_utils_edit_messages
+	em_utils_empty_trash
+	em_utils_expunge_folder
+	em_utils_flag_for_followup
+	em_utils_flag_for_followup_clear
+	em_utils_flag_for_followup_completed
+	em_utils_folder_is_drafts
+	em_utils_folder_is_outbox
+	em_utils_folder_is_sent
+	em_utils_folder_is_templates
+	em_utils_folder_name_from_uri
+	em_utils_forward_attached
+	em_utils_forward_inline
+	em_utils_forward_message
+	em_utils_forward_message_raw
+	em_utils_forward_messages
+	em_utils_forward_quoted
+	em_utils_get_proxy_uri
+	em_utils_handle_receipt
+	em_utils_in_addressbook
+	em_utils_message_to_html
+	em_utils_part_to_html
+	em_utils_post_reply_to_message_by_uid
+	em_utils_post_to_folder
+	em_utils_post_to_url
 	em_utils_prompt_user
+	em_utils_redirect_message
+	em_utils_redirect_message_by_uid
+	em_utils_reply_to_message
+	em_utils_save_messages
+	em_utils_save_part
+	em_utils_save_part_to_file
+	em_utils_save_parts
+	em_utils_selection_get_mailbox
+	em_utils_selection_get_message
+	em_utils_selection_get_uidlist
+	em_utils_selection_get_urilist
+	em_utils_selection_set_mailbox
+	em_utils_selection_set_uidlist
+	em_utils_selection_set_urilist
+	em_utils_send_receipt
+	em_utils_show_error_silent
+	em_utils_show_info_silent
+	em_utils_snoop_type
+	em_utils_temp_save_part
+	em_utils_uids_copy
+	em_utils_uids_free
+	em_vfolder_context_get_type
+	em_vfolder_context_new
+	em_vfolder_editor_get_type
+	em_vfolder_editor_new
+	em_vfolder_editor_sourcelist_new
+	em_vfolder_rule_add_source
+	em_vfolder_rule_find_source
+	em_vfolder_rule_from_address
+	em_vfolder_rule_from_message
+	em_vfolder_rule_get_type
+	em_vfolder_rule_new
+	em_vfolder_rule_next_source
+	em_vfolder_rule_remove_source
+	emj_get_type
+	filter_gui_add_from_message
+	filter_rule_from_message
+	ldata DATA
+	mail_append_mail
+	mail_async_event DATA
+	mail_async_event_destroy
+	mail_async_event_emit
+	mail_async_event_new
+	mail_autoreceive_init
+	mail_build_attachment
+	mail_call_main
+	mail_cancel_all
+	mail_cancel_hook_add
+	mail_cancel_hook_remove
+	mail_check_service
+	mail_component_add_store
 	mail_component_get_folder
 	mail_component_get_folder_uri
+	mail_component_get_store_count
+	mail_component_get_type
+	mail_component_load_store_by_uri
+	mail_component_peek
+	mail_component_peek_activity_handler
 	mail_component_peek_base_directory
+	mail_component_peek_local_store
+	mail_component_peek_search_context
+	mail_component_peek_session
+	mail_component_peek_tree_model
+	mail_component_remove_folder
+	mail_component_remove_store
+	mail_component_remove_store_by_uri
+	mail_component_show_logger
+	mail_component_stores_foreach
+	mail_config_add_account
+	mail_config_add_signature
+	mail_config_clear
+	mail_config_control_factory_cb
+	mail_config_find_account
+	mail_config_folder_to_cachename
+	mail_config_folder_to_safe_url
+	mail_config_get_account_by_name
+	mail_config_get_account_by_source_url
+	mail_config_get_account_by_transport_url
+	mail_config_get_account_by_uid
+	mail_config_get_accounts
+	mail_config_get_address_count
+	mail_config_get_allowable_mime_types
+	mail_config_get_default_account
+	mail_config_get_default_identity
+	mail_config_get_default_transport
+	mail_config_get_enable_magic_spacebar
+	mail_config_get_error_level
+	mail_config_get_error_timeout
+	mail_config_get_gconf_client
+	mail_config_get_labels
+	mail_config_get_lookup_book
+	mail_config_get_lookup_book_local_only
+	mail_config_get_message_limit
+	mail_config_get_signature_by_name
+	mail_config_get_signature_by_uid
+	mail_config_get_signatures
+	mail_config_get_sync_timeout
+	mail_config_has_proxies
+	mail_config_init
+	mail_config_is_configured
+	mail_config_is_corrupt
+	mail_config_prune_proxies
+	mail_config_reload_junk_headers
+	mail_config_remove_account
+	mail_config_remove_account_proxies
+	mail_config_remove_signature
+	mail_config_save_accounts
+	mail_config_save_signatures
+	mail_config_scripts_disabled
+	mail_config_service_set_save_passwd
+	mail_config_set_default_account
+	mail_config_signature_new
+	mail_config_signature_run_script
+	mail_config_uri_deleted
+	mail_config_uri_renamed
+	mail_config_write
+	mail_config_write_on_exit
+	mail_crypto_get_pgp_cipher_context
+	mail_disable_stop
+	mail_empty_trash
+	mail_enable_stop
+	mail_execute_shell_command
+	mail_expunge_folder
+	mail_fetch_mail
+	mail_filter_delete_uri
+	mail_filter_folder
+	mail_filter_junk
+	mail_filter_on_demand
+	mail_filter_rename_uri
+	mail_folder_cache_get_folder_info_flags
+	mail_get_folder
+	mail_get_folder_quota
+	mail_get_folderinfo
+	mail_get_message
+	mail_get_messages
+	mail_get_messagex
+	mail_get_store
+	mail_in_main_thread
+	mail_indicate_new_mail
+	mail_msg_active
+	mail_msg_cancel
+	mail_msg_check_error
+	mail_msg_cleanup
 	mail_msg_fast_ordered_push
-	mail_msg_free
+	mail_msg_init
+	mail_msg_main_loop_push
 	mail_msg_new
+	mail_msg_ref
+	mail_msg_set_cancelable
+	mail_msg_slow_ordered_push
+	mail_msg_unordered_push
 	mail_msg_unref
+	mail_msg_wait
+	mail_msg_wait_all
+	mail_note_folder
+	mail_note_get_folder_from_uri
+	mail_note_store
+	mail_note_store_remove
+	mail_prep_offline
+	mail_receive_uri
+	mail_refresh_folder
+	mail_remove_folder
+	mail_save_messages
+	mail_save_part
+	mail_send
+	mail_send_queue
+	mail_send_receive
+	mail_session_add_junk_plugin
+	mail_session_add_password
+	mail_session_flush_filter_log
+	mail_session_forget_password
+	mail_session_forget_passwords
+	mail_session_get_interactive
+	mail_session_get_junk_plugins
+	mail_session_get_password
+	mail_session_init
+	mail_session_remember_password
+	mail_session_set_interactive
+	mail_session_set_junk_headers
+	mail_session_shutdown
+	mail_store_prepare_offline
+	mail_store_set_offline
+	mail_sync_folder
+	mail_sync_store
+	mail_tool_do_movemail
+	mail_tool_generate_forward_subject
+	mail_tool_get_inbox
+	mail_tool_get_trash
+	mail_tool_make_message_attachment
+	mail_tool_remove_xevolution_headers
+	mail_tool_restore_xevolution_headers
 	mail_tool_uri_to_folder
-	mail_win32_get_mail_thread_queued
+	mail_tools_folder_to_url
+	mail_tools_x_evolution_message_parse
+	mail_transfer_messages
+	mail_vfolder_add_uri
+	mail_vfolder_delete_uri
+	mail_vfolder_get_sources_local
+	mail_vfolder_get_sources_remote
+	mail_vfolder_rename_uri
+	mail_vfolder_shutdown
+	message_list_can_select
+	message_list_copy
+	message_list_ensure_message
+	message_list_free_uids
+	message_list_freeze
+	message_list_get_scrollbar_position
+	message_list_get_selected
+	message_list_get_type
+	message_list_get_uids
+	message_list_hidden
+	message_list_hide_add
+	message_list_hide_clear
+	message_list_hide_uids
+	message_list_invert_selection
+	message_list_length
+	message_list_new
+	message_list_paste
+	message_list_save_state
+	message_list_select
+	message_list_select_all
+	message_list_select_next_thread
+	message_list_select_subthread
+	message_list_select_thread
+	message_list_select_uid
+	message_list_set_folder
+	message_list_set_hidedeleted
+	message_list_set_scrollbar_position
+	message_list_set_search
+	message_list_set_selected
+	message_list_set_threaded
+	message_list_set_threaded_collapse_all
+	message_list_set_threaded_expand_all
+	message_list_thaw
+	message_tag_editor_get_tag_list
+	message_tag_editor_get_type
+	message_tag_editor_set_tag_list
+	message_tag_followup_append_message
+	message_tag_followup_get_type
+	message_tag_followup_new
+	session DATA
+	status_check
+	target_date_new
+	vfolder_clone_rule
+	vfolder_create_part
+	vfolder_edit
+	vfolder_edit_rule
+	vfolder_gui_add_from_address
+	vfolder_gui_add_from_message
+	vfolder_gui_add_rule
+	vfolder_load_storage
+	vfolder_revert
+	vfolder_store DATA
diff --git a/win32/libfilter.def b/win32/libfilter.def
index 3c84225131..e942c946dd 100644
--- a/win32/libfilter.def
+++ b/win32/libfilter.def
@@ -1,15 +1,102 @@
 EXPORTS
+	filter_code_get_type
+	filter_code_new
+	filter_colour_get_type
+	filter_colour_new
+	filter_datespec_get_type
+	filter_datespec_new
+	filter_element_build_code
+	filter_element_clone
+	filter_element_copy_value
+	filter_element_eq
+	filter_element_format_sexp
+	filter_element_get_type
+	filter_element_get_widget
+	filter_element_new
+	filter_element_set_data
+	filter_element_validate
+	filter_element_xml_create
+	filter_element_xml_decode
+	filter_element_xml_encode
+	filter_file_get_type
+	filter_file_new
+	filter_file_new_type_name
+	filter_file_set_path
+	filter_input_get_type
+	filter_input_new
+	filter_input_new_type_name
+	filter_input_set_value
+	filter_int_get_type
+	filter_int_new
+	filter_int_new_type
+	filter_int_set_value
+	filter_option_add
+	filter_option_get_current
+	filter_option_get_type
+	filter_option_new
+	filter_option_remove_all
+	filter_option_set_current
+	filter_part_build_code
+	filter_part_build_code_list
+	filter_part_clone
+	filter_part_copy_values
+	filter_part_eq
+	filter_part_expand_code
+	filter_part_find_element
+	filter_part_find_list
+	filter_part_get_type
+	filter_part_get_widget
+	filter_part_new
+	filter_part_next_list
+	filter_part_validate
+	filter_part_xml_create
+	filter_part_xml_decode
+	filter_part_xml_encode
+	filter_rule_add_part
 	filter_rule_build_code
 	filter_rule_clone
+	filter_rule_copy
+	filter_rule_emit_changed
+	filter_rule_eq
+	filter_rule_find_list
+	filter_rule_get_type
 	filter_rule_get_widget
 	filter_rule_new
+	filter_rule_next_list
+	filter_rule_remove_part
+	filter_rule_replace_part
 	filter_rule_set_name
 	filter_rule_set_source
 	filter_rule_validate
 	filter_rule_xml_decode
 	filter_rule_xml_encode
+	rule_context_add_part
+	rule_context_add_part_set
 	rule_context_add_rule
+	rule_context_add_rule_gui
+	rule_context_add_rule_set
+	rule_context_create_part
+	rule_context_delete_uri
+	rule_context_find_part
+	rule_context_find_rank_rule
 	rule_context_find_rule
+	rule_context_free_uri_list
+	rule_context_get_rank_rule
+	rule_context_get_type
+	rule_context_load
+	rule_context_new
+	rule_context_new_element
+	rule_context_next_part
 	rule_context_next_rule
+	rule_context_rank_rule
+	rule_context_remove_rule
+	rule_context_rename_uri
+	rule_context_revert
 	rule_context_save
+	rule_editor_construct
+	rule_editor_create_rule
+	rule_editor_get_type
 	rule_editor_new
+	rule_editor_set_sensitive
+	rule_editor_set_source
+	rule_editor_treeview_new