New function. (g_mime_header_set): Setting header to NULL no longer

2001-06-23  Jeffrey Stedfast  <fejj@ximian.com>

	* gmime-header.c (g_mime_header_remove): New function.
	(g_mime_header_set): Setting header to NULL no longer removes the
	header. Use g_mime_header_remove instead.

	* gmime-message.c (g_mime_message_write_to_string): No longer have
	to sync the headers.
	(g_mime_message_get_headers): Same.
	(g_mime_message_set_sender): sync the From header.
	(g_mime_message_set_reply_to): Sync the Reply-To header.
	(g_mime_message_add_recipient): Sync the recipient header.
	(g_mime_message_add_recipients_from_string): Same.
	(g_mime_message_set_subject): Sync the Subject header.
	(g_mime_message_set_date): Sync the date header.
	(g_mime_message_set_message_id): Sync the Message-Id header.

25 files changed, 664 insertions, 500 deletions

diff --git a/ChangeLog b/ChangeLog
index 212e142c..8e19e7a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-06-23  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* gmime-header.c (g_mime_header_remove): New function.
+	(g_mime_header_set): Setting header to NULL no longer removes the
+	header. Use g_mime_header_remove instead.
+
+	* gmime-message.c (g_mime_message_write_to_string): No longer have
+	to sync the headers.
+	(g_mime_message_get_headers): Same.
+	(g_mime_message_set_sender): sync the From header.
+	(g_mime_message_set_reply_to): Sync the Reply-To header.
+	(g_mime_message_add_recipient): Sync the recipient header.
+	(g_mime_message_add_recipients_from_string): Same.
+	(g_mime_message_set_subject): Sync the Subject header.
+	(g_mime_message_set_date): Sync the date header.
+	(g_mime_message_set_message_id): Sync the Message-Id header.
+
 2001-06-03  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* gmime-utils.c (quoted_encode): Minor cleanup.
diff --git a/configure.in b/configure.in
index 087042f3..45378501 100644
--- a/configure.in
+++ b/configure.in
@@ -87,6 +87,12 @@ dnl NOTE: We need to use a separate automake conditional for this
 dnl       to make this work with the tarballs.
 AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
 
+dnl Check for gprof action
+AC_ARG_ENABLE(gprof, [  --enable-gprof  Enable gprof profiling compile flags [default=no]], enable_gprof="$enableval", enable_gprof=no)
+if test x$enable_gprof = xyes; then
+  CFLAGS="$CFLAGS -pg"
+fi
+
 dnl We need at *least* glib 1.2.0
 AM_PATH_GLIB(1.2.0, ,
              AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?))
@@ -150,3 +156,15 @@ AC_OUTPUT(
   gmime.spec
   gmime.h
 )
+
+echo "
+
+Configuration:
+
+  Source code location: ${srcdir}
+  Install prefix:       ${prefix}
+  Compiler:             ${CC}
+
+  Profiling enabled:    ${enable_gprof}
+"
+  
\ No newline at end of file
diff --git a/doc/gmime-sections.txt b/doc/gmime-sections.txt
index 6c59194d..919e12bd 100644
--- a/doc/gmime-sections.txt
+++ b/doc/gmime-sections.txt
@@ -14,6 +14,7 @@ g_mime_header_new
 g_mime_header_destroy
 g_mime_header_set
 g_mime_header_get
+g_mime_header_remove
 g_mime_header_write_to_string
 g_mime_header_to_string
 g_mime_header_foreach
diff --git a/doc/html/gmime-gmime-content-type.html b/doc/html/gmime-gmime-content-type.html
index 4a55150c..7456890f 100644
--- a/doc/html/gmime-gmime-content-type.html
+++ b/doc/html/gmime-gmime-content-type.html
@@ -123,7 +123,7 @@ NAME="GMIME-GMIME-CONTENT-TYPE"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN369"
+NAME="AEN392"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN369"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN372"
+NAME="AEN395"
 ></A
 ><H2
 >Synopsis</H2
@@ -242,7 +242,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN399"
+NAME="AEN422"
 ></A
 ><H2
 >Description</H2
@@ -252,14 +252,14 @@ NAME="AEN399"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN402"
+NAME="AEN425"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN404"
+NAME="AEN427"
 ></A
 ><H3
 ><A
@@ -291,7 +291,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN409"
+NAME="AEN432"
 ></A
 ><H3
 ><A
@@ -328,7 +328,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN418"
+NAME="AEN441"
 ></A
 ><P
 ></P
@@ -398,7 +398,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN435"
+NAME="AEN458"
 ></A
 ><H3
 ><A
@@ -432,7 +432,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN443"
+NAME="AEN466"
 ></A
 ><P
 ></P
@@ -485,7 +485,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN456"
+NAME="AEN479"
 ></A
 ><H3
 ><A
@@ -515,7 +515,7 @@ HREF="gmime-gmime-content-type.html#GMIMECONTENTTYPE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN463"
+NAME="AEN486"
 ></A
 ><P
 ></P
@@ -553,7 +553,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN472"
+NAME="AEN495"
 ></A
 ><H3
 ><A
@@ -586,7 +586,7 @@ HREF="gmime-gmime-content-type.html#GMIMECONTENTTYPE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN480"
+NAME="AEN503"
 ></A
 ><P
 ></P
@@ -640,7 +640,7 @@ content-type in the format: type/subtype.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN493"
+NAME="AEN516"
 ></A
 ><H3
 ><A
@@ -675,7 +675,7 @@ HREF="gmime-gmime-content-type.html#GMIMECONTENTTYPE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN501"
+NAME="AEN524"
 ></A
 ><P
 ></P
@@ -769,7 +769,7 @@ HREF="SUBTYPE"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN524"
+NAME="AEN547"
 ></A
 ><H3
 ><A
@@ -808,7 +808,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN533"
+NAME="AEN556"
 ></A
 ><P
 ></P
@@ -880,7 +880,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN550"
+NAME="AEN573"
 ></A
 ><H3
 ><A
@@ -918,7 +918,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN559"
+NAME="AEN582"
 ></A
 ><P
 ></P
diff --git a/doc/html/gmime-gmime-header.html b/doc/html/gmime-gmime-header.html
index 465a7c3b..f8100849 100644
--- a/doc/html/gmime-gmime-header.html
+++ b/doc/html/gmime-gmime-header.html
@@ -205,6 +205,17 @@ HREF="GCHAR"
 >gchar</GTKDOCLINK
 > *name);
 void        <A
+HREF="gmime-gmime-header.html#G-MIME-HEADER-REMOVE"
+>g_mime_header_remove</A
+>            (<A
+HREF="gmime-gmime-message.html#GMIMEHEADER"
+>GMimeHeader</A
+> *header,
+                                             const <GTKDOCLINK
+HREF="GCHAR"
+>gchar</GTKDOCLINK
+> *name);
+void        <A
 HREF="gmime-gmime-header.html#G-MIME-HEADER-WRITE-TO-STRING"
 >g_mime_header_write_to_string</A
 >   (const <A
@@ -247,7 +258,7 @@ HREF="GPOINTER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN177"
+NAME="AEN180"
 ></A
 ><H2
 >Description</H2
@@ -257,14 +268,14 @@ NAME="AEN177"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN180"
+NAME="AEN183"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN182"
+NAME="AEN185"
 ></A
 ><H3
 ><A
@@ -300,7 +311,7 @@ HREF="GPOINTER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN190"
+NAME="AEN193"
 ></A
 ><P
 ></P
@@ -372,7 +383,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN207"
+NAME="AEN210"
 ></A
 ><H3
 ><A
@@ -402,7 +413,7 @@ HREF="gmime-gmime-message.html#GMIMEHEADER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN214"
+NAME="AEN217"
 ></A
 ><P
 ></P
@@ -438,7 +449,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN223"
+NAME="AEN226"
 ></A
 ><H3
 ><A
@@ -468,7 +479,7 @@ HREF="gmime-gmime-message.html#GMIMEHEADER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN230"
+NAME="AEN233"
 ></A
 ><P
 ></P
@@ -506,7 +517,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN239"
+NAME="AEN242"
 ></A
 ><H3
 ><A
@@ -554,13 +565,13 @@ CLASS="PARAMETER"
 ></TT
 >, had not been previously set, a space will be set
 aside for it (useful for setting the order of headers before values
-can be obtained for them) otherwise the header will be removed.</P
+can be obtained for them) otherwise the header will be unset.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN251"
+NAME="AEN254"
 ></A
 ><P
 ></P
@@ -621,10 +632,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> header value (or <TT
-CLASS="LITERAL"
->NULL</TT
-> to remove header)</TD
+> header value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -635,7 +643,7 @@ CLASS="LITERAL"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN269"
+NAME="AEN271"
 ></A
 ><H3
 ><A
@@ -672,7 +680,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN278"
+NAME="AEN280"
 ></A
 ><P
 ></P
