--- configure.in	2007-12-17 12:33:02.000000000 +0530
+++ configure.in	2007-11-28 12:07:58.000000000 +0530
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 2.21.3, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.21.2, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 
 # Some requirements have versioned package names
@@ -17,7 +17,7 @@ m4_define([gnome_icon_theme_minimum_vers
 m4_define([gnome_vfs_minimum_version], [2.4.0])
 m4_define([libbonobo_minimum_version], [2.16.0])
 m4_define([libbonoboui_minimum_version], [2.4.2])
-m4_define([libgtkhtml_minimum_version], [3.17.3])
+m4_define([libgtkhtml_minimum_version], [3.16.0])
 m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess
 m4_define([libglade_minimum_version], [2.0.0])          # XXX Just a Guess
 m4_define([libgnomecanvas_minimum_version], [2.0.0])    # XXX Just a Guess
@@ -1686,10 +1686,16 @@ plugins_base_always="calendar-file calen
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
 all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
 
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face" 
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face email-custom-header" 
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
+# Disable the mail-remote plugin until it can be made to work or at least
+# compile again.  If there is no movement on this before GNOME 2.24 ships
+# then it should be considered dead code and removed from source control.
+#
+# To reenable, add "mail-remote" to plugins_experimental_always.
+
 plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting save-attachments external-editor"
 plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
 all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
@@ -1985,6 +1991,7 @@ plugins/import-ics-attachments/Makefile
 plugins/imap-features/Makefile
 plugins/tnef-attachments/Makefile
 plugins/face/Makefile
+plugins/email-custom-header/Makefile
 plugins/external-editor/Makefile
 smime/Makefile
 smime/lib/Makefile
--- /dev/null	2007-09-22 03:20:58.000000000 +0530
+++ plugins/email-custom-header/Makefile.am	2007-12-17 12:13:27.000000000 +0530
@@ -0,0 +1,62 @@
+INCLUDES = -I. 						\
+	-I$(top_srcdir)	                                \
+	-I$(top_srcdir)/widgets				\
+	-I$(top_srcdir)/widgets/misc			\
+	-I$(top_builddir)/mail                          \
+	-I$(top_srcdir)/camel                           \
+	-I$(top_builddir)/composer			\
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"          \
+	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\"
+
+
+@EVO_PLUGIN_RULE@
+
+plugin_DATA =	\
+	org-gnome-custom-header.eplug	\
+	org-gnome-custom-header-menu.xml  
+
+plugin_LTLIBRARIES = liborg-gnome-custom-header.la
+
+liborg_gnome_custom_header_la_SOURCES = 		\
+	email-custom-header.c					\
+	custom-header.c					\
+	email-custom-header.h					
+liborg_gnome_custom_header_la_LIBADD = 			\
+	$(top_builddir)/e-util/libeutil.la 			\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(top_builddir)/mail/libevolution-mail.la 		\
+	$(NO_UNDEFINED_REQUIRED_LIBS)				
+
+liborg_gnome_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+schemadir       = $(GCONF_SCHEMA_FILE_DIR)
+schema_in_files = apps_evolution_email_custom_header.schemas.in
+schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
+
+@INTLTOOL_SCHEMAS_RULE@
+
+install-data-local:
+	if test -z "$(DESTDIR)" ; then											\
+		for p in $(schema_DATA) ; do										\
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p;	\
+		done													\
+	fi
+
+errordir = $(privdatadir)/errors
+
+glade_DATA =							\
+	org-gnome-custom-header.glade
+
+EXTRA_DIST = 							\
+	org-gnome-custom-header.eplug.xml			\
+	org-gnome-custom-header-menu.xml			\	
+	$(schema_in_files)					\
+	$(error_DATA)						
+
+BUILT_SOURCES = 				\
+	org-gnome-custom-header.eplug 			\
+	$(error_i18n)
+
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = $(schema_DATA)
--- /dev/null	2007-09-22 03:20:58.000000000 +0530
+++ plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in	2007-12-13 17:27:21.000000000 +0530
@@ -0,0 +1,17 @@
+<gconfschemafile>
+  <schemalist>
+    <schema>
+      <key>/schemas/apps/evolution/mail/composer/customheaders</key>
+      <applyto>/apps/evolution/mail/composer/customheaders</applyto>
+      <owner>evolution-mail</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
+      <locale name="C">
+         <short>List of subtype</short>
+         <long>List of subtype</long>
+      </locale>
+    </schema>
+  </schemalist>
+</gconfschemafile>
+
--- /dev/null	2007-09-22 03:20:58.000000000 +0530
+++ plugins/email-custom-header/org-gnome-custom-header.eplug.xml	2007-12-17 12:40:08.000000000 +0530
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<e-plugin-list>
+	<e-plugin id="org.gnome.evolution.email-custom-header" type="shlib" _name="Custom Header" 
+		location="@PLUGINDIR@/liborg-gnome-custom-header@SOEXT@">
+
+		<author name="Ashish Shrivastava" email="shashish@novell.com"/>
+		<_description>A plugin to help you attach Custom Headers to the outgoing messages. You can configure the custom header through the Custom Header dialog box.</_description>
+
+		<hook class="org.gnome.evolution.mail.bonobomenu:1.0">
+			<menu id="org.gnome.evolution.mail.composer" target="widget">
+				<ui file="@PLUGINDIR@/org-gnome-custom-header-menu.xml"/>
+				<item
+					type="item"
+					verb="Custom Header"
+					path="/commands/Custom Header"			   
+					activate="org_gnome_composer_custom_header"
+					enable="one"
+				/>
+			</menu>
+		</hook>
+	</e-plugin>
+</e-plugin-list>
--- /dev/null	2007-09-22 03:20:58.000000000 +0530
+++ plugins/email-custom-header/org-gnome-custom-header-menu.xml	2007-11-29 11:43:11.000000000 +0530
@@ -0,0 +1,13 @@
+<Root>
+  <commands>
+  	<cmd name="Custom Header" _label="_Custom Header"/>
+  </commands>
+  <menu>
+ 	<submenu name="Insert">
+  		<placeholder name="Component">
+  			<menuitem name="Custom Header" verb="" />
+                <separator f="" name="customheader1"/>
+	  	</placeholder>
+	</submenu>
+  </menu>
+</Root>
--- /dev/null	2007-09-22 03:20:58.000000000 +0530
+++ plugins/email-custom-header/org-gnome-custom-header.glade	2007-11-28 11:03:50.000000000 +0530
@@ -0,0 +1,143 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+<requires lib="gnome"/>
+
+<widget class="GtkDialog" id="custom_header">
+  <property name="visible">True</property>
+  <property name="can_default">True</property>
+  <property name="title" translatable="yes">Email Custom Header</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_MOUSE</property>
+  <property name="modal">True</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="vbox">
+      <property name="visible">True</property>
+      <property name="can_default">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area1">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="helpbutton1">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-11</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbutton1">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="okbutton1">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkNotebook" id="notebook">
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="show_tabs">True</property>
+	  <property name="show_border">True</property>
+	  <property name="tab_pos">GTK_POS_TOP</property>
+	  <property name="scrollable">False</property>
+	  <property name="enable_popup">False</property>
+
+	  <child>
+	    <widget class="GtkTable" id="header-options">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="n_rows">4</property>
+	      <property name="n_columns">4</property>
+	      <property name="homogeneous">False</property>
+	      <property name="row_spacing">12</property>
+	      <property name="column_spacing">12</property>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="gopts-label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Head_er Options</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
--- /dev/null	2007-09-22 03:20:58.000000000 +0530
+++ plugins/email-custom-header/email-custom-header.c	2007-12-17 16:37:58.000000000 +0530
@@ -0,0 +1,436 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Authors: Ashish Shrivastava <shashish@novell.com>
+ *
+ * Copyright (C) 2004 Novell, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, MA 02110-1301.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <gconf/gconf-client.h>
+
+#include <libedataserverui/e-name-selector.h>
+#include <libedataserverui/e-contact-store.h>
+#include <e-util/e-error.h>
+#include <libgnome/libgnome.h>
+#include <libgnome/gnome-i18n.h>
+#include <glade/glade.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
+#include <e-util/e-xml-utils.h>
+#include "composer/e-msg-composer.h"
+#include "composer/e-msg-composer-hdrs.h"
+#include "libedataserver/e-account.h"
+#include "e-util/e-util-private.h"
+
+#include "email-custom-header.h"
+
+struct _CustomHeaderOptionsDialogPrivate {
+	/* Glade XML data */
+	GladeXML *xml;
+
+	/*Widgets*/
+
+	GtkWidget *main;
+
+	GtkWidget *page;
+
+	GtkNotebook *notebook;
+
+	GtkWidget *header_table;
+
+	GtkWidget *header_type_name_label;
+
+	GtkWidget *header_subtype_value_combo_box[MAX_ROW][MAX_COLUMN];
+	char *help_section;
+};
+
+
+static void epech_custom_headeroptions_dialog_class_init (GObjectClass *object_class);
+static void epech_custom_headeroptions_dialog_finalize (GObject *object);
+static void epech_custom_headeroptions_dialog_init (GObject *object);
+static void epech_custom_headeroptions_dialog_dispose (GObject *object);
+static void epech_setup_custom_header_widgets (CustomHeaderOptionsDialog *mch);
+
+static GObjectClass *parent_class = NULL;
+enum {
+	MCH_RESPONSE,
+	LAST_SIGNAL
+};
+
+GArray *index_subtype_header;
+
+static guint signals[LAST_SIGNAL] = {0};
+
+CustomHeaderDetails headerDetails[MAX_ROW];
+
+/* custom_header_options_get_widgets_data(CustomHeaderOptionsDialog *mch)
+   Return Value:This function returns a -1 if an error occurs. In case of error-free operation 
+   a 1 is returned.
+ */
+
+static gint
+epech_custom_header_options_get_widgets_data (CustomHeaderOptionsDialog *mch)
+{
+	CustomHeaderOptionsDialogPrivate *priv;
+	gint index_combobox_row,index_combobox_column;
+	priv = mch->priv;
+
+	index_subtype_header = g_array_new (TRUE, FALSE, sizeof (gint));
+
+	/* This block helps us fetch the address of the delegator(s). If no delegator is 
+	   selected or more than one delegatee has been selected then an info dialog is 
+	   popped up to help the user.	
+	 */
+
+	for(index_combobox_row=0,index_combobox_column=0; 
+			index_combobox_column<headerDetails[0].numberOfHeader;index_combobox_column++) {
+		gint result;
+
+		result = gtk_combo_box_get_active(
+				(GtkComboBox *)priv->header_subtype_value_combo_box
+				[index_combobox_row][index_combobox_column]);
+		g_array_append_val (index_subtype_header, result);
+	}
+
+	return 1;
+}
+
+static gboolean
+epech_get_widgets (CustomHeaderOptionsDialog *mch) 
+{
+	CustomHeaderOptionsDialogPrivate *priv;
+
+	priv = mch->priv;
+
+#define CUSTOM_HEADER(name) glade_xml_get_widget (priv->xml, name)
+
+	priv->main = CUSTOM_HEADER ("custom_header");
+	if (!priv->main)
+		return FALSE;
+
+	priv->page  = CUSTOM_HEADER ("vbox");	
+	priv->notebook = (GtkNotebook *) CUSTOM_HEADER ("notebook");
+	priv->header_table = CUSTOM_HEADER ("header-options");	
+
+#undef CUSTOM_HEADER
+
+	return (priv->page
+			&&priv->notebook
+			&&priv->header_table);
+}
+
+static void
+epech_custom_header_options_fill_widgets_with_data (CustomHeaderOptionsDialog *mch)
+{
+	CustomHeaderOptionsDialogPrivate *priv;
+	gint set_index_combobox_row,set_index_combobox_column;	
+	priv = mch->priv;
+
+	priv->help_section = g_strdup ("usage-mail");
+
+	for(set_index_combobox_row=0,set_index_combobox_column=0; 
+			set_index_combobox_column<headerDetails[0].numberOfHeader; 
+			set_index_combobox_column++) {
+
+		gtk_combo_box_set_active (
+				(GtkComboBox *)priv->header_subtype_value_combo_box
+				[set_index_combobox_row][set_index_combobox_column],0);
+
+	}
+}
+
+CustomHeaderOptionsDialog *
+epech_custom_headeroptions_dialog_new (void) {
+	CustomHeaderOptionsDialog *mch;
+
+	mch = g_object_new (CUSTOM_HEADER_OPTIONS_DIALOG, NULL);
+
+	return mch;
+}
+
+GType epech_custom_headeroptions_dialog_get_type (void)
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof (CustomHeaderOptionsDialogClass),
+			NULL,   /* base_init */
+			NULL,   /* base_finalize */
+			(GClassInitFunc) epech_custom_headeroptions_dialog_class_init,   /* class_init */
+			NULL,   /* class_finalize */
+			NULL,   /* class_data */
+			sizeof (CustomHeaderOptionsDialog),
+			0,      /* n_preallocs */
+			(GInstanceInitFunc) epech_custom_headeroptions_dialog_init,
+			NULL    /* instance_init */
+		};
+		type = g_type_register_static (G_TYPE_OBJECT,
+				"CustomHeaderOptionsDialogType",
+				&info, 0);
+	}
+	return type;
+}
+
+static void epech_custom_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
+{
+	CustomHeaderOptionsDialogPrivate *priv;
+	CustomHeaderOptionsDialog *mch;
+	GError *error = NULL;     
+
+	mch = func_data;
+	priv = mch->priv;
+
+	switch (state) {			
+		case GTK_RESPONSE_OK:
+			if(epech_custom_header_options_get_widgets_data (mch) < 0) 
+				return;
+		case GTK_RESPONSE_CANCEL:
+			gtk_widget_hide (priv->main);
+			gtk_widget_destroy (priv->main);
+			g_object_unref (priv->xml);
+			break;	     
+		case GTK_RESPONSE_HELP:
+			gnome_help_display (
+					"evolution.xml", priv->help_section, &error);
+			if (error != NULL) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
+			}
+			break;
+	}
+	g_signal_emit (G_OBJECT (func_data), signals[MCH_RESPONSE], 0, state);
+
+}
+
+gboolean 
+epech_custom_headeroptions_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent)
+{	
+	CustomHeaderOptionsDialogPrivate *priv;
+
+	GtkWidget *toplevel;
+	gchar *filename;
+
+	g_return_val_if_fail (mch != NULL || CUSTOM_IS_HEADEROPTIONS_DIALOG (mch), FALSE);
+
+	priv = mch->priv;
+
+	epech_get_custom_header_type_list ();
+
+	filename = g_build_filename (EVOLUTION_GLADEDIR,
+			"org-gnome-custom-header.glade",
+			NULL);
+	priv->xml = glade_xml_new (filename, NULL, NULL);
+	g_free (filename);
+
+	if (!priv->xml) {
+		g_message ( G_STRLOC ": Could not load the Glade XML file ");
+		return FALSE;
+	}
+
+	if (!epech_get_widgets(mch)) {
+		g_object_unref (priv->xml);
+		g_message (G_STRLOC ": Could not get the Widgets \n");
+		return FALSE;
+	}
+
+	epech_setup_custom_header_widgets (mch);
+
+	toplevel =  gtk_widget_get_toplevel (priv->main);
+	if (parent)
+		gtk_window_set_transient_for (GTK_WINDOW (toplevel),
+				GTK_WINDOW (parent));
+
+	epech_custom_header_options_fill_widgets_with_data (mch);
+
+	g_signal_connect (GTK_DIALOG (priv->main), "response", 
+			G_CALLBACK(epech_custom_header_options_cb), mch);
+
+	gtk_window_set_modal ((GtkWindow *) priv->main, TRUE);
+	gtk_widget_show (priv->main);
+
+	return TRUE;
+}
+
+void epech_get_custom_header_type_list (void)
+{
+
+	GConfClient *gconf;
+	gconf = gconf_client_get_default (); 
+
+	epech_custom_header_list_new_for_gconf (gconf, "/apps/evolution/mail/composer/email_custom_header/customheader");
+
+	return;
+}
+
+void epech_custom_header_list_new_for_gconf (GConfClient *client,const char *path)
+{
+	g_return_val_if_fail (GCONF_IS_CLIENT (client), NULL);
+	g_return_val_if_fail (path != NULL, NULL);
+
+	gconf_client_add_dir (client, path,GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+
+	epech_load_from_gconf_custom_header (client, path);
+
+	return;
+}
+
+
+void epech_load_from_gconf_custom_header (GConfClient *client,const char *path)
+{
+	GSList *header_list,*q;
+	gchar *buffer;
+	gint index,num_elements,pos;
+
+	memset(headerDetails, 0, sizeof(headerDetails));
+	header_list = gconf_client_get_list (client,path,GCONF_VALUE_STRING, NULL);
+
+	gint headerTypeIndex=0;
+
+	for (q = header_list,pos = 0;q != NULL;q = q->next,pos++) {
+		buffer = q->data;
+
+		gchar **parse_header_list = g_strsplit_set (buffer, "=;,", -1);
+
+		strcpy(headerDetails[headerTypeIndex].type, parse_header_list[0]);
+
+		for (index = 0;parse_header_list[index+1];++index) { 
+			strcpy(headerDetails[headerTypeIndex].subTypeHeader[index].subtype,parse_header_list[index+1]);
+		}
+
+		headerDetails[headerTypeIndex].numberOfSubTypeHeader = index;
+		headerTypeIndex++;
+
+	}
+	headerDetails[0].numberOfHeader = pos;
+}
+
+static void 
+epech_setup_custom_header_widgets (CustomHeaderOptionsDialog *mch)
+{
+	CustomHeaderOptionsDialogPrivate *priv;
+	gint header_section_id,sub_type_index,row,column,label_row;
+	priv = mch->priv;
+
+	for (header_section_id=0,label_row=0,row=0,column=1; 
+			header_section_id<headerDetails[0].numberOfHeader;header_section_id++,row++,column++) {
+
+		priv->header_type_name_label = gtk_label_new ("");
+		gtk_label_set_markup (GTK_LABEL (priv->header_type_name_label), 
+				headerDetails[header_section_id].type);
+		gtk_table_attach (GTK_TABLE (priv->header_table), priv->header_type_name_label, 0, 1, row, column,
+				(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+				(GtkAttachOptions) (0), 0, 0);
+		gtk_misc_set_alignment (GTK_MISC (priv->header_type_name_label), 0, 0.5);
+		gtk_widget_show (priv->header_type_name_label);
+
+		priv->header_subtype_value_combo_box[label_row][row] = gtk_combo_box_new_text ();
+		gtk_table_attach (GTK_TABLE (priv->header_table), 
+				priv->header_subtype_value_combo_box[label_row][row], 1, 2, row, column,
+				(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+				(GtkAttachOptions) (GTK_FILL), 0, 0);
+
+		for (sub_type_index=0;sub_type_index<headerDetails[header_section_id].numberOfSubTypeHeader;sub_type_index++) {
+			gtk_combo_box_append_text (GTK_COMBO_BOX (priv->header_subtype_value_combo_box[label_row][row]), 
+					headerDetails[header_section_id].subTypeHeader[sub_type_index].subtype);
+		}
+		gtk_widget_show (priv->header_subtype_value_combo_box[label_row][row]);
+	}
+}
+
+static void
+epech_custom_headeroptions_dialog_class_init (GObjectClass *object)
+{
+	CustomHeaderOptionsDialogClass *klass;
+	GObjectClass *object_class;
+
+	klass = CUSTOM_HEADEROPTIONS_DIALOG_CLASS (object);
+	parent_class = g_type_class_peek_parent (klass);
+	object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = epech_custom_headeroptions_dialog_finalize;
+	object_class->dispose = epech_custom_headeroptions_dialog_dispose;
+
+	signals[MCH_RESPONSE] = g_signal_new ("emch_response",
+			G_TYPE_FROM_CLASS (klass),
+			G_SIGNAL_RUN_FIRST,
+			G_STRUCT_OFFSET (CustomHeaderOptionsDialogClass, emch_response),
+			NULL, NULL,
+			g_cclosure_marshal_VOID__INT,
+			G_TYPE_NONE, 1,
+			G_TYPE_INT);
+
+}
+
+static void
+epech_custom_headeroptions_dialog_init (GObject *object)
+{
+
+	CustomHeaderOptionsDialog *mch;
+	CustomHeaderOptionsDialogPrivate *priv;
+
+	mch = CUSTOM_HEADEROPTIONS_DIALOG (object);
+
+	priv = g_new0 (CustomHeaderOptionsDialogPrivate, 1);
+
+	mch->priv = priv;
+
+	priv->xml = NULL;
+	priv->main = NULL;
+	priv->notebook = NULL;
+	priv->header_table = NULL;
+}
+
+static void
+epech_custom_headeroptions_dialog_finalize (GObject *object)
+{
+	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *)object;
+	CustomHeaderOptionsDialogPrivate *priv;
+
+	g_return_if_fail (CUSTOM_IS_HEADEROPTIONS_DIALOG (mch));
+	priv = mch->priv;
+
+	g_free (priv->help_section);
+
+	if (mch->priv) {
+		g_free (mch->priv);
+		mch->priv = NULL;
+	}
+
+	if (parent_class->finalize) 
+		(* parent_class->finalize) (object);
+
+}
+
+static void
+epech_custom_headeroptions_dialog_dispose (GObject *object)
+{
+	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *) object;
+
+	g_return_if_fail (CUSTOM_IS_HEADEROPTIONS_DIALOG (mch));
+
+	if (parent_class->dispose)
+		(* parent_class->dispose) (object);
+
+}	
+
--- /dev/null	2007-09-22 03:20:58.000000000 +0530
+++ plugins/email-custom-header/custom-header.c	2007-12-17 16:36:33.000000000 +0530
@@ -0,0 +1,111 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ *  Authors: Ashish Shrivastava <shashish@novell.com>
+ *
+ * Copyright 2004 Novell, Inc. (www.novell.com)
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include <camel/camel-mime-message.h>
+#include <camel/camel-address.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <mail/em-menu.h>
+#include <e-util/e-error.h>
+#include <e-util/e-xml-utils.h>
+
+#include <string.h>
+#include <sys/stat.h>
+#include <e-util/e-config.h>
+
+#include <e-util/e-config.h>
+#include <mail/em-config.h>
+#include <mail/em-event.h>
+
+#include "composer/e-msg-composer.h"
+#include "composer/e-msg-composer-hdrs.h"
+#include "libedataserver/e-account.h"
+
+#include "email-custom-header.h"
+
+#define d(x) x
+
+extern GArray *index_subtype_header;
+extern CustomHeaderDetails headerDetails[MAX_ROW];
+
+void org_gnome_composer_custom_header (EPlugin * ep, EMMenuTargetWidget * target);
+
+static CustomHeaderOptionsDialog *dialog=NULL;
+
+
+static void  
+epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gpointer data)
+{
+	EMsgComposer *composer;
+	gint index, index_subtype;
+
+	composer = (EMsgComposer *)data;
+	if (state == GTK_RESPONSE_OK) {
+
+		for(index=0,index_subtype=0;index_subtype<headerDetails[index].numberOfHeader;index_subtype++)
+		{
+			e_msg_composer_modify_header (composer, headerDetails[index_subtype].type,
+					headerDetails[index].subTypeHeader[g_array_index(index_subtype_header, gint, index_subtype)].subtype);		
+		}			
+	}
+}
+
+
+static void
+epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
+{
+	if (!user_data && !CUSTOM_IS_HEADEROPTIONS_DIALOG (user_data))
+		return;
+
+	if (dialog) {
+		g_print ("\nDialog getting unreferenced ");
+		g_object_unref (dialog);
+		dialog = NULL;	
+	}
+}
+
+void 
+org_gnome_composer_custom_header (EPlugin * ep, EMMenuTargetWidget * t)
+{
+
+	EMsgComposer *composer;
+
+	composer = (EMsgComposer *) t->target.widget;
+
+	/*disply the custome_header options dialog*/
+	if (!dialog) {
+		g_print ("New dialog\n\n") ;
+		dialog = epech_custom_headeroptions_dialog_new () ;
+	}
+
+	epech_custom_headeroptions_dialog_run (dialog, GTK_WIDGET (composer));
+
+	g_signal_connect (dialog, "emch_response", G_CALLBACK (epech_append_to_custom_header), GTK_WIDGET (composer));
+	g_signal_connect (GTK_WIDGET (composer), "destroy",
+			G_CALLBACK (epech_custom_header_options_commit), dialog);
+
+}
--- /dev/null	2007-09-22 03:20:58.000000000 +0530
+++ plugins/email-custom-header/email-custom-header.h	2007-12-17 16:31:11.000000000 +0530
@@ -0,0 +1,73 @@
+ /* Evolution Email custom header options
+ * Copyright (C) 2004 Novell, Inc.
+ *
+ * Authors: Ashish <shashish@novell.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, MA 02110-1301.
+ */
+
+#ifndef __CUSTOM_HEADEROPTIONS_DIALOG_H__
+#define __CUSTOM_HEADEROPTIONS_DIALOG_H__
+
+#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
+
+
+
+#define CUSTOM_HEADER_OPTIONS_DIALOG       (epech_custom_headeroptions_dialog_get_type ())
+#define CUSTOM_HEADEROPTIONS_DIALOG(obj)       (GTK_CHECK_CAST ((obj), CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialog))
+#define CUSTOM_HEADEROPTIONS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialogClass))
+#define CUSTOM_IS_HEADEROPTIONS_DIALOG(obj)    (GTK_CHECK_TYPE ((obj), CUSTOM_HEADER_OPTIONS_DIALOG))
+#define CUSTOM_IS_HEADEROPTIONS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CUSTOM_HEADER_OPTIONS_DIALOG))
+
+#define CUSTOM_SUB_TYPE 50
+#define CUSTOM_TYPE 50
+#define MAX_ROW 50
+#define MAX_COLUMN 50
+
+
+typedef struct _CustomHeaderOptionsDialog		CustomHeaderOptionsDialog;
+typedef struct _CustomHeaderOptionsDialogClass		CustomHeaderOptionsDialogClass;
+typedef struct _CustomHeaderOptionsDialogPrivate	CustomHeaderOptionsDialogPrivate;
+
+struct _CustomHeaderOptionsDialog {
+	GObject object;
+
+	/* Private data */
+	CustomHeaderOptionsDialogPrivate *priv;
+};
+
+typedef struct {
+	gchar subtype[CUSTOM_SUB_TYPE];
+} CustomHeaderSubType;
+
+typedef struct {
+	gchar type[CUSTOM_TYPE];
+	gint numberOfHeader;
+	gint numberOfSubTypeHeader;
+	CustomHeaderSubType subTypeHeader[CUSTOM_SUB_TYPE];
+} CustomHeaderDetails;
+
+struct _CustomHeaderOptionsDialogClass {
+	GObjectClass parent_class;
+	void (* emch_response) (CustomHeaderOptionsDialog *esd, gint status);
+};
+
+GType  epech_custom_headeroptions_dialog_get_type     (void);
+CustomHeaderOptionsDialog *epech_custom_headeroptions_dialog_new (void);
+gboolean epech_custom_headeroptions_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent);
+void epech_get_custom_header_type_list (void);
+void epech_load_from_gconf_custom_header (GConfClient *client,const char *path);
+#endif
+
