--- orig/rfc822.c	Tue Jul 13 10:14:32 1999+++ imap/src/c-client/rfc822.c	Tue Sep 12 15:51:20 2000@@ -109,6 +109,29 @@  *	    message body  */ +/*MAHOGANY: BEGIN OF PATCH: added the next block */+static char **rfc822_extraheaders_names = NULL;+static char **rfc822_extraheaders_values = NULL;++void rfc822_setextraheaders(const char **names, const char **values)+{+   rfc822_extraheaders_names = names;+   rfc822_extraheaders_values = values;+}++void rfc822_extraheaders_lines (char **header,ENVELOPE *env)+{+   char **names = rfc822_extraheaders_names;+   char **values = rfc822_extraheaders_values;+   while(names && *names && values && *values)+      sprintf ((*header += strlen (*header)),"%s%s: %s\015\012",+               env->remail ? "ReSent-" : "",+               *(names++),+               *(values++)+         );+}+/*MAHOGANY: END OF PATCH */+ void rfc822_header (char *header,ENVELOPE *env,BODY *body) {   if (env->remail) {		/* if remailing */@@ -135,6 +158,10 @@   rfc822_header_line (&header,"Message-ID",env,env->message_id);   rfc822_header_line (&header,"Followup-to",env,env->followup_to);   rfc822_header_line (&header,"References",env,env->references);++/*MAHOGANY: added this call:*/+  rfc822_extraheaders_lines (&header,env);+     if (body && !env->remail) {	/* not if remail or no body structure */     strcat (header,"MIME-Version: 1.0\015\012");     rfc822_write_body_header (&header,body);@@ -204,12 +231,23 @@ 	if (adr->next && adr->next->mailbox) strcat (dest,", ");       }     }++/*MAHOGANY: commented out the following bit as it caused problems:*/+#if 0+    /* commented out: */     else if (adr->mailbox) {	/* start of group? */ 				/* yes, write group name */       rfc822_cat (dest,adr->mailbox,rspecials);       strcat (dest,": ");	/* write group identifier */       n++;			/* in a group */     }+#else+    /* my replacement (KB): */+    else if (adr->mailbox) {	/* start of group? */+				/* yes, write group name */+      rfc822_cat (dest,adr->mailbox,rspecials);+    }+#endif     else if (n) {		/* must be end of group (but be paranoid) */       strcat (dest,";"); 				/* no longer in that group */@@ -246,6 +284,9 @@       strcat (dest,"@");	/* host delimiter */       strcat (dest,adr->host);	/* write host name */     }+  }+  else if(adr && adr->mailbox) {+    rfc822_cat (dest,adr->mailbox,wspecials);   } } --- orig/rfc822.h	Tue Jul 13 10:14:44 1999+++ imap/src/c-client/rfc822.h	Tue Sep 12 15:49:24 2000@@ -99,3 +99,4 @@ 			      unsigned long *len); unsigned char *rfc822_8bit (unsigned char *src,unsigned long srcl, 			    unsigned long *len);+void rfc822_setextraheaders(const char **names, const char **values);