@@ -742,7 +750,96 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN295"
+NAME="AEN297"
+></A
+><H3
+><A
+NAME="G-MIME-HEADER-REMOVE"
+></A
+>g_mime_header_remove ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        g_mime_header_remove            (<A
+HREF="gmime-gmime-message.html#GMIMEHEADER"
+>GMimeHeader</A
+> *header,
+                                             const <GTKDOCLINK
+HREF="GCHAR"
+>gchar</GTKDOCLINK
+> *name);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Remove the specified header</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN305"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>header</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> header object</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> header name</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN318"
 ></A
 ><H3
 ><A
@@ -776,7 +873,7 @@ HREF="GSTRING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN303"
+NAME="AEN326"
 ></A
 ><P
 ></P
@@ -831,7 +928,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN316"
+NAME="AEN339"
 ></A
 ><H3
 ><A
@@ -864,7 +961,7 @@ HREF="gmime-gmime-message.html#GMIMEHEADER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN324"
+NAME="AEN347"
 ></A
 ><P
 ></P
@@ -917,7 +1014,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN337"
+NAME="AEN360"
 ></A
 ><H3
 ><A
@@ -960,7 +1057,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN347"
+NAME="AEN370"
 ></A
 ><P
 ></P
diff --git a/doc/html/gmime-gmime-message.html b/doc/html/gmime-gmime-message.html
index a2a985ae..50be4b8b 100644
--- a/doc/html/gmime-gmime-message.html
+++ b/doc/html/gmime-gmime-message.html
@@ -123,7 +123,7 @@ NAME="GMIME-GMIME-MESSAGE"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN1600"
+NAME="AEN1623"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN1600"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN1603"
+NAME="AEN1626"
 ></A
 ><H2
 >Synopsis</H2
@@ -462,7 +462,7 @@ HREF="GPOINTER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1691"
+NAME="AEN1714"
 ></A
 ><H2
 >Description</H2
@@ -472,14 +472,14 @@ NAME="AEN1691"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1694"
+NAME="AEN1717"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1696"
+NAME="AEN1719"
 ></A
 ><H3
 ><A
@@ -505,7 +505,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1701"
+NAME="AEN1724"
 ></A
 ><H3
 ><A
@@ -531,7 +531,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1706"
+NAME="AEN1729"
 ></A
 ><H3
 ><A
@@ -557,7 +557,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1711"
+NAME="AEN1734"
 ></A
 ><H3
 ><A
@@ -583,7 +583,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1716"
+NAME="AEN1739"
 ></A
 ><H3
 ><A
@@ -623,7 +623,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1721"
+NAME="AEN1744"
 ></A
 ><H3
 ><A
@@ -653,7 +653,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1726"
+NAME="AEN1749"
 ></A
 ><H3
 ><A
@@ -683,7 +683,7 @@ HREF="gmime-gmime-message.html#GMIMEMESSAGE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1733"
+NAME="AEN1756"
 ></A
 ><P
 ></P
@@ -720,7 +720,7 @@ set by default.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1742"
+NAME="AEN1765"
 ></A
 ><H3
 ><A
@@ -751,7 +751,7 @@ Parts back to the Operating System for reuse.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1749"
+NAME="AEN1772"
 ></A
 ><P
 ></P
@@ -789,7 +789,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1758"
+NAME="AEN1781"
 ></A
 ><H3
 ><A
@@ -829,7 +829,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1767"
+NAME="AEN1790"
 ></A
 ><P
 ></P
@@ -884,7 +884,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1780"
+NAME="AEN1803"
 ></A
 ><H3
 ><A
@@ -917,7 +917,7 @@ HREF="gmime-gmime-message.html#GMIMEMESSAGE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1788"
+NAME="AEN1811"
 ></A
 ><P
 ></P
@@ -970,7 +970,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1801"
+NAME="AEN1824"
 ></A
 ><H3
 ><A
@@ -1004,7 +1004,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1809"
+NAME="AEN1832"
 ></A
 ><P
 ></P
@@ -1059,7 +1059,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1822"
+NAME="AEN1845"
 ></A
 ><H3
 ><A
@@ -1092,7 +1092,7 @@ HREF="gmime-gmime-message.html#GMIMEMESSAGE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1830"
+NAME="AEN1853"
 ></A
 ><P
 ></P
@@ -1145,7 +1145,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1843"
+NAME="AEN1866"
 ></A
 ><H3
 ><A
@@ -1189,7 +1189,7 @@ GMIME_RECIPIENT_TYPE_CC and GMIME_RECIPIENT_TYPE_BCC.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1853"
+NAME="AEN1876"
 ></A
 ><P
 ></P
@@ -1278,7 +1278,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1874"
+NAME="AEN1897"
 ></A
 ><H3
 ><A
@@ -1321,7 +1321,7 @@ specified in rfc822.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1883"
+NAME="AEN1906"
 ></A
 ><P
 ></P
@@ -1393,7 +1393,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1900"
+NAME="AEN1923"
 ></A
 ><H3
 ><A
@@ -1430,7 +1430,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1909"
+NAME="AEN1932"
 ></A
 ><P
 ></P
@@ -1503,7 +1503,7 @@ GMIME_RECIPIENT_TYPE_BCC.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1926"
+NAME="AEN1949"
 ></A
 ><H3
 ><A
@@ -1537,7 +1537,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1934"
+NAME="AEN1957"
 ></A
 ><P
 ></P
@@ -1592,7 +1592,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1947"
+NAME="AEN1970"
 ></A
 ><H3
 ><A
@@ -1625,7 +1625,7 @@ HREF="gmime-gmime-message.html#GMIMEMESSAGE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1955"
+NAME="AEN1978"
 ></A
 ><P
 ></P
@@ -1678,7 +1678,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1968"
+NAME="AEN1991"
 ></A
 ><H3
 ><A
@@ -1713,7 +1713,7 @@ HREF="TIME-T"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1976"
+NAME="AEN1999"
 ></A
 ><P
 ></P
@@ -1785,7 +1785,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1993"
+NAME="AEN2016"
 ></A
 ><H3
 ><A
@@ -1827,7 +1827,7 @@ HREF="GMT-OFFSET"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2003"
+NAME="AEN2026"
 ></A
 ><P
 ></P
@@ -1899,7 +1899,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2020"
+NAME="AEN2043"
 ></A
 ><H3
 ><A
@@ -1932,7 +1932,7 @@ HREF="gmime-gmime-message.html#GMIMEMESSAGE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2028"
+NAME="AEN2051"
 ></A
 ><P
 ></P
@@ -1985,7 +1985,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2041"
+NAME="AEN2064"
 ></A
 ><H3
 ><A
@@ -2019,7 +2019,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2049"
+NAME="AEN2072"
 ></A
 ><P
 ></P
@@ -2074,7 +2074,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2062"
+NAME="AEN2085"
 ></A
 ><H3
 ><A
@@ -2107,7 +2107,7 @@ HREF="gmime-gmime-message.html#GMIMEMESSAGE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2070"
+NAME="AEN2093"
 ></A
 ><P
 ></P
@@ -2160,7 +2160,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2083"
+NAME="AEN2106"
 ></A
 ><H3
 ><A
@@ -2199,7 +2199,7 @@ X-Priority, or In-Reply-To.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2092"
+NAME="AEN2115"
 ></A
 ><P
 ></P
@@ -2271,7 +2271,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2109"
+NAME="AEN2132"
 ></A
 ><H3
 ><A
@@ -2308,7 +2308,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2118"
+NAME="AEN2141"
 ></A
 ><P
 ></P
@@ -2378,7 +2378,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2135"
+NAME="AEN2158"
 ></A
 ><H3
 ><A
@@ -2412,7 +2412,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2143"
+NAME="AEN2166"
 ></A
 ><P
 ></P
@@ -2467,7 +2467,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2156"
+NAME="AEN2179"
 ></A
 ><H3
 ><A
@@ -2506,7 +2506,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2165"
+NAME="AEN2188"
 ></A
 ><P
 ></P
@@ -2561,7 +2561,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2178"
+NAME="AEN2201"
 ></A
 ><H3
 ><A
@@ -2594,7 +2594,7 @@ HREF="gmime-gmime-message.html#GMIMEMESSAGE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2186"
+NAME="AEN2209"
 ></A
 ><P
 ></P
@@ -2647,7 +2647,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2199"
+NAME="AEN2222"
 ></A
 ><H3
 ><A
@@ -2688,7 +2688,7 @@ HREF="GBOOLEAN"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2209"
+NAME="AEN2232"
 ></A
 ><P
 ></P
@@ -2783,7 +2783,7 @@ recommended that you traverse the MIME structure yourself.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2231"
+NAME="AEN2254"
 ></A
 ><H3
 ><A
@@ -2816,7 +2816,7 @@ HREF="gmime-gmime-message.html#GMIMEMESSAGE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2239"
+NAME="AEN2262"
 ></A
 ><P
 ></P
@@ -2869,7 +2869,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2252"
+NAME="AEN2275"
 ></A
 ><H3
 ><A
@@ -2910,7 +2910,7 @@ HREF="CALLBACK"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2262"
+NAME="AEN2285"
 ></A
 ><P
 ></P
diff --git a/doc/html/gmime-gmime-parser.html b/doc/html/gmime-gmime-parser.html
index fb7be708..37b15124 100644
--- a/doc/html/gmime-gmime-parser.html
+++ b/doc/html/gmime-gmime-parser.html
@@ -111,7 +111,7 @@ NAME="GMIME-GMIME-PARSER"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3236"
+NAME="AEN3259"
 ></A
 ><H2
 >Name</H2
@@ -119,7 +119,7 @@ NAME="AEN3236"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3239"
+NAME="AEN3262"
 ></A
 ><H2
 >Synopsis</H2
@@ -189,7 +189,7 @@ HREF="GBOOLEAN"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3255"
+NAME="AEN3278"
 ></A
 ><H2
 >Description</H2
@@ -199,14 +199,14 @@ NAME="AEN3255"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3258"
+NAME="AEN3281"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3260"
+NAME="AEN3283"
 ></A
 ><H3
 ><A
@@ -243,7 +243,7 @@ HREF="GUINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3269"
+NAME="AEN3292"
 ></A
 ><P
 ></P
@@ -313,7 +313,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3286"
+NAME="AEN3309"
 ></A
 ><H3
 ><A
@@ -355,7 +355,7 @@ HREF="GBOOLEAN"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3296"
+NAME="AEN3319"
 ></A
 ><P
 ></P
@@ -442,7 +442,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3317"
+NAME="AEN3340"
 ></A
 ><H3
 ><A
@@ -480,7 +480,7 @@ HREF="GBOOLEAN"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3326"
+NAME="AEN3349"
 ></A
 ><P
 ></P
diff --git a/doc/html/gmime-gmime-part.html b/doc/html/gmime-gmime-part.html
index ca388b91..960e70d1 100644
--- a/doc/html/gmime-gmime-part.html
+++ b/doc/html/gmime-gmime-part.html
@@ -123,7 +123,7 @@ NAME="GMIME-GMIME-PART"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN582"
+NAME="AEN605"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN582"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN585"
+NAME="AEN608"
 ></A
 ><H2
 >Synopsis</H2
@@ -622,7 +622,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN715"
+NAME="AEN738"
 ></A
 ><H2
 >Description</H2
@@ -632,14 +632,14 @@ NAME="AEN715"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN718"
+NAME="AEN741"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN720"
+NAME="AEN743"
 ></A
 ><H3
 ><A
@@ -672,7 +672,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN725"
+NAME="AEN748"
 ></A
 ><H3
 ><A
@@ -698,7 +698,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN730"
+NAME="AEN753"
 ></A
 ><H3
 ><A
@@ -728,7 +728,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN735"
+NAME="AEN758"
 ></A
 ><H3
 ><A
@@ -769,7 +769,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN740"
+NAME="AEN763"
 ></A
 ><H3
 ><A
@@ -801,7 +801,7 @@ HREF="GPOINTER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN747"
+NAME="AEN770"
 ></A
 ><P
 ></P
@@ -856,7 +856,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN760"
+NAME="AEN783"
 ></A
 ><H3
 ><A
@@ -886,7 +886,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN767"
+NAME="AEN790"
 ></A
 ><P
 ></P
@@ -923,7 +923,7 @@ text/plain.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN776"
+NAME="AEN799"
 ></A
 ><H3
 ><A
@@ -960,7 +960,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN785"
+NAME="AEN808"
 ></A
 ><P
 ></P
@@ -1030,7 +1030,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN802"
+NAME="AEN825"
 ></A
 ><H3
 ><A
@@ -1060,7 +1060,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN809"
+NAME="AEN832"
 ></A
 ><P
 ></P
@@ -1098,7 +1098,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN818"
+NAME="AEN841"
 ></A
 ><H3
 ><A
@@ -1133,7 +1133,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN826"
+NAME="AEN849"
 ></A
 ><P
 ></P
@@ -1188,7 +1188,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN839"
+NAME="AEN862"
 ></A
 ><H3
 ><A
@@ -1222,7 +1222,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN847"
+NAME="AEN870"
 ></A
 ><P
 ></P
@@ -1275,7 +1275,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN860"
+NAME="AEN883"
 ></A
 ><H3
 ><A
@@ -1309,7 +1309,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN868"
+NAME="AEN891"
 ></A
 ><P
 ></P
@@ -1364,7 +1364,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN881"
+NAME="AEN904"
 ></A
 ><H3
 ><A
@@ -1397,7 +1397,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN889"
+NAME="AEN912"
 ></A
 ><P
 ></P
@@ -1450,7 +1450,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN902"
+NAME="AEN925"
 ></A
 ><H3
 ><A
@@ -1484,7 +1484,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN910"
+NAME="AEN933"
 ></A
 ><P
 ></P
@@ -1539,7 +1539,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN923"
+NAME="AEN946"
 ></A
 ><H3
 ><A
@@ -1572,7 +1572,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN931"
+NAME="AEN954"
 ></A
 ><P
 ></P
@@ -1625,7 +1625,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN944"
+NAME="AEN967"
 ></A
 ><H3
 ><A
@@ -1658,7 +1658,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN952"
+NAME="AEN975"
 ></A
 ><P
 ></P
@@ -1712,7 +1712,7 @@ return FALSE if the mime part does not contain a Content-MD5.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN965"
+NAME="AEN988"
 ></A
 ><H3
 ><A
@@ -1747,7 +1747,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN973"
+NAME="AEN996"
 ></A
 ><P
 ></P
@@ -1802,7 +1802,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN986"
+NAME="AEN1009"
 ></A
 ><H3
 ><A
@@ -1836,7 +1836,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN994"
+NAME="AEN1017"
 ></A
 ><P
 ></P
@@ -1889,7 +1889,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1007"
+NAME="AEN1030"
 ></A
 ><H3
 ><A
@@ -1923,7 +1923,7 @@ HREF="gmime-gmime-content-type.html#GMIMECONTENTTYPE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1015"
+NAME="AEN1038"
 ></A
 ><P
 ></P
@@ -1978,7 +1978,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1028"
+NAME="AEN1051"
 ></A
 ><H3
 ><A
@@ -2012,7 +2012,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1036"
+NAME="AEN1059"
 ></A
 ><P
 ></P
@@ -2065,7 +2065,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1049"
+NAME="AEN1072"
 ></A
 ><H3
 ><A
@@ -2102,7 +2102,7 @@ GMIME_PART_ENCODING_BASE64 and GMIME_PART_ENCODING_QUOTEDPRINTABLE.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1057"
+NAME="AEN1080"
 ></A
 ><P
 ></P
@@ -2157,7 +2157,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1070"
+NAME="AEN1093"
 ></A
 ><H3
 ><A
@@ -2191,7 +2191,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1078"
+NAME="AEN1101"
 ></A
 ><P
 ></P
@@ -2248,7 +2248,7 @@ GMIME_PART_ENCODING_QUOTEDPRINTABLE.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1091"
+NAME="AEN1114"
 ></A
 ><H3
 ><A
@@ -2281,7 +2281,7 @@ HREF="gmime-gmime-part.html#GMIMEPARTENCODINGTYPE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1099"
+NAME="AEN1122"
 ></A
 ><P
 ></P
@@ -2337,7 +2337,7 @@ GMIME_PART_ENCODING_BASE64 and GMIME_PART_ENCODING_QUOTEDPRINTABLE.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1112"
+NAME="AEN1135"
 ></A
 ><H3
 ><A
@@ -2371,7 +2371,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1120"
+NAME="AEN1143"
 ></A
 ><P
 ></P
@@ -2428,7 +2428,7 @@ GMIME_PART_ENCODING_QUOTEDPRINTABLE.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1133"
+NAME="AEN1156"
 ></A
 ><H3
 ><A
@@ -2463,7 +2463,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1141"
+NAME="AEN1164"
 ></A
 ><P
 ></P
@@ -2518,7 +2518,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1154"
+NAME="AEN1177"
 ></A
 ><H3
 ><A
@@ -2552,7 +2552,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1162"
+NAME="AEN1185"
 ></A
 ><P
 ></P
@@ -2605,7 +2605,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1175"
+NAME="AEN1198"
 ></A
 ><H3
 ><A
@@ -2644,7 +2644,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1184"
+NAME="AEN1207"
 ></A
 ><P
 ></P
@@ -2716,7 +2716,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1201"
+NAME="AEN1224"
 ></A
 ><H3
 ><A
@@ -2754,7 +2754,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1210"
+NAME="AEN1233"
 ></A
 ><P
 ></P
@@ -2828,7 +2828,7 @@ HREF="NAME"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1228"
+NAME="AEN1251"
 ></A
 ><H3
 ><A
@@ -2863,7 +2863,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1236"
+NAME="AEN1259"
 ></A
 ><P
 ></P
@@ -2918,7 +2918,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1249"
+NAME="AEN1272"
 ></A
 ><H3
 ><A
@@ -2951,7 +2951,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1257"
+NAME="AEN1280"
 ></A
 ><P
 ></P
@@ -3006,7 +3006,7 @@ and if not then checks the "name" parameter in the Content-Type.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1270"
+NAME="AEN1293"
 ></A
 ><H3
 ><A
@@ -3040,7 +3040,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1278"
+NAME="AEN1301"
 ></A
 ><P
 ></P
@@ -3095,7 +3095,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1291"
+NAME="AEN1314"
 ></A
 ><H3
 ><A
@@ -3128,7 +3128,7 @@ HREF="gmime-gmime-part.html#GMIMEPART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1299"
+NAME="AEN1322"
 ></A
 ><P
 ></P
@@ -3181,7 +3181,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1312"
+NAME="AEN1335"
 ></A
 ><H3
 ><A
@@ -3219,7 +3219,7 @@ HREF="GUINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1321"
+NAME="AEN1344"
 ></A
 ><P
 ></P
@@ -3291,7 +3291,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1338"
+NAME="AEN1361"
 ></A
 ><H3
 ><A
@@ -3334,7 +3334,7 @@ HREF="gmime-gmime-part.html#GMIMEPARTENCODINGTYPE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1348"
+NAME="AEN1371"
 ></A
 ><P
 ></P
@@ -3423,7 +3423,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1369"
+NAME="AEN1392"
 ></A
 ><H3
 ><A
@@ -3466,7 +3466,7 @@ HREF="gmime-gmime-part.html#GMIMEPARTENCODINGTYPE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1379"
+NAME="AEN1402"
 ></A
 ><P
 ></P
@@ -3555,7 +3555,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1400"
+NAME="AEN1423"
 ></A
 ><H3
 ><A
@@ -3590,7 +3590,7 @@ HREF="GBYTEARRAY"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1408"
+NAME="AEN1431"
 ></A
 ><P
 ></P
@@ -3645,7 +3645,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1421"
+NAME="AEN1444"
 ></A
 ><H3
 ><A
@@ -3682,7 +3682,7 @@ HREF="GUINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1430"
+NAME="AEN1453"
 ></A
 ><P
 ></P
@@ -3756,7 +3756,7 @@ CLASS="LITERAL"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1448"
+NAME="AEN1471"
 ></A
 ><H3
 ><A
@@ -3791,7 +3791,7 @@ multipart.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1456"
+NAME="AEN1479"
 ></A
 ><P
 ></P
@@ -3846,7 +3846,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1469"
+NAME="AEN1492"
 ></A
 ><H3
 ><A
@@ -3871,7 +3871,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1474"
+NAME="AEN1497"
 ></A
 ><P
 ></P
@@ -3926,7 +3926,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1487"
+NAME="AEN1510"
 ></A
 ><H3
 ><A
@@ -3971,7 +3971,7 @@ for rfc822 messages.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1497"
+NAME="AEN1520"
 ></A
 ><P
 ></P
@@ -4043,7 +4043,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1514"
+NAME="AEN1537"
 ></A
 ><H3
 ><A
@@ -4080,7 +4080,7 @@ HREF="GBOOLEAN"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1523"
+NAME="AEN1546"
 ></A
 ><P
 ></P
@@ -4152,7 +4152,7 @@ headers for rfc822 messages.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1540"
+NAME="AEN1563"
 ></A
 ><H3
 ><A
@@ -4196,7 +4196,7 @@ HREF="MIME-PART"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1551"
+NAME="AEN1574"
 ></A
 ><P
 ></P
@@ -4271,7 +4271,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1569"
+NAME="AEN1592"
 ></A
 ><H3
 ><A
@@ -4309,7 +4309,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1578"
+NAME="AEN1601"
 ></A
 ><P
 ></P
diff --git a/doc/html/gmime-gmime-utils.html b/doc/html/gmime-gmime-utils.html
index bfc5cf32..a7009e6d 100644
--- a/doc/html/gmime-gmime-utils.html
+++ b/doc/html/gmime-gmime-utils.html
@@ -123,7 +123,7 @@ NAME="GMIME-GMIME-UTILS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2284"
+NAME="AEN2307"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN2284"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2287"
+NAME="AEN2310"
 ></A
 ><H2
 >Synopsis</H2
@@ -475,7 +475,7 @@ HREF="GINT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2378"
+NAME="AEN2401"
 ></A
 ><H2
 >Description</H2
@@ -485,14 +485,14 @@ NAME="AEN2378"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2381"
+NAME="AEN2404"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2383"
+NAME="AEN2406"
 ></A
 ><H3
 ><A
@@ -517,7 +517,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2388"
+NAME="AEN2411"
 ></A
 ><P
 ></P
@@ -555,7 +555,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2397"
+NAME="AEN2420"
 ></A
 ><H3
 ><A
@@ -580,7 +580,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2402"
+NAME="AEN2425"
 ></A
 ><P
 ></P
@@ -618,7 +618,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2411"
+NAME="AEN2434"
 ></A
 ><H3
 ><A
@@ -655,7 +655,7 @@ HREF="GINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2420"
+NAME="AEN2443"
 ></A
 ><P
 ></P
@@ -730,7 +730,7 @@ will be stored.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2438"
+NAME="AEN2461"
 ></A
 ><H3
 ><A
@@ -767,7 +767,7 @@ HREF="GINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2447"
+NAME="AEN2470"
 ></A
 ><P
 ></P
@@ -837,7 +837,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2464"
+NAME="AEN2487"
 ></A
 ><H3
 ><A
@@ -870,7 +870,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2472"
+NAME="AEN2495"
 ></A
 ><P
 ></P
@@ -923,7 +923,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2485"
+NAME="AEN2508"
 ></A
 ><H3
 ><A
@@ -957,7 +957,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2493"
+NAME="AEN2516"
 ></A
 ><P
 ></P
@@ -1031,7 +1031,7 @@ HREF="FORMAT"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2511"
+NAME="AEN2534"
 ></A
 ><H3
 ><A
@@ -1064,7 +1064,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2519"
+NAME="AEN2542"
 ></A
 ><P
 ></P
@@ -1120,7 +1120,7 @@ as defined by rfc2045.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2532"
+NAME="AEN2555"
 ></A
 ><H3
 ><A
@@ -1150,7 +1150,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2539"
+NAME="AEN2562"
 ></A
 ><P
 ></P
@@ -1188,7 +1188,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2548"
+NAME="AEN2571"
 ></A
 ><H3
 ><A
@@ -1225,7 +1225,7 @@ HREF="GUINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2557"
+NAME="AEN2580"
 ></A
 ><P
 ></P
@@ -1296,7 +1296,7 @@ otherwise.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2574"
+NAME="AEN2597"
 ></A
 ><H3
 ><A
@@ -1334,7 +1334,7 @@ HREF="GUINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2583"
+NAME="AEN2606"
 ></A
 ><P
 ></P
@@ -1406,7 +1406,7 @@ particular case means best compression)</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2600"
+NAME="AEN2623"
 ></A
 ><H3
 ><A
@@ -1439,7 +1439,7 @@ HREF="GUCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2608"
+NAME="AEN2631"
 ></A
 ><P
 ></P
@@ -1492,7 +1492,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2621"
+NAME="AEN2644"
 ></A
 ><H3
 ><A
@@ -1525,7 +1525,7 @@ HREF="GUCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2629"
+NAME="AEN2652"
 ></A
 ><P
 ></P
@@ -1579,7 +1579,7 @@ headers like "Subject".</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2642"
+NAME="AEN2665"
 ></A
 ><H3
 ><A
@@ -1613,7 +1613,7 @@ HREF="GUCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2650"
+NAME="AEN2673"
 ></A
 ><P
 ></P
@@ -1667,7 +1667,7 @@ internet addresses.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2663"
+NAME="AEN2686"
 ></A
 ><H3
 ><A
@@ -1716,7 +1716,7 @@ HREF="GUINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2675"
+NAME="AEN2698"
 ></A
 ><P
 ></P
@@ -1845,7 +1845,7 @@ HREF="OUT"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2706"
+NAME="AEN2729"
 ></A
 ><H3
 ><A
@@ -1894,7 +1894,7 @@ HREF="GINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2718"
+NAME="AEN2741"
 ></A
 ><P
 ></P
@@ -2023,7 +2023,7 @@ invocation).</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2748"
+NAME="AEN2771"
 ></A
 ><H3
 ><A
@@ -2073,7 +2073,7 @@ HREF="GINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2760"
+NAME="AEN2783"
 ></A
 ><P
 ></P
@@ -2201,7 +2201,7 @@ bit.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2790"
+NAME="AEN2813"
 ></A
 ><H3
 ><A
@@ -2254,7 +2254,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2803"
+NAME="AEN2826"
 ></A
 ><P
 ></P
@@ -2400,7 +2400,7 @@ line has been stripped off.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2837"
+NAME="AEN2860"
 ></A
 ><H3
 ><A
@@ -2449,7 +2449,7 @@ HREF="GINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2849"
+NAME="AEN2872"
 ></A
 ><P
 ></P
@@ -2576,7 +2576,7 @@ chunk of QP encoded data.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2879"
+NAME="AEN2902"
 ></A
 ><H3
 ><A
@@ -2625,7 +2625,7 @@ HREF="GINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2891"
+NAME="AEN2914"
 ></A
 ><P
 ></P
@@ -2753,7 +2753,7 @@ invocation).</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2921"
+NAME="AEN2944"
 ></A
 ><H3
 ><A
@@ -2803,7 +2803,7 @@ HREF="GINT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2933"
+NAME="AEN2956"
 ></A
 ><P
 ></P
diff --git a/doc/html/gmime-internet-address.html b/doc/html/gmime-internet-address.html
index 70e6c7dd..95429d5f 100644
--- a/doc/html/gmime-internet-address.html
+++ b/doc/html/gmime-internet-address.html
@@ -123,7 +123,7 @@ NAME="GMIME-INTERNET-ADDRESS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2968"
+NAME="AEN2991"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN2968"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2971"
+NAME="AEN2994"
 ></A
 ><H2
 >Synopsis</H2
@@ -267,7 +267,7 @@ HREF="GBOOLEAN"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3006"
+NAME="AEN3029"
 ></A
 ><H2
 >Description</H2
@@ -277,14 +277,14 @@ NAME="AEN3006"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3009"
+NAME="AEN3032"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3011"
+NAME="AEN3034"
 ></A
 ><H3
 ><A
@@ -314,7 +314,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3016"
+NAME="AEN3039"
 ></A
 ><H3
 ><A
@@ -347,7 +347,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3021"
+NAME="AEN3044"
 ></A
 ><H3
 ><A
@@ -377,7 +377,7 @@ HREF="gmime-internet-address.html#INTERNETADDRESS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3028"
+NAME="AEN3051"
 ></A
 ><P
 ></P
@@ -413,7 +413,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3037"
+NAME="AEN3060"
 ></A
 ><H3
 ><A
@@ -450,7 +450,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3046"
+NAME="AEN3069"
 ></A
 ><P
 ></P
@@ -520,7 +520,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3063"
+NAME="AEN3086"
 ></A
 ><H3
 ><A
@@ -553,7 +553,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3071"
+NAME="AEN3094"
 ></A
 ><P
 ></P
@@ -606,7 +606,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3084"
+NAME="AEN3107"
 ></A
 ><H3
 ><A
@@ -641,7 +641,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3092"
+NAME="AEN3115"
 ></A
 ><P
 ></P
@@ -679,7 +679,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3101"
+NAME="AEN3124"
 ></A
 ><H3
 ><A
@@ -713,7 +713,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3109"
+NAME="AEN3132"
 ></A
 ><P
 ></P
@@ -768,7 +768,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3122"
+NAME="AEN3145"
 ></A
 ><H3
 ><A
@@ -802,7 +802,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3130"
+NAME="AEN3153"
 ></A
 ><P
 ></P
@@ -857,7 +857,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3143"
+NAME="AEN3166"
 ></A
 ><H3
 ><A
@@ -891,7 +891,7 @@ HREF="GLIST"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3151"
+NAME="AEN3174"
 ></A
 ><P
 ></P
@@ -946,7 +946,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3164"
+NAME="AEN3187"
 ></A
 ><H3
 ><A
@@ -980,7 +980,7 @@ HREF="gmime-internet-address.html#INTERNETADDRESS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3172"
+NAME="AEN3195"
 ></A
 ><P
 ></P
@@ -1035,7 +1035,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3185"
+NAME="AEN3208"
 ></A
 ><H3
 ><A
@@ -1066,7 +1066,7 @@ HREF="GCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3192"
+NAME="AEN3215"
 ></A
 ><P
 ></P
@@ -1119,7 +1119,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3205"
+NAME="AEN3228"
 ></A
 ><H3
 ><A
@@ -1156,7 +1156,7 @@ HREF="GBOOLEAN"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3214"
+NAME="AEN3237"
 ></A
 ><P
 ></P
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index ec739693..4e519d69 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -10,6 +10,7 @@
 <ANCHOR id ="G-MIME-HEADER-DESTROY" href="gmime/gmime-gmime-header.html#G-MIME-HEADER-DESTROY">
 <ANCHOR id ="G-MIME-HEADER-SET" href="gmime/gmime-gmime-header.html#G-MIME-HEADER-SET">
 <ANCHOR id ="G-MIME-HEADER-GET" href="gmime/gmime-gmime-header.html#G-MIME-HEADER-GET">
+<ANCHOR id ="G-MIME-HEADER-REMOVE" href="gmime/gmime-gmime-header.html#G-MIME-HEADER-REMOVE">
 <ANCHOR id ="G-MIME-HEADER-WRITE-TO-STRING" href="gmime/gmime-gmime-header.html#G-MIME-HEADER-WRITE-TO-STRING">
 <ANCHOR id ="G-MIME-HEADER-TO-STRING" href="gmime/gmime-gmime-header.html#G-MIME-HEADER-TO-STRING">
 <ANCHOR id ="G-MIME-HEADER-FOREACH" href="gmime/gmime-gmime-header.html#G-MIME-HEADER-FOREACH">
diff --git a/doc/sgml/gmime-content-type.sgml b/doc/sgml/gmime-content-type.sgml
index 08c7dd3d..d9f79b9b 100644
--- a/doc/sgml/gmime-content-type.sgml
+++ b/doc/sgml/gmime-content-type.sgml
@@ -1,4 +1,4 @@
-<refentry id="gmime-gmime-content-type" revision="13 Jun 2001">
+<refentry id="gmime-gmime-content-type" revision="23 Jun 2001">
 <refmeta>
 <refentrytitle>gmime-content-type</refentrytitle>
 <manvolnum>3</manvolnum>
diff --git a/doc/sgml/gmime-header.sgml b/doc/sgml/gmime-header.sgml
index ea33a773..6b34dde2 100644
--- a/doc/sgml/gmime-header.sgml
+++ b/doc/sgml/gmime-header.sgml
@@ -1,4 +1,4 @@
-<refentry id="gmime-gmime-header" revision="13 Jun 2001">
+<refentry id="gmime-gmime-header" revision="23 Jun 2001">
 <refmeta>
 <refentrytitle>gmime-header</refentrytitle>
 <manvolnum>3</manvolnum>
@@ -24,6 +24,8 @@ void        <link linkend="g-mime-header-set">g_mime_header_set</link>
                                              const <link linkend="gchar">gchar</link> *value);
 const <link linkend="gchar">gchar</link>* <link linkend="g-mime-header-get">g_mime_header_get</link>              (const <link linkend="GMimeHeader">GMimeHeader</link> *header,
                                              const <link linkend="gchar">gchar</link> *name);
+void        <link linkend="g-mime-header-remove">g_mime_header_remove</link>            (<link linkend="GMimeHeader">GMimeHeader</link> *header,
+                                             const <link linkend="gchar">gchar</link> *name);
 void        <link linkend="g-mime-header-write-to-string">g_mime_header_write_to_string</link>   (const <link linkend="GMimeHeader">GMimeHeader</link> *header,
                                              <link linkend="GString">GString</link> *string);
 <link linkend="gchar">gchar</link>*      <link linkend="g-mime-header-to-string">g_mime_header_to_string</link>         (const <link linkend="GMimeHeader">GMimeHeader</link> *header);
@@ -107,7 +109,7 @@ Destroy the header object</para>
 Set the value of the specified header. If <parameter>value</parameter> is <literal>NULL</literal> and the
 header, <parameter>name</parameter>, had not been previously set, a space will be set
 aside for it (useful for setting the order of headers before values
-can be obtained for them) otherwise the header will be removed.</para>
+can be obtained for them) otherwise the header will be unset.</para>
 <para>
 
 </para><informaltable pgwide=1 frame="none" role="params">
@@ -122,7 +124,7 @@ can be obtained for them) otherwise the header will be removed.</para>
 <entry> header name
 </entry></row>
 <row><entry align="right"><parameter>value</parameter>&nbsp;:</entry>
-<entry> header value (or <literal>NULL</literal> to remove header)
+<entry> header value
 </entry></row>
 </tbody></tgroup></informaltable></refsect2>
 <refsect2>
@@ -148,6 +150,26 @@ can be obtained for them) otherwise the header will be removed.</para>
 </entry></row>
 </tbody></tgroup></informaltable></refsect2>
 <refsect2>
+<title><anchor id="g-mime-header-remove">g_mime_header_remove ()</title>
+<programlisting>void        g_mime_header_remove            (<link linkend="GMimeHeader">GMimeHeader</link> *header,
+                                             const <link linkend="gchar">gchar</link> *name);</programlisting>
+<para>
+Remove the specified header</para>
+<para>
+
+</para><informaltable pgwide=1 frame="none" role="params">
+<tgroup cols="2">
+<colspec colwidth="2*">
+<colspec colwidth="8*">
+<tbody>
+<row><entry align="right"><parameter>header</parameter>&nbsp;:</entry>
+<entry> header object
+</entry></row>
+<row><entry align="right"><parameter>name</parameter>&nbsp;:</entry>
+<entry> header name
+</entry></row>
+</tbody></tgroup></informaltable></refsect2>
+<refsect2>
 <title><anchor id="g-mime-header-write-to-string">g_mime_header_write_to_string ()</title>
 <programlisting>void        g_mime_header_write_to_string   (const <link linkend="GMimeHeader">GMimeHeader</link> *header,
                                              <link linkend="GString">GString</link> *string);</programlisting>
diff --git a/doc/sgml/gmime-message.sgml b/doc/sgml/gmime-message.sgml
index b5fd00b2..ed90f9a1 100644
--- a/doc/sgml/gmime-message.sgml
+++ b/doc/sgml/gmime-message.sgml
@@ -1,4 +1,4 @@
-<refentry id="gmime-gmime-message" revision="13 Jun 2001">
+<refentry id="gmime-gmime-message" revision="23 Jun 2001">
 <refmeta>
 <refentrytitle>gmime-message</refentrytitle>
 <manvolnum>3</manvolnum>
diff --git a/doc/sgml/gmime-param.sgml b/doc/sgml/gmime-param.sgml
index 9a88f6da..9b65988c 100644
--- a/doc/sgml/gmime-param.sgml
+++ b/doc/sgml/gmime-param.sgml
@@ -1,4 +1,4 @@
-<refentry id="gmime-gmime-param" revision="13 Jun 2001">
+<refentry id="gmime-gmime-param" revision="23 Jun 2001">
 <refmeta>
 <refentrytitle>gmime-param</refentrytitle>
 <manvolnum>3</manvolnum>
diff --git a/doc/sgml/gmime-parser.sgml b/doc/sgml/gmime-parser.sgml
index c7c98d67..602ec0a8 100644
--- a/doc/sgml/gmime-parser.sgml
+++ b/doc/sgml/gmime-parser.sgml
@@ -1,4 +1,4 @@
-<refentry id="gmime-gmime-parser" revision="13 Jun 2001">
+<refentry id="gmime-gmime-parser" revision="23 Jun 2001">
 <refmeta>
 <refentrytitle>gmime-parser</refentrytitle>
 <manvolnum>3</manvolnum>
diff --git a/doc/sgml/gmime-part.sgml b/doc/sgml/gmime-part.sgml
index 874844f0..582ca54d 100644
--- a/doc/sgml/gmime-part.sgml
+++ b/doc/sgml/gmime-part.sgml
@@ -1,4 +1,4 @@
-<refentry id="gmime-gmime-part" revision="13 Jun 2001">
+<refentry id="gmime-gmime-part" revision="23 Jun 2001">
 <refmeta>
 <refentrytitle>gmime-part</refentrytitle>
 <manvolnum>3</manvolnum>
diff --git a/doc/sgml/gmime-utils.sgml b/doc/sgml/gmime-utils.sgml
index 4fc4d14f..ad877148 100644
--- a/doc/sgml/gmime-utils.sgml
+++ b/doc/sgml/gmime-utils.sgml
@@ -1,4 +1,4 @@
-<refentry id="gmime-gmime-utils" revision="13 Jun 2001">
+<refentry id="gmime-gmime-utils" revision="23 Jun 2001">
 <refmeta>
 <refentrytitle>gmime-utils</refentrytitle>
 <manvolnum>3</manvolnum>
diff --git a/doc/sgml/internet-address.sgml b/doc/sgml/internet-address.sgml
index 41847230..761a2a17 100644
--- a/doc/sgml/internet-address.sgml
+++ b/doc/sgml/internet-address.sgml
@@ -1,4 +1,4 @@
-<refentry id="gmime-internet-address" revision="13 Jun 2001">
+<refentry id="gmime-internet-address" revision="23 Jun 2001">
 <refmeta>
 <refentrytitle>internet-address</refentrytitle>
 <manvolnum>3</manvolnum>
diff --git a/gmime-header.c b/gmime-header.c
index 47b6afbe..0fa14c67 100644
--- a/gmime-header.c
+++ b/gmime-header.c
@@ -131,12 +131,12 @@ g_mime_header_foreach (const GMimeHeader *header, GMimeHeaderFunc func, gpointer
  * g_mime_header_set:
  * @header: header object
  * @name: header name
- * @value: header value (or %NULL to remove header)
+ * @value: header value
  *
  * Set the value of the specified header. If @value is %NULL and the
  * header, @name, had not been previously set, a space will be set
  * aside for it (useful for setting the order of headers before values
- * can be obtained for them) otherwise the header will be removed.
+ * can be obtained for them) otherwise the header will be unset.
  **/
 void
 g_mime_header_set (GMimeHeader *header, const gchar *name, const gchar *value)
@@ -147,27 +147,11 @@ g_mime_header_set (GMimeHeader *header, const gchar *name, const gchar *value)
 	g_return_if_fail (name != NULL);
 	
 	if ((h = g_hash_table_lookup (header->hash, name))) {
-		if (value) {
-			g_free (h->value);
+		g_free (h->value);
+		if (value)
 			h->value = g_mime_utils_8bit_header_encode (value);
-		} else {
-			/* remove the header */
-			g_hash_table_remove (header->hash, name);
-			n = header->headers;
-			
-			if (h == n) {
-				header->headers = h->next;
-			} else {
-				while (n->next != h)
-					n = n->next;
-				
-				n->next = h->next;
-			}
-			
-			g_free (h->name);
-			g_free (h->value);
-			g_free (h);
-		}
+		else
+			h->value = NULL;
 	} else {
 		n = g_new (struct raw_header, 1);
 		n->next = NULL;
@@ -207,6 +191,42 @@ g_mime_header_get (const GMimeHeader *header, const gchar *name)
 
 
 /**
+ * g_mime_header_remove:
+ * @header: header object
+ * @name: header name
+ *
+ * Remove the specified header
+ **/
+void
+g_mime_header_remove (GMimeHeader *header, const gchar *name)
+{
+	struct raw_header *h, *n;
+	
+	g_return_if_fail (header != NULL);
+	g_return_if_fail (name != NULL);
+	
+	if ((h = g_hash_table_lookup (header->hash, name))) {
+		/* remove the header */
+		g_hash_table_remove (header->hash, name);
+		n = header->headers;
+		
+		if (h == n) {
+			header->headers = h->next;
+		} else {
+			while (n->next != h)
+				n = n->next;
+			
+			n->next = h->next;
+		}
+		
+		g_free (h->name);
+		g_free (h->value);
+		g_free (h);
+	}
+}
+
+
+/**
  * g_mime_header_write_to_string:
  * @header: header object
  * @string: string
diff --git a/gmime-header.h b/gmime-header.h
index 8d64a378..6bde32a7 100644
--- a/gmime-header.h
+++ b/gmime-header.h
@@ -44,6 +44,8 @@ void g_mime_header_set (GMimeHeader *header, const gchar *name, const gchar *val
 
 const gchar *g_mime_header_get (const GMimeHeader *header, const gchar *name);
 
+void g_mime_header_remove (GMimeHeader *header, const gchar *name);
+
 void g_mime_header_write_to_string (const GMimeHeader *header, GString *string);
 
 gchar *g_mime_header_to_string (const GMimeHeader *header);
diff --git a/gmime-message.c b/gmime-message.c
index b55039c9..cc426d74 100644
--- a/gmime-message.c
+++ b/gmime-message.c
@@ -143,12 +143,17 @@ g_mime_message_destroy (GMimeMessage *message)
 void
 g_mime_message_set_sender (GMimeMessage *message, const gchar *sender)
 {
+	GMimeMessageHeader *header;
+	
 	g_return_if_fail (message != NULL);
 	
-	if (message->header->from)
-		g_free (message->header->from);
+	header = message->header;
+	
+	if (header->from)
+		g_free (header->from);
 	
-	message->header->from = g_strdup (sender);
+	header->from = g_strstrip (g_strdup (sender));
+	g_mime_header_set (header->headers, "From", header->from);
 }
 
 
@@ -177,12 +182,17 @@ g_mime_message_get_sender (GMimeMessage *message)
 void
 g_mime_message_set_reply_to (GMimeMessage *message, const gchar *reply_to)
 {
+	GMimeMessageHeader *header;
+	
 	g_return_if_fail (message != NULL);
 	
-	if (message->header->reply_to)
-		g_free (message->header->reply_to);
+	header = message->header;
 	
-	message->header->reply_to = g_strdup (reply_to);
+	if (header->reply_to)
+		g_free (header->reply_to);
+	
+	header->reply_to = g_strstrip (g_strdup (reply_to));
+	g_mime_header_set (header->headers, "Reply-To", header->reply_to);
 }
 
 
@@ -201,6 +211,37 @@ g_mime_message_get_reply_to (GMimeMessage *message)
 }
 
 
+static void
+sync_recipient_header (GMimeMessage *message, const gchar *type)
+{
+	GList *recipients;
+	
+	/* sync the specified recipient header */
+	recipients = g_mime_message_get_recipients (message, type);
+	if (recipients) {
+		GString *recip;
+		
+		recip = g_string_new ("");
+		while (recipients) {
+			InternetAddress *ia;
+			gchar *address;
+			
+			ia = recipients->data;
+			address = internet_address_to_string (ia, TRUE);
+			g_string_append (recip, address);
+			g_free (address);
+			
+			recipients = recipients->next;
+			if (recipients)
+				g_string_append (recip, ", ");
+		}
+		
+		g_mime_header_set (message->header->headers, type, recip->str);
+		g_string_free (recip, TRUE);
+	} else
+		g_mime_header_set (message->header->headers, type, NULL);
+}
+
 /**
  * g_mime_message_add_recipient: Add a recipient
  * @message: MIME Message to change
@@ -225,6 +266,7 @@ g_mime_message_add_recipient (GMimeMessage *message, gchar *type, const gchar *n
 	
 	recipients = g_list_append (recipients, ia);
 	g_hash_table_insert (message->header->recipients, type, recipients);
+	sync_recipient_header (message, type);
 }
 
 
@@ -256,6 +298,8 @@ g_mime_message_add_recipients_from_string (GMimeMessage *message, gchar *type, c
 		recipients = g_list_concat (recipients, addrlist);
 	
 	g_hash_table_insert (message->header->recipients, type, recipients);
+	
+	sync_recipient_header (message, type);
 }
 
 
@@ -288,12 +332,17 @@ g_mime_message_get_recipients (GMimeMessage *message, const gchar *type)
 void
 g_mime_message_set_subject (GMimeMessage *message, const gchar *subject)
 {
+	GMimeMessageHeader *header;
+	
 	g_return_if_fail (message != NULL);
 	
-	if (message->header->subject)
-		g_free (message->header->subject);
+	header = message->header;
+	
+	if (header->subject)
+		g_free (header->subject);
 	
-	message->header->subject = g_strdup (subject);
+	header->subject = g_strstrip (g_strdup (subject));
+	g_mime_header_set (header->headers, "Subject", header->subject);
 }
 
 
@@ -323,10 +372,16 @@ g_mime_message_get_subject (GMimeMessage *message)
 void
 g_mime_message_set_date (GMimeMessage *message, time_t date, int gmt_offset)
 {
+	gchar *date_str;
+	
 	g_return_if_fail (message != NULL);
 	
 	message->header->date = date;
 	message->header->gmt_offset = gmt_offset;
+	
+	date_str = g_mime_message_get_date_string (message);
+	g_mime_header_set (message->header->headers, "Date", date_str);
+	g_free (date_str);
 }
 
 
@@ -387,11 +442,17 @@ g_mime_message_get_date_string (GMimeMessage *message)
 void
 g_mime_message_set_message_id (GMimeMessage *message, const gchar *id)
 {
+	GMimeMessageHeader *header;
+	
 	g_return_if_fail (message != NULL);
 	
-	if (message->header->message_id)
-		g_free (message->header->message_id);
-	message->header->message_id = g_strdup (id);
+	header = message->header;
+	
+	if (header->message_id)
+		g_free (header->message_id);
+	
+	header->message_id = g_strstrip (g_strdup (id));
+	g_mime_header_set (header->headers, "Message-Id", header->message_id);
 }
 
 
@@ -463,83 +524,6 @@ g_mime_message_set_mime_part (GMimeMessage *message, GMimePart *mime_part)
 }
 
 
-static void
-sync_headers (GMimeMessage *message)
-{
-	GString *string;
-	gchar *str, *date;
-	GList *recipients;
-	
-	/* sync the Date header */
-	if (!message->header->date)
-		g_mime_message_set_date (message, time (NULL), 0);
-	date = g_mime_message_get_date_string (message);
-	g_mime_header_set (message->header->headers, "Date", date);
-	g_free (date);
-	
-	/* sync the From header */
-	g_mime_header_set (message->header->headers, "From",
-			   message->header->from ? message->header->from : "");
-	
-	/* sync the Reply-To header */
-	g_mime_header_set (message->header->headers, "Reply-To", message->header->reply_to);
-	
-	/* sync the To header */
-	recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
-	if (recipients) {
-		GString *recip;
-		
-		recip = g_string_new ("");
-		while (recipients) {
-			InternetAddress *ia;
-			gchar *address;
-			
-			ia = recipients->data;
-			address = internet_address_to_string (ia, TRUE);
-			g_string_append (recip, address);
-			g_free (address);
-			
-			recipients = recipients->next;
-			if (recipients)
-				g_string_append (recip, ", ");
-		}
-		
-		g_mime_header_set (message->header->headers, "To", recip->str);
-		g_string_free (recip, TRUE);
-	}
-	
-	/* sync the Cc header */
-	recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
-	if (recipients) {
-		GString *recip;
-		
-		recip = g_string_new ("");
-		while (recipients) {
-			InternetAddress *ia;
-			gchar *address;
-			
-			ia = recipients->data;
-			address = internet_address_to_string (ia, TRUE);
-			g_string_append (recip, address);
-			g_free (address);
-			
-			recipients = recipients->next;
-			if (recipients)
-				g_string_append (recip, ", ");
-		}
-		
-		g_mime_header_set (message->header->headers, "Cc", recip->str);
-		g_string_free (recip, TRUE);
-	}
-	
-	/* sync the Subject header */
-	g_mime_header_set (message->header->headers, "Subject", message->header->subject);
-	
-	/* sync the Message-Id header */
-	g_mime_header_set (message->header->headers, "Message-Id", message->header->message_id);
-}
-
-
 /**
  * g_mime_message_write_to_string: Write the MIME Message to a string
  * @message: MIME Message
@@ -553,7 +537,6 @@ g_mime_message_write_to_string (GMimeMessage *message, GString *string)
 	g_return_if_fail (message != NULL);
 	g_return_if_fail (string != NULL);
 	
-	sync_headers (message);
 	g_mime_header_write_to_string (message->header->headers, string);
 	
 	if (message->mime_part)
@@ -720,7 +703,6 @@ g_mime_message_get_headers (GMimeMessage *message)
 {
 	g_return_val_if_fail (message != NULL, NULL);
 	
-	sync_headers (message);
 	return g_mime_header_to_string (message->header->headers);
 }
 
diff --git a/gmime/gmime-header.c b/gmime/gmime-header.c
index 47b6afbe..0fa14c67 100644
--- a/gmime/gmime-header.c
+++ b/gmime/gmime-header.c
@@ -131,12 +131,12 @@ g_mime_header_foreach (const GMimeHeader *header, GMimeHeaderFunc func, gpointer
  * g_mime_header_set:
  * @header: header object
  * @name: header name
- * @value: header value (or %NULL to remove header)
+ * @value: header value
  *
  * Set the value of the specified header. If @value is %NULL and the
  * header, @name, had not been previously set, a space will be set
  * aside for it (useful for setting the order of headers before values
- * can be obtained for them) otherwise the header will be removed.
+ * can be obtained for them) otherwise the header will be unset.
  **/
 void
 g_mime_header_set (GMimeHeader *header, const gchar *name, const gchar *value)
@@ -147,27 +147,11 @@ g_mime_header_set (GMimeHeader *header, const gchar *name, const gchar *value)
 	g_return_if_fail (name != NULL);
 	
 	if ((h = g_hash_table_lookup (header->hash, name))) {
-		if (value) {
-			g_free (h->value);
+		g_free (h->value);
+		if (value)
 			h->value = g_mime_utils_8bit_header_encode (value);
-		} else {
-			/* remove the header */
-			g_hash_table_remove (header->hash, name);
-			n = header->headers;
-			
-			if (h == n) {
-				header->headers = h->next;
-			} else {
-				while (n->next != h)
-					n = n->next;
-				
-				n->next = h->next;
-			}
-			
-			g_free (h->name);
-			g_free (h->value);
-			g_free (h);
-		}
+		else
+			h->value = NULL;
 	} else {
 		n = g_new (struct raw_header, 1);
 		n->next = NULL;
@@ -207,6 +191,42 @@ g_mime_header_get (const GMimeHeader *header, const gchar *name)
 
 
 /**
+ * g_mime_header_remove:
+ * @header: header object
+ * @name: header name
+ *
+ * Remove the specified header
+ **/
+void
+g_mime_header_remove (GMimeHeader *header, const gchar *name)
+{
+	struct raw_header *h, *n;
+	
+	g_return_if_fail (header != NULL);
+	g_return_if_fail (name != NULL);
+	
+	if ((h = g_hash_table_lookup (header->hash, name))) {
+		/* remove the header */
+		g_hash_table_remove (header->hash, name);
+		n = header->headers;
+		
+		if (h == n) {
+			header->headers = h->next;
+		} else {
+			while (n->next != h)
+				n = n->next;
+			
+			n->next = h->next;
+		}
+		
+		g_free (h->name);
+		g_free (h->value);
+		g_free (h);
+	}
+}
+
+
+/**
  * g_mime_header_write_to_string:
  * @header: header object
  * @string: string
diff --git a/gmime/gmime-header.h b/gmime/gmime-header.h
index 8d64a378..6bde32a7 100644
--- a/gmime/gmime-header.h
+++ b/gmime/gmime-header.h
@@ -44,6 +44,8 @@ void g_mime_header_set (GMimeHeader *header, const gchar *name, const gchar *val
 
 const gchar *g_mime_header_get (const GMimeHeader *header, const gchar *name);
 
+void g_mime_header_remove (GMimeHeader *header, const gchar *name);
+
 void g_mime_header_write_to_string (const GMimeHeader *header, GString *string);
 
 gchar *g_mime_header_to_string (const GMimeHeader *header);
diff --git a/gmime/gmime-message.c b/gmime/gmime-message.c
index b55039c9..cc426d74 100644
--- a/gmime/gmime-message.c
+++ b/gmime/gmime-message.c
@@ -143,12 +143,17 @@ g_mime_message_destroy (GMimeMessage *message)
 void
 g_mime_message_set_sender (GMimeMessage *message, const gchar *sender)
 {
+	GMimeMessageHeader *header;
+	
 	g_return_if_fail (message != NULL);
 	
-	if (message->header->from)
-		g_free (message->header->from);
+	header = message->header;
+	
+	if (header->from)
+		g_free (header->from);
 	
-	message->header->from = g_strdup (sender);
+	header->from = g_strstrip (g_strdup (sender));
+	g_mime_header_set (header->headers, "From", header->from);
 }
 
 
@@ -177,12 +182,17 @@ g_mime_message_get_sender (GMimeMessage *message)
 void
 g_mime_message_set_reply_to (GMimeMessage *message, const gchar *reply_to)
 {
+	GMimeMessageHeader *header;
+	
 	g_return_if_fail (message != NULL);
 	
-	if (message->header->reply_to)
-		g_free (message->header->reply_to);
+	header = message->header;
 	
-	message->header->reply_to = g_strdup (reply_to);
+	if (header->reply_to)
+		g_free (header->reply_to);
+	
+	header->reply_to = g_strstrip (g_strdup (reply_to));
+	g_mime_header_set (header->headers, "Reply-To", header->reply_to);
 }
 
 
@@ -201,6 +211,37 @@ g_mime_message_get_reply_to (GMimeMessage *message)
 }
 
 
+static void
+sync_recipient_header (GMimeMessage *message, const gchar *type)
+{
+	GList *recipients;
+	
+	/* sync the specified recipient header */
+	recipients = g_mime_message_get_recipients (message, type);
+	if (recipients) {
+		GString *recip;
+		
+		recip = g_string_new ("");
+		while (recipients) {
+			InternetAddress *ia;
+			gchar *address;
+			
+			ia = recipients->data;
+			address = internet_address_to_string (ia, TRUE);
+			g_string_append (recip, address);
+			g_free (address);
+			
+			recipients = recipients->next;
+			if (recipients)
+				g_string_append (recip, ", ");
+		}
+		
+		g_mime_header_set (message->header->headers, type, recip->str);
+		g_string_free (recip, TRUE);
+	} else
+		g_mime_header_set (message->header->headers, type, NULL);
+}
+
 /**
  * g_mime_message_add_recipient: Add a recipient
  * @message: MIME Message to change
@@ -225,6 +266,7 @@ g_mime_message_add_recipient (GMimeMessage *message, gchar *type, const gchar *n
 	
 	recipients = g_list_append (recipients, ia);
 	g_hash_table_insert (message->header->recipients, type, recipients);
+	sync_recipient_header (message, type);
 }
 
 
@@ -256,6 +298,8 @@ g_mime_message_add_recipients_from_string (GMimeMessage *message, gchar *type, c
 		recipients = g_list_concat (recipients, addrlist);
 	
 	g_hash_table_insert (message->header->recipients, type, recipients);
+	
+	sync_recipient_header (message, type);
 }
 
 
@@ -288,12 +332,17 @@ g_mime_message_get_recipients (GMimeMessage *message, const gchar *type)
 void
 g_mime_message_set_subject (GMimeMessage *message, const gchar *subject)
 {
+	GMimeMessageHeader *header;
+	
 	g_return_if_fail (message != NULL);
 	
-	if (message->header->subject)
-		g_free (message->header->subject);
+	header = message->header;
+	
+	if (header->subject)
+		g_free (header->subject);
 	
-	message->header->subject = g_strdup (subject);
+	header->subject = g_strstrip (g_strdup (subject));
+	g_mime_header_set (header->headers, "Subject", header->subject);
 }
 
 
@@ -323,10 +372,16 @@ g_mime_message_get_subject (GMimeMessage *message)
 void
 g_mime_message_set_date (GMimeMessage *message, time_t date, int gmt_offset)
 {
+	gchar *date_str;
+	
 	g_return_if_fail (message != NULL);
 	
 	message->header->date = date;
 	message->header->gmt_offset = gmt_offset;
+	
+	date_str = g_mime_message_get_date_string (message);
+	g_mime_header_set (message->header->headers, "Date", date_str);
+	g_free (date_str);
 }
 
 
@@ -387,11 +442,17 @@ g_mime_message_get_date_string (GMimeMessage *message)
 void
 g_mime_message_set_message_id (GMimeMessage *message, const gchar *id)
 {
+	GMimeMessageHeader *header;
+	
 	g_return_if_fail (message != NULL);
 	
-	if (message->header->message_id)
-		g_free (message->header->message_id);
-	message->header->message_id = g_strdup (id);
+	header = message->header;
+	
+	if (header->message_id)
+		g_free (header->message_id);
+	
+	header->message_id = g_strstrip (g_strdup (id));
+	g_mime_header_set (header->headers, "Message-Id", header->message_id);
 }
 
 
@@ -463,83 +524,6 @@ g_mime_message_set_mime_part (GMimeMessage *message, GMimePart *mime_part)
 }
 
 
-static void
-sync_headers (GMimeMessage *message)
-{
-	GString *string;
-	gchar *str, *date;
-	GList *recipients;
-	
-	/* sync the Date header */
-	if (!message->header->date)
-		g_mime_message_set_date (message, time (NULL), 0);
-	date = g_mime_message_get_date_string (message);
-	g_mime_header_set (message->header->headers, "Date", date);
-	g_free (date);
-	
-	/* sync the From header */
-	g_mime_header_set (message->header->headers, "From",
-			   message->header->from ? message->header->from : "");
-	
-	/* sync the Reply-To header */
-	g_mime_header_set (message->header->headers, "Reply-To", message->header->reply_to);
-	
-	/* sync the To header */
-	recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
-	if (recipients) {
-		GString *recip;
-		
-		recip = g_string_new ("");
-		while (recipients) {
-			InternetAddress *ia;
-			gchar *address;
-			
-			ia = recipients->data;
-			address = internet_address_to_string (ia, TRUE);
-			g_string_append (recip, address);
-			g_free (address);
-			
-			recipients = recipients->next;
-			if (recipients)
-				g_string_append (recip, ", ");
-		}
-		
-		g_mime_header_set (message->header->headers, "To", recip->str);
-		g_string_free (recip, TRUE);
-	}
-	
-	/* sync the Cc header */
-	recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
-	if (recipients) {
-		GString *recip;
-		
-		recip = g_string_new ("");
-		while (recipients) {
-			InternetAddress *ia;
-			gchar *address;
-			
-			ia = recipients->data;
-			address = internet_address_to_string (ia, TRUE);
-			g_string_append (recip, address);
-			g_free (address);
-			
-			recipients = recipients->next;
-			if (recipients)
-				g_string_append (recip, ", ");
-		}
-		
-		g_mime_header_set (message->header->headers, "Cc", recip->str);
-		g_string_free (recip, TRUE);
-	}
-	
-	/* sync the Subject header */
-	g_mime_header_set (message->header->headers, "Subject", message->header->subject);
-	
-	/* sync the Message-Id header */
-	g_mime_header_set (message->header->headers, "Message-Id", message->header->message_id);
-}
-
-
 /**
  * g_mime_message_write_to_string: Write the MIME Message to a string
  * @message: MIME Message
@@ -553,7 +537,6 @@ g_mime_message_write_to_string (GMimeMessage *message, GString *string)
 	g_return_if_fail (message != NULL);
 	g_return_if_fail (string != NULL);
 	
-	sync_headers (message);
 	g_mime_header_write_to_string (message->header->headers, string);
 	
 	if (message->mime_part)
@@ -720,7 +703,6 @@ g_mime_message_get_headers (GMimeMessage *message)
 {
 	g_return_val_if_fail (message != NULL, NULL);
 	
-	sync_headers (message);
 	return g_mime_header_to_string (message->header->headers);
 }