diff --git a/mozilla/lib/mailto/Makefile b/mozilla/lib/mailto/Makefile
new file mode 100644
index 00000000000..18942322b99
--- /dev/null
+++ b/mozilla/lib/mailto/Makefile
@@ -0,0 +1,90 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH		= ../..
+
+MODULE		= mailto
+LIBRARY_NAME	= mailto
+
+CSRCS	= \
+	ad_strm.c \
+	ap_decod.c \
+	ap_encod.c \
+	appledbl.c \
+	bh_strm.c \
+	m_binhex.c \
+	msgutils.c \
+	$(NULL)
+
+
+CPPSRCS	= \
+	addrutil.cpp \
+	bytearr.cpp \
+	dwordarr.cpp \
+	mhtmlstm.cpp \
+	msgbg.cpp \
+	msgcflds.cpp \
+	msgcpane.cpp \
+	msgglue.cpp \
+	msgmast.cpp \
+	msgmdn.cpp \
+	msgpane.cpp \
+	msgppane.cpp \
+	msgprefs.cpp \
+	msgsend.cpp \
+	msgsendp.cpp \
+	msgurlq.cpp \
+	msgzap.cpp \
+	ptrarray.cpp \
+	$(NULL)
+# We'd like to include msgdlqml.cpp eventually (deliver queued mail)
+
+
+EXPORTS = \
+	ad_codes.h \
+	appledbl.h \
+	bytearr.h \
+	dwordarr.h \
+	errcode.h \
+	error.h \
+	m_binhex.h \
+	mhtmlstm.h \
+	msg.h \
+	msgcflds.h \
+	msgcpane.h \
+	msghdr.h \
+	msgmast.h \
+	msgmdn.h \
+	msgpane.h \
+	msgppane.h \
+	msgprefs.h \
+	msgprnot.h \
+	msgsend.h \
+	msgsendp.h \
+	msgutils.h \
+	msgzap.h \
+	ptrarray.h \
+	$(NULL)
+
+REQUIRES	= nspr htmldlgs img util layer pref security js java net progress network
+
+
+include $(DEPTH)/config/rules.mk
+
+# INCLUDES	+= -I$(DIST)/include -I$(PUBLIC)/security -I../libaddr -I$(PUBLIC)/msg
diff --git a/mozilla/lib/mailto/ad_codes.h b/mozilla/lib/mailto/ad_codes.h
new file mode 100644
index 00000000000..5c9301bd860
--- /dev/null
+++ b/mozilla/lib/mailto/ad_codes.h
@@ -0,0 +1,129 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+**	AD_Codes.h
+**
+**	---------------
+**
+**		Head file for Apple Decode/Encode enssential codes.
+**
+**
+*/
+
+#ifndef ad_codes_h
+#define ad_codes_h
+
+#include "xp_core.h"
+
+/*
+** applefile definitions used 
+*/
+#ifdef XP_MAC
+#if PRAGMA_ALIGN_SUPPORTED
+#pragma options align=mac68k
+#endif
+#endif /* XP_MAC */
+
+#define APPLESINGLE_MAGIC	0x00051600L
+#define APPLEDOUBLE_MAGIC 	0x00051607L
+#define VERSION 			0x00020000
+
+#define NUM_ENTRIES 		6
+
+#define ENT_DFORK   		1L
+#define ENT_RFORK   		2L
+#define ENT_NAME    		3L
+#define ENT_COMMENT 		4L
+#define ENT_DATES   		8L
+#define ENT_FINFO   		9L
+#define CONVERT_TIME 		1265437696L
+
+/*
+** data type used in the encoder/decoder.
+*/
+typedef struct ap_header 
+{
+	int32 	magic;
+	int32	version;
+	char 	fill[16];
+	int16 	entries;
+
+} ap_header;
+
+typedef struct ap_entry 
+{
+	uint32  id;
+	uint32	offset;
+	uint32	length;
+	
+} ap_entry;
+
+typedef struct ap_dates 
+{
+	int32 create, modify, backup, access;
+
+} ap_dates;
+
+typedef struct myFInfo			/* the mac FInfo structure for the cross platform. */
+{	
+	int32	fdType, fdCreator;
+	int16	fdFlags;
+	int32	fdLocation;			/* it really should  be a pointer, but just a place-holder  */
+	int16	fdFldr;	
+
+}	myFInfo;
+
+XP_BEGIN_PROTOS
+/*
+**	string utils.
+*/
+int write_stream(appledouble_encode_object *p_ap_encode_obj,char *s,int	 len);
+
+int fill_apple_mime_header(appledouble_encode_object *p_ap_encode_obj);
+int ap_encode_file_infor(appledouble_encode_object *p_ap_encode_obj);
+int ap_encode_header(appledouble_encode_object* p_ap_encode_obj, XP_Bool firstTime);
+int ap_encode_data(  appledouble_encode_object* p_ap_encode_obj, XP_Bool firstTime);
+
+/*
+**	the prototypes for the ap_decoder.
+*/
+int  fetch_a_line(appledouble_decode_object* p_ap_decode_obj, char *buff);
+int  ParseFileHeader(appledouble_decode_object* p_ap_decode_obj);
+int  ap_seek_part_start(appledouble_decode_object* p_ap_decode_obj);
+void parse_param(char *p, char **param, char**define, char **np);
+int  ap_seek_to_boundary(appledouble_decode_object* p_ap_decode_obj, XP_Bool firstime);
+int  ap_parse_header(appledouble_decode_object* p_ap_decode_obj,XP_Bool firstime);
+int  ap_decode_file_infor(appledouble_decode_object* p_ap_decode_obj);
+int  ap_decode_process_header(appledouble_decode_object* p_ap_decode_obj, XP_Bool firstime);
+int  ap_decode_process_data(  appledouble_decode_object* p_ap_decode_obj, XP_Bool firstime);
+
+#ifdef XP_MAC
+OSErr my_FSSpecFromPathname(char* src_filename, FSSpec* fspec);
+char* my_PathnameFromFSSpec(FSSpec* fspec);
+
+#endif
+ XP_END_PROTOS
+ 
+#ifdef XP_MAC
+#if PRAGMA_ALIGN_SUPPORTED
+#pragma options align=reset
+#endif
+#endif /* XP_MAC */
+
+#endif /* ad_codes_h */
diff --git a/mozilla/lib/mailto/ad_strm.c b/mozilla/lib/mailto/ad_strm.c
new file mode 100644
index 00000000000..46118bc11ab
--- /dev/null
+++ b/mozilla/lib/mailto/ad_strm.c
@@ -0,0 +1,719 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/**
+*	Apple Double encode/decode stream
+*	----------------------------------
+*
+*		11sep95		mym		created.
+*/
+
+#include "msg.h"
+#include "appledbl.h"
+#include "m_binhex.h"
+#include "m_cvstrm.h"
+#include "ad_codes.h"
+/* for XP_GetString() */
+#include "xpgetstr.h"
+
+extern int MK_MSG_SAVE_ATTACH_AS;
+
+#ifdef XP_MAC
+#pragma warn_unusedarg off
+
+extern int MK_UNABLE_TO_OPEN_TMP_FILE;
+extern int MK_MIME_ERROR_WRITING_FILE;
+
+/*	---------------------------------------------------------------------------------
+**
+**		The codes for Apple-double encoding stream. --- it's only useful on Mac OS
+**
+**	---------------------------------------------------------------------------------
+*/
+
+#define WORKING_BUFF_SIZE	8192
+
+typedef struct	_AppledoubleEncodeObject
+{
+	appledouble_encode_object	ap_encode_obj;
+	
+	char*	buff;							/*	the working buff.					*/
+	int32	s_buff;							/*	the working buff size.				*/
+
+	XP_File	fp;								/*  file to hold the encoding			*/
+	char	*fname;							/*	and the file name.					*/
+	
+} AppleDoubleEncodeObject;
+
+/*
+	Let's go "l" characters forward of the encoding for this write.
+	Note:	
+		"s" is just a dummy paramter. 
+ */
+PRIVATE int 
+net_AppleDouble_Encode_Write (
+	void *stream, const char* s, int32 l)
+{
+	int  status = 0;
+	AppleDoubleEncodeObject * obj = (AppleDoubleEncodeObject*)stream;
+	int32 count, size;	
+			
+	while (l > 0)
+	{
+		size = obj->s_buff * 11 / 16;
+		size = MIN(l, size);
+		status = ap_encode_next(&(obj->ap_encode_obj), 
+							obj->buff, 
+							size, 
+							&count);
+		if (status == noErr || status == errDone)
+		{
+			/*
+			 * we get the encode data, so call the next stream to write it to the disk.
+			 */
+			if (XP_FileWrite(obj->buff, count, obj->fp) != count)
+				return errFileWrite;
+		}
+		
+		if (status != noErr ) 							/* abort when error	/ done?		*/
+			break;
+			
+		l -= size;
+	}
+	return status;
+}
+
+/*
+** is the stream ready for writing?
+ */
+PRIVATE unsigned int net_AppleDouble_Encode_Ready (void *stream)
+{	
+   return(MAX_WRITE_READY);  						/* always ready for writing 	*/ 
+}
+
+
+PRIVATE void net_AppleDouble_Encode_Complete (void *stream)
+{
+	AppleDoubleEncodeObject * obj = (AppleDoubleEncodeObject*)stream;	
+
+    ap_encode_end(&(obj->ap_encode_obj), false);	/* this is a normal ending 		*/
+ 	
+ 	if (obj->fp)
+ 	{
+    	XP_FileClose(obj->fp);						/* done with the target file	*/
+
+        FREEIF(obj->fname);							/* and the file name too		*/
+    }
+								
+    FREEIF(obj->buff);								/* free the working buff.		*/
+    XP_FREE(obj);
+}
+
+PRIVATE void net_AppleDouble_Encode_Abort (void *stream, int status)
+{
+	AppleDoubleEncodeObject * obj = (AppleDoubleEncodeObject*)stream;	
+	
+    ap_encode_end(&(obj->ap_encode_obj), true);		/* it is an aborting exist... 	*/
+
+ 	if (obj->fp)
+ 	{   
+ 		XP_FileClose(obj->fp);
+
+        XP_FileRemove (obj->fname, xpURL);			/* remove the partial file.		*/
+        
+        FREEIF(obj->fname);
+	}
+    FREEIF(obj->buff);								/* free the working buff.		*/
+    XP_FREE(obj);
+}
+
+/*
+**	fe_MakeAppleDoubleEncodeStream
+**	------------------------------
+**
+**	Will create a apple double encode stream:
+**
+**		-> take the filename as the input source (it needs to be a mac file.)
+**		-> take a file name for the temp file we are generating.
+*/
+
+PUBLIC NET_StreamClass * 
+fe_MakeAppleDoubleEncodeStream (int  format_out,
+                         void       *data_obj,
+                         URL_Struct *URL_s,
+                         MWContext  *window_id,
+                         char*		src_filename,
+                         char* 		dst_filename,
+                         char*		separator)
+{
+    AppleDoubleEncodeObject* obj;
+    NET_StreamClass* 	  stream;
+    char*				  working_buff = NULL;
+	int					  bSize = WORKING_BUFF_SIZE;
+    
+    TRACEMSG(("Setting up apple encode stream. Have URL: %s\n", URL_s->address));
+
+    stream = XP_NEW(NET_StreamClass);
+    if(stream == NULL) 
+        return(NULL);
+
+    obj = XP_NEW(AppleDoubleEncodeObject);
+    if (obj == NULL) 
+    {
+        XP_FREE (stream);
+        return(NULL);
+    }
+   
+	while (!working_buff && (bSize >= 512))
+	{
+   		working_buff = (char *)XP_ALLOC(bSize);
+		if (!working_buff)
+			bSize /= 2;
+	}
+   	if (working_buff == NULL)
+   	{
+   		XP_FREE (obj);
+   		XP_FREE (stream);
+		return (NULL);
+   	}
+  	
+    stream->name           = "Apple Double Encode";
+    stream->complete       = (MKStreamCompleteFunc) 	net_AppleDouble_Encode_Complete;
+    stream->abort          = (MKStreamAbortFunc) 		net_AppleDouble_Encode_Abort;
+    stream->put_block      = (MKStreamWriteFunc) 		net_AppleDouble_Encode_Write;
+    stream->is_write_ready = (MKStreamWriteReadyFunc) 	net_AppleDouble_Encode_Ready;
+    stream->data_object    = obj;
+    stream->window_id      = window_id;
+
+	obj->fp  = XP_FileOpen(dst_filename, xpFileToPost, XP_FILE_WRITE_BIN);
+	if (obj->fp == NULL)
+	{
+		XP_FREE (working_buff);
+   		XP_FREE (obj);
+   		XP_FREE (stream);
+		return (NULL);
+	}
+	
+	obj->fname = XP_STRDUP(dst_filename);
+	 
+	obj->buff	= working_buff;
+	obj->s_buff = bSize;
+	
+	/*
+	** 	setup all the need information on the apple double encoder.
+	*/
+	ap_encode_init(&(obj->ap_encode_obj), 
+					src_filename,					/* pass the file name of the source.	*/
+					separator);
+					
+    TRACEMSG(("Returning stream from NET_AppleDoubleEncoder\n"));
+
+    return stream;
+}
+#endif
+
+/*
+**	---------------------------------------------------------------------------------
+**
+**		The codes for the Apple sigle/double decoding.
+**
+**	---------------------------------------------------------------------------------
+*/
+typedef	struct AppleDoubleDecodeObject
+{
+	appledouble_decode_object	ap_decode_obj;
+	
+	char*	in_buff;						/* the temporary buff to accumulate  	*/
+											/* the input, make sure the call to  	*/
+											/* the dedcoder engine big enough buff 	*/
+	int32	bytes_in_buff;					/* the count for the temporary buff.	*/
+	
+    NET_StreamClass*	binhex_stream;		/* a binhex encode stream to convert 	*/
+    										/* the decoded mac file to binhex.		*/
+    										
+} AppleDoubleDecodeObject;
+
+PRIVATE int
+net_AppleDouble_Decode_Write (
+	void *stream, const char* s, int32 l)
+{
+	int 	status = NOERR;
+	AppleDoubleDecodeObject * obj = (AppleDoubleDecodeObject*) stream;
+	int32	size;	
+
+	/*
+	**	To force an effecient decoding, we should	
+	**  make sure that the buff pass to the decode next is great than 1024 bytes.
+	*/
+	if (obj->bytes_in_buff + l > 1024)
+	{
+		size = 1024 - obj->bytes_in_buff;
+		XP_MEMCPY(obj->in_buff+obj->bytes_in_buff, 
+					s, 
+					size);
+		s += size;
+		l -= size;
+		
+		status = ap_decode_next(&(obj->ap_decode_obj), 
+					obj->in_buff, 
+					1024);
+		obj->bytes_in_buff = 0;
+	}
+	
+	if (l > 1024)
+	{
+		/* we are sure that obj->bytes_in_buff == 0 at this point. */
+		status = ap_decode_next(&(obj->ap_decode_obj), 
+					(char *)s, 
+					l);		
+	}
+	else
+	{
+		/* and we are sure we will not get overflow with the buff. */ 
+		XP_MEMCPY(obj->in_buff+obj->bytes_in_buff, 
+					s, 
+					l);
+		obj->bytes_in_buff += l;
+	}
+	return status;
+}
+
+PRIVATE unsigned int 
+net_AppleDouble_Decode_Ready (NET_StreamClass *stream)
+{	
+   return(MAX_WRITE_READY); 	 						/* always ready for writing 	*/ 
+}
+
+
+PRIVATE void 
+net_AppleDouble_Decode_Complete (void *stream)
+{
+	AppleDoubleDecodeObject *obj = (AppleDoubleDecodeObject *)stream;	
+	
+	if (obj->bytes_in_buff)
+	{
+		
+		ap_decode_next(&(obj->ap_decode_obj), 			/* do the last calls.			*/
+				(char *)obj->in_buff,
+				obj->bytes_in_buff);
+		obj->bytes_in_buff = 0;
+	}
+
+    ap_decode_end(&(obj->ap_decode_obj), FALSE);		/* it is a normal clean up cases.*/
+
+	if (obj->binhex_stream)
+		XP_FREE(obj->binhex_stream);
+	
+	if (obj->in_buff)
+		XP_FREE(obj->in_buff);
+		
+	XP_FREE(obj);
+}
+
+PRIVATE void 
+net_AppleDouble_Decode_Abort (
+	void *stream, int status)
+{
+	AppleDoubleDecodeObject *obj = (AppleDoubleDecodeObject *)stream;	
+
+	ap_decode_end(&(obj->ap_decode_obj), TRUE);			/* it is an abort. 				*/
+	
+	if (obj->binhex_stream)
+		XP_FREE(obj->binhex_stream);
+	
+	if (obj->in_buff)
+		XP_FREE(obj->in_buff);
+		
+	XP_FREE(obj);
+}
+
+
+/*
+**	fe_MakeAppleDoubleDecodeStream_1
+**	---------------------------------
+**	
+**		Create the apple double decode stream.
+**
+**		In the Mac OS, it will create a stream to decode to an apple file;
+**
+**		In other OS,  the stream will decode apple double object, 
+**					  then encode it in binhex format, and save to the file.
+*/
+#ifndef XP_MAC
+static void
+simple_copy(MWContext* context, char* saveName, void* closure)
+{
+	/* just copy the filename to the closure, so the caller can get it.	*/
+	XP_STRCPY(closure, saveName);
+}
+#endif
+
+PUBLIC NET_StreamClass * 
+fe_MakeAppleDoubleDecodeStream_1 (int  format_out,
+                         void       *data_obj,
+                         URL_Struct *URL_s,
+                         MWContext  *window_id)
+{
+#ifdef XP_MAC
+	return fe_MakeAppleDoubleDecodeStream(format_out, 
+						data_obj, 
+						URL_s, 
+						window_id, 
+						false,
+						NULL);
+#else
+
+#if 0		/* just a test in the mac OS	*/
+	NET_StreamClass *p;
+	char*	url; 
+	StandardFileReply	reply;
+		
+	StandardPutFile("\pSave binhex encoded file as:", "\pUntitled", &reply);
+	if (!reply.sfGood) 
+	{
+		return NULL;
+	}
+	url = my_PathnameFromFSSpec(&(reply.sfFile));
+	
+	p = fe_MakeAppleDoubleDecodeStream(format_out, 
+						data_obj, 
+						URL_s, 
+						window_id, 
+						true,
+						url+7);
+	XP_FREE(url);
+	return (p);
+
+#else	/* for the none mac-os to get a file name */
+
+	NET_StreamClass *p;
+	char* filename;
+	
+	filename = XP_ALLOC(1024);
+	if (filename == NULL)
+		return NULL;
+
+	if (FE_PromptForFileName(window_id, 
+				XP_GetString(MK_MSG_SAVE_ATTACH_AS),
+				0,
+				FALSE,
+				FALSE,
+				simple_copy,
+				filename) == -1)
+	{
+		return	NULL;
+	}
+	
+	p = fe_MakeAppleDoubleDecodeStream(format_out, 
+						data_obj, 
+						URL_s, 
+						window_id, 
+						TRUE,
+						filename);
+	XP_FREE(filename);
+	return (p);	
+
+#endif
+	
+#endif
+}
+
+                    
+PUBLIC NET_StreamClass * 
+fe_MakeAppleDoubleDecodeStream (int  format_out,
+                         void       *data_obj,
+                         URL_Struct *URL_s,
+                         MWContext  *window_id,
+                         XP_Bool	write_as_binhex,
+                         char 		*dst_filename)	
+{
+    AppleDoubleDecodeObject* obj;
+    NET_StreamClass* 	  stream;
+    
+    TRACEMSG(("Setting up apple double decode stream. Have URL: %s\n", URL_s->address));
+
+    stream = XP_NEW(NET_StreamClass);
+    if(stream == NULL) 
+        return(NULL);
+
+    obj = XP_NEW(AppleDoubleDecodeObject);
+    if (obj == NULL)
+    {
+    	XP_FREE(stream);
+        return(NULL);
+    }
+    
+    stream->name           = "AppleDouble Decode";
+    stream->complete       = (MKStreamCompleteFunc) 	net_AppleDouble_Decode_Complete;
+    stream->abort          = (MKStreamAbortFunc) 		net_AppleDouble_Decode_Abort;
+    stream->put_block      = (MKStreamWriteFunc) 		net_AppleDouble_Decode_Write;
+    stream->is_write_ready = (MKStreamWriteReadyFunc) 	net_AppleDouble_Decode_Ready;
+    stream->data_object    = obj;
+    stream->window_id      = window_id;
+
+	/*
+	** setup all the need information on the apple double encoder.
+	*/
+	obj->in_buff = (char *)XP_ALLOC(1024);
+	if (obj->in_buff == NULL)
+	{
+		XP_FREE(obj);
+		XP_FREE(stream);
+		return (NULL);
+	}
+	
+	obj->bytes_in_buff = 0;
+	
+	if (write_as_binhex)
+	{
+		obj->binhex_stream = 
+			fe_MakeBinHexEncodeStream(format_out,
+							data_obj,
+							URL_s,
+							window_id,
+							dst_filename);
+		if (obj->binhex_stream == NULL)
+		{
+			XP_FREE(obj);
+			XP_FREE(stream);
+			XP_FREE(obj->in_buff);
+			return NULL;
+		}
+		
+		ap_decode_init(&(obj->ap_decode_obj), 
+							FALSE,
+							TRUE, 
+							obj->binhex_stream);		
+	}
+	else
+	{
+		obj->binhex_stream = NULL;
+		ap_decode_init(&(obj->ap_decode_obj), 
+							FALSE,
+							FALSE, 
+							window_id);
+		/*
+		 * jt 8/8/97 -- I think this should be set to true. But'
+		 * let's not touch it for now.
+		 *
+		 * obj->ap_decode_obj.is_binary = TRUE;
+		 */
+	}
+
+	if (dst_filename) 
+	{
+		XP_STRNCPY_SAFE(obj->ap_decode_obj.fname, dst_filename, 
+						sizeof(obj->ap_decode_obj.fname));
+	}
+	#ifdef XP_MAC		
+	obj->ap_decode_obj.mSpec = (FSSpec*)( URL_s->fe_data );
+	#endif
+    TRACEMSG(("Returning stream from NET_AppleDoubleDecode\n"));
+
+    return stream;
+}
+
+/*
+**	fe_MakeAppleSingleDecodeStream_1
+**	--------------------------------
+**	
+**		Create the apple single decode stream.
+**
+**		In the Mac OS, it will create a stream to decode object to an apple file;
+**
+**		In other OS,  the stream will decode apple single object, 
+**					  then encode context in binhex format, and save to the file.
+*/
+
+PUBLIC NET_StreamClass * 
+fe_MakeAppleSingleDecodeStream_1 (int  format_out,
+                         void       *data_obj,
+                         URL_Struct *URL_s,
+                         MWContext  *window_id)
+{
+#ifdef XP_MAC
+	return fe_MakeAppleSingleDecodeStream(format_out, 
+						data_obj, 
+						URL_s, 
+						window_id, 
+						FALSE,
+						NULL);
+#else
+
+#if 0		/* just a test in the mac OS	*/
+	NET_StreamClass *p;
+	char*	url; 
+	StandardFileReply	reply;
+		
+	StandardPutFile("\pSave binhex encoded file as:", "\pUntitled", &reply);
+	if (!reply.sfGood) 
+	{
+		return NULL;
+	}
+	url = my_PathnameFromFSSpec(&(reply.sfFile));
+	
+	p = fe_MakeAppleSingleDecodeStream(format_out, 
+						data_obj, 
+						URL_s, 
+						window_id, 
+						true,
+						url+7);
+	XP_FREE(url);
+	return (p);
+
+#else	/* for the none mac-os to get a file name */
+
+	NET_StreamClass *p;
+	char* filename;
+	char* defaultPath = 0;
+
+	defaultPath = URL_s->content_name;
+
+#ifdef XP_WIN16
+	if (XP_FileNameContainsBadChars(defaultPath))
+		defaultPath = 0;
+#endif
+	
+	filename = XP_ALLOC(1024);
+	if (filename == NULL)
+		return NULL;
+
+	if (FE_PromptForFileName(window_id, 
+				XP_GetString(MK_MSG_SAVE_ATTACH_AS),
+				defaultPath,
+				FALSE,
+				FALSE,
+				simple_copy,
+				filename) == -1)
+	{
+		return	NULL;
+	}
+	
+	p = fe_MakeAppleSingleDecodeStream(format_out, 
+						data_obj, 
+						URL_s, 
+						window_id, 
+						FALSE,
+						filename);
+	XP_FREE(filename);
+	return (p);	
+
+#endif
+
+#endif
+}
+
+/*
+**	Create the Apple Doube Decode stream.
+**
+*/
+PUBLIC NET_StreamClass * 
+fe_MakeAppleSingleDecodeStream (int  format_out,
+                         void       *data_obj,
+                         URL_Struct *URL_s,
+                         MWContext  *window_id,
+                         XP_Bool	write_as_binhex,
+                         char 		*dst_filename)	
+{
+    AppleDoubleDecodeObject* obj;
+    NET_StreamClass* 	  stream;
+    int encoding = kEncodeNone; /* default is that we don't know the encoding */
+    
+    TRACEMSG(("Setting up apple single decode stream. Have URL: %s\n", URL_s->address));
+
+    stream = XP_NEW(NET_StreamClass);
+    if(stream == NULL) 
+        return(NULL);
+
+    obj = XP_NEW(AppleDoubleDecodeObject);
+    if (obj == NULL)
+    {
+    	XP_FREE(stream);
+        return(NULL);
+    }
+    
+    stream->name           = "AppleSingle Decode";
+    stream->complete       = (MKStreamCompleteFunc) 	net_AppleDouble_Decode_Complete;
+    stream->abort          = (MKStreamAbortFunc) 		net_AppleDouble_Decode_Abort;
+    stream->put_block      = (MKStreamWriteFunc) 		net_AppleDouble_Decode_Write;
+    stream->is_write_ready = (MKStreamWriteReadyFunc) 	net_AppleDouble_Decode_Ready;
+    stream->data_object    = obj;
+    stream->window_id      = window_id;
+
+	/*
+	** setup all the need information on the apple double encoder.
+	*/
+	obj->in_buff = (char *)XP_ALLOC(1024);
+	if (obj->in_buff == NULL)
+	{
+		XP_FREE(obj);
+		XP_FREE(stream);
+		return (NULL);
+	}
+	
+	obj->bytes_in_buff = 0;
+	
+	if (write_as_binhex)
+	{
+		obj->binhex_stream = 
+			fe_MakeBinHexEncodeStream(format_out,
+							data_obj,
+							URL_s,
+							window_id,
+							dst_filename);
+		if (obj->binhex_stream == NULL)
+		{
+			XP_FREE(obj);
+			XP_FREE(stream);
+			XP_FREE(obj->in_buff);
+			return NULL;
+		}
+		
+		ap_decode_init(&(obj->ap_decode_obj), 
+							TRUE,
+							TRUE, 
+							obj->binhex_stream);		
+	}
+	else
+	{
+		obj->binhex_stream = NULL;
+		ap_decode_init(&(obj->ap_decode_obj), 
+							TRUE,
+							FALSE, 
+							window_id);
+#ifndef XP_MAC
+		obj->ap_decode_obj.is_binary = TRUE;
+#endif
+	}
+
+	if (dst_filename) 
+	{
+		XP_STRNCPY_SAFE(obj->ap_decode_obj.fname, dst_filename, 
+						sizeof(obj->ap_decode_obj.fname));
+	}
+	/* If we are of a broken content-type, impose its encoding. */
+	if (URL_s->content_type 
+		&& !XP_STRNCASECMP(URL_s->content_type, "x-uuencode-apple-single", 23))
+		obj->ap_decode_obj.encoding = kEncodeUU;
+	else
+		obj->ap_decode_obj.encoding = kEncodeNone;
+
+    TRACEMSG(("Returning stream from NET_AppleSingleDecode\n"));
+
+    return stream;
+}
diff --git a/mozilla/lib/mailto/addrutil.cpp b/mozilla/lib/mailto/addrutil.cpp
new file mode 100644
index 00000000000..7c777d69e84
--- /dev/null
+++ b/mozilla/lib/mailto/addrutil.cpp
@@ -0,0 +1,1607 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*    addrutil.cpp --- parsing RFC822 addresses.
+ */
+
+#include "msg.h"
+#include "msgprefs.h"
+
+#undef FREEIF
+#define FREEIF(obj) do { if (obj) { XP_FREE (obj); obj = 0; }} while (0)
+
+extern "C"
+{
+	extern int MK_OUT_OF_MEMORY;
+}
+
+static int msg_quote_phrase_or_addr (char *address, int32 length,
+									 XP_Bool addr_p);
+static int msg_parse_rfc822_addresses (const char *line,
+							char **names,
+							char **addresses,
+							XP_Bool quote_names_p,
+							XP_Bool quote_addrs_p,
+							XP_Bool first_only_p);
+
+
+/* Given a string which contains a list of RFC822 addresses, parses it into
+   their component names and mailboxes.
+
+   The returned value is the number of addresses, or a negative error code;
+   the names and addresses are returned into the provided pointers as
+   consecutive null-terminated strings.  It is up to the caller to free them.
+   Note that some of the strings may be zero-length.
+
+   Either of the provided pointers may be NULL if the caller is not interested
+   in those components.
+
+   quote_names_p and quote_addrs_p control whether the returned strings should
+   be quoted as RFC822 entities, or returned in a more human-presentable (but
+   not necessarily parsable) form.
+
+   If first_only_p is true, then only the first element of the list is
+   returned; we don't bother parsing the rest.
+ */
+int
+msg_parse_rfc822_addresses (const char *line,
+							char **names,
+							char **addresses,
+							XP_Bool quote_names_p,
+							XP_Bool quote_addrs_p,
+							XP_Bool first_only_p)
+{
+  uint32 addr_count = 0;
+  uint32 line_length;
+  const char *line_end;
+  const char *this_start;
+  char *name_buf = 0, *name_out, *name_start;
+  char *addr_buf = 0, *addr_out, *addr_start;
+  XP_ASSERT (line);
+  if (! line)
+	return -1;
+  if (names)
+	*names = 0;
+  if (addresses)
+	*addresses = 0;
+  line_length = XP_STRLEN (line);
+  if (line_length == 0)
+	return 0;
+
+  name_buf = (char *) XP_ALLOC (line_length * 2 + 10);
+  if (! name_buf)
+	return MK_OUT_OF_MEMORY;
+
+  addr_buf = (char *) XP_ALLOC (line_length * 2 + 10);
+  if (! addr_buf)
+	{
+	  FREEIF (name_buf);
+	  return MK_OUT_OF_MEMORY;
+	}
+
+  line_end = line;
+  addr_out = addr_buf;
+  name_out = name_buf;
+  name_start = name_buf;
+  addr_start = addr_buf;
+  this_start = line;
+  
+  /* Skip over extra whitespace or commas before addresses. */
+  while (*line_end &&
+		 (XP_IS_SPACE (*line_end) || *line_end == ','))
+	line_end++;
+
+  while (*line_end)
+	{
+	  uint32 paren_depth = 0;
+	  const char *oparen = 0;
+	  const char *mailbox_start = 0;
+	  const char *mailbox_end = 0;
+
+  	  while (*line_end &&
+			 !(*line_end == ',' &&
+			   paren_depth <= 0 &&  /* comma is ok inside () */
+			   (!mailbox_start || mailbox_end))) /* comma is ok inside <> */
+		{
+		  if (*line_end == '\\')
+			{
+			  line_end++;
+			  if (!*line_end)	/* otherwise, we walk off end of line, right? */
+				  break;
+			}
+		  else if (*line_end == '"') 
+			{
+			  int leave_quotes = 0;
+
+			  line_end++;  /* remove open " */
+
+			  /* handle '"John.Van Doe"@space.com' case */
+			  if (paren_depth == 0 && !mailbox_start)
+			    {
+				  char *end_quote = strchr(line_end, '"');
+				  char *mailbox   = end_quote ? strchr(end_quote, '<') : (char *)NULL,
+					   *comma     = end_quote ? strchr(end_quote, ',') : (char *)NULL;
+				  if (!mailbox || (comma && comma < mailbox))
+				    {
+
+					  leave_quotes = 1; /* no mailbox for this address */
+					  *addr_out++ = '"';
+				    }
+			    }
+
+			  while (*line_end)
+				{
+				  if (*line_end == '\\')
+				  {
+					if (   paren_depth == 0
+					    && (*(line_end+1) == '\\' || *(line_end+1) == '"'))
+						*addr_out++ = *line_end++;
+					else
+						line_end++;
+				  }
+				  else if (*line_end == '"')
+					break;
+
+				  if (paren_depth == 0)
+					*addr_out++ = *line_end;
+
+				  line_end++;
+				}
+			  if (*line_end) line_end++;  /* remove close " */
+			  if (leave_quotes) *addr_out++ = '"';
+			  continue;
+			}
+
+		  if (*line_end == '(')
+			{
+			  if (paren_depth == 0)
+				oparen = line_end;
+			  paren_depth++;
+			}
+		  else if (*line_end == '<' && paren_depth == 0)
+			{
+			  mailbox_start = line_end;
+			}
+		  else if (*line_end == '>' && mailbox_start && paren_depth == 0)
+			{
+			  mailbox_end = line_end;
+			}
+		  else if (*line_end == ')' && paren_depth > 0)
+			{
+			  paren_depth--;
+			  if (paren_depth == 0)
+				{
+				  const char *s = oparen + 1;
+				  /* Copy the characters inside the parens onto the
+					 "name" buffer. */
+
+				  /* Push out some whitespace before the paren, if
+					 there is non-whitespace there already. */
+				  if (name_out > name_start &&
+					  !XP_IS_SPACE (name_out [-1]))
+					*name_out++ = ' ';
+
+				  /* Skip leading whitespace. */
+				  while (XP_IS_SPACE (*s) && s < line_end)
+					s++;
+
+				  while (s < line_end)
+					{
+					  if (*s == '\"')
+						{
+						  /* Strip out " within () unless backslashed */
+						  s++;
+						  continue;
+						}
+
+					  if (*s == '\\')	/* remove one \ */
+						s++;
+
+					  if (XP_IS_SPACE (*s) &&
+						  name_out > name_start &&
+						  XP_IS_SPACE (name_out[-1]))
+						/* collapse consecutive whitespace */;
+					  else
+						*name_out++ = *s;
+
+					  s++;
+					}
+				  oparen = 0;
+				}
+			}
+		  else
+			{
+			  /* If we're not inside parens or a <mailbox>, tack this
+				 on to the end of the addr_buf. */
+			  if (paren_depth == 0 &&
+				  (!mailbox_start || mailbox_end))
+				{
+				  /* Eat whitespace at the beginning of the line,
+					 and eat consecutive whitespace within the line. */
+				  if (XP_IS_SPACE (*line_end) &&
+					  (addr_out == addr_start ||
+					   XP_IS_SPACE (addr_out[-1])))
+					/* skip it */;
+				  else
+					*addr_out++ = *line_end;
+				}
+			}
+
+		  line_end++;
+		}
+
+	  /* Now we have extracted a single address from the comma-separated
+		 list of addresses.  The characters have been divided among the
+		 various buffers: the parts inside parens have been placed in the
+		 name_buf, and everything else has been placed in the addr_buf.
+		 Quoted strings and backslashed characters have been `expanded.'
+
+		 If there was a <mailbox> spec in it, we have remembered where it was.
+		 Copy that on to the addr_buf, replacing what was there, and copy the
+		 characters not inside <> onto the name_buf, replacing what is there
+		 now (which was just the parenthesized parts.)  (And we need to do the
+		 quote and backslash hacking again, since we're coming from the
+		 original source.)
+
+		 Otherwise, we're already done - the addr_buf and name_buf contain
+		 the right data already (de-quoted.)
+	   */
+	  if (mailbox_end)
+		{
+		  const char *s;
+		  XP_ASSERT (*mailbox_start == '<');
+		  XP_ASSERT (*mailbox_end == '>');
+
+		  /* First, copy the name.
+		   */
+		  name_out = name_start;
+		  s = this_start;
+		  /* Skip leading whitespace. */
+		  while (XP_IS_SPACE (*s) && s < mailbox_start)
+			s++;
+		  /* Copy up to (not including) the < */
+		  while (s < mailbox_start)
+			{
+			  if (*s == '\"')
+				{
+				  s++;
+				  continue;
+				}
+			  if (*s == '\\')
+			    {
+				  if (s + 1 < mailbox_start && (*(s+1) == '\\' || *(s+1) == '\"'))
+				    *name_out++ = *s++;
+				  else
+					s++;
+				}
+			  if (XP_IS_SPACE (*s) &&
+				  name_out > name_start &&
+				  XP_IS_SPACE (name_out[-1]))
+				/* collapse consecutive whitespace */;
+			  else
+				*name_out++ = *s;
+			  s++;
+			}
+		  /* Trim trailing whitespace. */
+		  while (name_out > name_start && XP_IS_SPACE (name_out[-1]))
+			name_out--;
+		  /* Push out one space. */
+		  *name_out++ = ' ';
+		  s = mailbox_end+1;
+		  /* Skip whitespace after > */
+		  while (XP_IS_SPACE (*s) && s < line_end)
+			s++;
+		  /* Copy from just after > to the end. */
+		  while (s < line_end)
+			{
+			  if (*s == '\"')
+				{
+				  s++;
+				  continue;
+				}
+			  if (*s == '\\')
+			    {
+				  if (s + 1 < line_end && (*(s+1) == '\\' || *(s+1) == '\"'))
+				    *name_out++ = *s++;
+				  else
+					s++;
+				}
+			  if (XP_IS_SPACE (*s) &&
+				  name_out > name_start &&
+				  XP_IS_SPACE (name_out[-1]))
+				/* collapse consecutive whitespace */;
+			  else
+				*name_out++ = *s;
+			  s++;
+			}
+		  /* Trim trailing whitespace. */
+		  while (name_out > name_start && XP_IS_SPACE (name_out[-1]))
+			name_out--;
+		  /* null-terminate. */
+		  *name_out++ = 0;
+
+		  /* Now, copy the address.
+		   */
+		  mailbox_start++;
+		  addr_out = addr_start;
+		  s = mailbox_start;
+		  /* Skip leading whitespace. */
+		  while (XP_IS_SPACE (*s) && s < mailbox_end)
+			s++;
+		  /* Copy up to (not including) the > */
+		  while (s < mailbox_end)
+			{
+			  if (*s == '\"')
+				{
+				  s++;
+				  continue;
+				}
+			  if (*s == '\\')
+			    {
+				  if (s + 1 < mailbox_end && (*(s+1) == '\\' || *(s+1) == '\"'))
+				    *addr_out++ = *s++;
+				  else
+					s++;
+				}
+			  *addr_out++ = *s++;
+			}
+		  /* Trim trailing whitespace. */
+		  while (addr_out > addr_start && XP_IS_SPACE (addr_out[-1]))
+			addr_out--;
+		  /* null-terminate. */
+		  *addr_out++ = 0;
+		}
+	  else  /* No component of <mailbox> form. */
+		{
+		  /* Trim trailing whitespace. */
+		  while (addr_out > addr_start && XP_IS_SPACE (addr_out[-1]))
+			addr_out--;
+		  /* null-terminate. */
+		  *addr_out++ = 0;
+
+		  /* Trim trailing whitespace. */
+		  while (name_out > name_start && XP_IS_SPACE (name_out[-1]))
+			name_out--;
+		  /* null-terminate. */
+		  *name_out++ = 0;
+
+		  /* Attempt to deal with the simple error case of a missing comma.
+			 We can only really deal with this in the non-<> case.
+			 If there is no name, and if the address doesn't contain
+			 double-quotes, but the address does contain whitespace,
+			 then assume that the whitespace is an address delimiter.
+		   */
+		  if (!name_start || !*name_start)
+			{
+			  char *s;
+			  char *space = 0;
+			  for (s = addr_start; s < addr_out; s++)
+				if (*s == '\\')
+				  s++;
+				else if (!space && XP_IS_SPACE (*s))
+				  space = s;
+				else if (*s == '"')
+				  {
+					space = 0;
+					break;
+				  }
+			  if (space)
+				{
+				  for (s = space; s < addr_out; s++)
+					if (*s == '\\')
+					  s++;
+					else if (XP_IS_SPACE (*s))
+					  {
+						*s = 0;
+						*name_out++ = 0;
+						addr_count++;
+					  }
+				}
+			}
+		}
+
+	  /* Now re-quote the names and addresses if necessary.
+	   */
+	  if (quote_names_p && names)
+		{
+		  int L = name_out - name_start - 1;
+		  L = msg_quote_phrase_or_addr (name_start, L, FALSE);
+		  name_out = name_start + L + 1;
+		}
+
+	  if (quote_addrs_p && addresses)
+		{
+		  int L = addr_out - addr_start - 1;
+		  L = msg_quote_phrase_or_addr (addr_start, L, TRUE);
+		  addr_out = addr_start + L + 1;
+		}
+
+	  addr_count++;
+
+	  if (first_only_p)
+		/* If we only want the first address, we can stop now. */
+		break;
+
+	  if (*line_end)
+		line_end++;
+
+	  /* Skip over extra whitespace or commas between addresses. */
+	  while (*line_end &&
+			 (XP_IS_SPACE (*line_end) || *line_end == ','))
+		line_end++;
+
+	  this_start = line_end;
+	  name_start = name_out;
+	  addr_start = addr_out;
+	}
+
+  /* Make one more pass through and convert all whitespace characters
+	 to SPC.  We could do that in the first pass, but this is simpler. */
+  {
+	char *s;
+	for (s = name_buf; s < name_out; s++)
+	  if (XP_IS_SPACE (*s) && *s != ' ')
+		*s = ' ';
+	for (s = addr_buf; s < addr_out; s++)
+	  if (XP_IS_SPACE (*s) && *s != ' ')
+		*s = ' ';
+  }
+
+  /* #### Should we bother realloc'ing them smaller? */
+
+  if (names)
+	*names = name_buf;
+  else
+	XP_FREE (name_buf);
+
+  if (addresses)
+	*addresses = addr_buf;
+  else
+	XP_FREE (addr_buf);
+
+  return addr_count;
+}
+
+
+extern "C" int
+MSG_ParseRFC822Addresses (const char *line,
+						  char **names,
+						  char **addresses)
+{
+  return msg_parse_rfc822_addresses(line, names, addresses, TRUE, TRUE, FALSE);
+}
+
+
+
+/* Given a single mailbox, this quotes the characters in it which need
+   to be quoted; it writes into `address' and returns a new length.
+   `address' is assumed to be long enough; worst case, its size will
+   be (N*2)+2.
+ */
+static int
+msg_quote_phrase_or_addr (char *address, int32 length, XP_Bool addr_p)
+{
+    int quotable_count = 0, in_quote = 0;
+    int unquotable_count = 0;
+    int32 i, new_length;
+    char *in, *out;
+    XP_Bool atsign = FALSE;
+	XP_Bool user_quote = FALSE;
+
+    /* If the entire address is quoted, fall out now. */
+    if (address[0] == '"' && address[length - 1] == '"')
+	    return length;
+
+    for (i = 0, in = address; i < length; i++, in++)
+    {
+        if (*in == 0)
+            return length; /* #### horrible kludge... */
+
+        else if (addr_p && *in == '@' && !atsign && !in_quote)
+		{
+            /* Exactly one unquoted at-sign is allowed in an address. */
+            atsign = TRUE;
+
+			/* If address is of the form '"userid"@somewhere.com' don't quote
+			 * the quotes around 'userid'.  Also reset the quotable count, since
+			 * any quotables we've seen are already inside quotes.
+			 */
+			if (address[0] == '"' && in > address + 2 && *(in - 1) == '"' && *(in - 2) != '\\')
+				unquotable_count -= 2, quotable_count = 0, user_quote = TRUE;
+		}
+
+        else if (*in == '\\')
+        {
+            if (i + 1 < length && (*(in + 1) == '\\' || *(in + 1) == '"'))
+                /* If the next character is a backslash or quote, this backslash */
+                /* is an escape backslash; ignore it and the next character.     */
+                i++, in++;
+            else
+                /* If the name contains backslashes or quotes, they must be escaped. */
+                unquotable_count++;
+        }
+
+        else if (*in == '"')
+            /* If the name contains quotes, they must be escaped. */
+            unquotable_count++, in_quote = !in_quote;
+
+        else if (   *in >= 127 || *in < 0
+		         || *in == '[' || *in == ']' || *in == '(' || *in == ')'
+                 || *in == '<' || *in == '>' || *in == '@' || *in == ','
+                 || *in == ';' || *in == '$') 
+            /* If the name contains control chars or RFC822 specials, it needs to
+             * be enclosed in quotes.  Double-quotes and backslashes will be dealt
+             * with seperately.
+             *
+             * The ":" character is explicitly not in this list, though RFC822 says
+             * it should be quoted, because that has been seen to break VMS
+             * systems.  (Rather, it has been seen that there are Unix SMTP servers
+             * which accept RCPT TO:<host::user> but not RCPT TO:<"host::user"> or
+             * RCPT TO:<host\:\:user>, which is the syntax that VMS/DECNET hosts
+             * use.
+             *
+             * For future reference: it is also claimed that some VMS SMTP servers
+             * allow \ quoting but not "" quoting; and that sendmail uses self-
+             * contradcitory quoting conventions that violate both RFCs 821 and
+             * 822, so any address quoting on a sendmail system will lose badly.
+             */
+            quotable_count++;
+
+        else if (addr_p && *in == ' ')
+            /* Naked spaces are allowed in names, but not addresses. */
+            quotable_count++;
+
+        else if (   !addr_p
+		         && (*in == '.' || *in == '!' || *in == '$' || *in == '%'))
+            /* Naked dots are allowed in addresses, but not in names.
+             * The other characters (!$%) are technically allowed in names, but
+             * are surely going to cause someone trouble, so we quote them anyway.
+             */
+            quotable_count++;
+    }
+
+    if (quotable_count == 0 && unquotable_count == 0)
+        return length;
+
+    /* Add 2 to the length for the quotes, plus one for each character
+     * which will need a backslash as well.
+     */
+    new_length = length + unquotable_count + 2;
+
+    /* Now walk through the string backwards (so that we can use the same
+     * block.)  First put on the terminating quote, then push out each
+     * character, backslashing as necessary.  Then a final quote.
+     * Uh, except, put the second quote just before the last @ if there
+     * is one.
+     */
+    out = address + new_length - 1;
+    in = address + length - 1;
+    if (!atsign || (user_quote && quotable_count > 0))
+        *out-- = '"';
+    while (out > address)
+    {
+        XP_ASSERT(in >= address);
+
+		if (*in == '@' && user_quote && quotable_count > 0)
+			*out-- = '"';
+
+        *out-- = *in;
+
+        if (*in == '@' && atsign && !user_quote)
+        {
+			*out-- = '"';
+			atsign = FALSE;
+        }
+        else if (*in == '\\' || *in == '"')
+        {
+			if (   user_quote && *in == '"'
+				&& (   in == address
+				    || (   in < address + length - 1 && in > address
+					    && *(in + 1) == '@' && *(in - 1) != '\\')))
+				/* Do nothing */;
+		    else if (in > address && *(in - 1) == '\\')
+			    *out-- = *--in;
+			else
+			{
+                XP_ASSERT(out > address);
+                *out-- = '\\';
+			}
+        }
+        in--;
+    }
+    XP_ASSERT(in == address - 1 || (user_quote && in == address));
+    XP_ASSERT(out == address);
+	*out = '"';
+    address[new_length] = 0;
+    return new_length;
+}
+
+/* Given a name or address that might have been quoted
+ it will take out the escape and double quotes
+ The caller is responsible for freeing the resulting
+ string.
+ */
+extern "C" int
+MSG_UnquotePhraseOrAddr (char *line, char** lineout)
+{
+	int outlen = 0;
+	char *lineptr = NULL;
+	char *tmpLine = NULL;
+	char *outptr = NULL;
+	int result = 0;
+
+	(*lineout) = NULL;
+	if (line) {
+		/* if the first character isnt a double quote
+		  then there is nothing to do */
+		if (*line != '"')
+		{
+			(*lineout) = XP_STRDUP (line);
+			if (!lineout)
+				return -1;
+			else
+				return 0;
+		}
+
+		/* dont count the first character that is the double quote */
+		lineptr = line;
+		lineptr++;
+		/* count up how many characters we are going to output */
+		while (*lineptr) {
+			/* if the character is an '\' then
+			output the escaped character */
+			if (*lineptr == '\\')
+				lineptr++;
+			outlen++;
+			lineptr++;
+		}
+		tmpLine = (char *) XP_ALLOC (outlen + 1);
+		if (!tmpLine)
+			return -1;
+		XP_MEMSET(tmpLine, 0, outlen);
+		/* dont output the first double quote */
+		line++;
+		lineptr = line;
+		outptr = (tmpLine);
+		while ((*lineptr) != '\0') {
+			/* if the character is an '\' then
+			output the character that was escaped */
+			/* if it was part of the quote then don't
+			output it */
+			if (*lineptr == '\\' || *lineptr == '"') {
+				lineptr++;
+			}
+			*outptr = *lineptr;
+			if (*lineptr != '\0') {
+				outptr++;
+				lineptr++;
+			}
+		}
+		*outptr = '\0';
+		if (tmpLine)
+			(*lineout) = XP_STRDUP (tmpLine);
+		else
+			result = -1;
+		XP_FREEIF (tmpLine);
+	}
+	return result;
+}
+/* Given a string which contains a list of RFC822 addresses, returns a
+   comma-seperated list of just the `mailbox' portions.
+ */
+extern "C" char *
+MSG_ExtractRFC822AddressMailboxes (const char *line)
+{
+  char *addrs = 0;
+  char *result, *s, *out;
+  uint32 i, size = 0;
+  int status = MSG_ParseRFC822Addresses (line, 0, &addrs);
+  if (status <= 0)
+	return 0;
+
+  s = addrs;
+  for (i = 0; (int) i < status; i++)
+	{
+	  uint32 j = XP_STRLEN (s);
+	  s += j + 1;
+	  size += j + 2;
+	}
+
+  result = (char*)XP_ALLOC (size + 1);
+  if (! result)
+	{
+	  XP_FREE (addrs);
+	  return 0;
+	}
+  out = result;
+  s = addrs;
+  for (i = 0; (int) i < status; i++)
+	{
+	  uint32 j = XP_STRLEN (s);
+	  XP_MEMCPY (out, s, j);
+	  out += j;
+	  if ((int) (i+1) < status)
+		{
+		  *out++ = ',';
+		  *out++ = ' ';
+		}
+	  s += j + 1;
+	}
+  *out = 0;
+
+  XP_FREE (addrs);
+  return result;
+}
+
+
+/* Given a string which contains a list of RFC822 addresses, returns a
+   comma-seperated list of just the `user name' portions.  If any of
+   the addresses doesn't have a name, then the mailbox is used instead.
+
+   The names are *unquoted* and therefore cannot be re-parsed in any way.
+   They are, however, nice and human-readable.
+ */
+extern "C" char *
+MSG_ExtractRFC822AddressNames (const char *line)
+{
+  char *names = 0;
+  char *addrs = 0;
+  char *result, *s1, *s2, *out;
+  uint32 i, size = 0;
+  int status = msg_parse_rfc822_addresses(line, &names, &addrs, FALSE, FALSE,
+										  FALSE);
+  if (status <= 0)
+	return 0;
+
+  s1 = names;
+  s2 = addrs;
+  for (i = 0; (int) i < status; i++)
+	{
+	  uint32 j1 = XP_STRLEN (s1);
+	  uint32 j2 = XP_STRLEN (s2);
+	  s1 += j1 + 1;
+	  s2 += j2 + 1;
+	  size += (j1 ? j1 : j2) + 2;
+	}
+
+  result = (char*)XP_ALLOC (size + 1);
+  if (! result)
+	{
+	  XP_FREE (names);
+	  XP_FREE (addrs);
+	  return 0;
+	}
+  out = result;
+  s1 = names;
+  s2 = addrs;
+  for (i = 0; (int) i < status; i++)
+	{
+	  uint32 j1 = XP_STRLEN (s1);
+	  uint32 j2 = XP_STRLEN (s2);
+
+	  if (j1)
+		{
+		  XP_MEMCPY (out, s1, j1);
+		  out += j1;
+		}
+	  else
+		{
+		  XP_MEMCPY (out, s2, j2);
+		  out += j2;
+		}
+
+	  if ((int) (i+1) < status)
+		{
+		  *out++ = ',';
+		  *out++ = ' ';
+		}
+	  s1 += j1 + 1;
+	  s2 += j2 + 1;
+	}
+  *out = 0;
+
+  XP_FREE (names);
+  XP_FREE (addrs);
+  return result;
+}
+
+/* Like MSG_ExtractRFC822AddressNames(), but only returns the first name
+   in the list, if there is more than one. 
+ */
+extern "C" char *
+MSG_ExtractRFC822AddressName (const char *line)
+{
+  char *name = 0;
+  char *addr = 0;
+  int status = msg_parse_rfc822_addresses(line, &name, &addr, FALSE, FALSE,
+										  TRUE);
+  if (status <= 0)
+	return 0;
+  /* This can happen if there is an address like "From: foo bar" which
+	 we parse as two addresses (that's a syntax error.)  In that case,
+	 we'll return just the first one (the rest is after the NULL.)
+  XP_ASSERT(status == 1);
+   */
+  if (name && *name)
+	{
+	  FREEIF(addr);
+	  return name;
+	}
+  else
+	{
+	  FREEIF(name);
+	  return addr;
+	}
+}
+
+
+static char *
+msg_format_rfc822_addresses (const char *names, const char *addrs,
+							 int count, XP_Bool wrap_lines_p)
+{
+  char *result, *out;
+  const char *s1, *s2;
+  uint32 i, size = 0;
+  uint32 column = 10;
+
+  if (count <= 0)
+	return 0;
+
+  s1 = names;
+  s2 = addrs;
+  for (i = 0; (int) i < count; i++)
+	{
+	  uint32 j1 = XP_STRLEN (s1);
+	  uint32 j2 = XP_STRLEN (s2);
+	  s1 += j1 + 1;
+	  s2 += j2 + 1;
+	  size += j1 + j2 + 10;
+	}
+
+  result = (char *) XP_ALLOC (size + 1);
+  if (! result) return 0;
+
+  out = result;
+  s1 = names;
+  s2 = addrs;
+
+  for (i = 0; (int) i < count; i++)
+	{
+	  char *o;
+	  uint32 j1 = XP_STRLEN (s1);
+	  uint32 j2 = XP_STRLEN (s2);
+
+	  if (wrap_lines_p && i > 0 &&
+		  (column + j1 + j2 + 3 +
+		   (((int) (i+1) < count) ? 2 : 0)
+		   > 76))
+		{
+		  if (out > result && out[-1] == ' ')
+			out--;
+		  *out++ = CR;
+		  *out++ = LF;
+		  *out++ = '\t';
+		  column = 8;
+		}
+
+	  o = out;
+
+	  if (j1)
+		{
+		  XP_MEMCPY (out, s1, j1);
+		  out += j1;
+		  *out++ = ' ';
+		  *out++ = '<';
+		}
+	  XP_MEMCPY (out, s2, j2);
+	  out += j2;
+	  if (j1)
+		*out++ = '>';
+
+	  if ((int) (i+1) < count)
+		{
+		  *out++ = ',';
+		  *out++ = ' ';
+		}
+	  s1 += j1 + 1;
+	  s2 += j2 + 1;
+
+	  column += (out - o);
+	}
+  *out = 0;
+  return result;
+}
+
+/* Given a string which contains a list of RFC822 addresses, returns a new
+   string with the same data, but inserts missing commas, parses and reformats
+   it, and wraps long lines with newline-tab.
+ */
+extern "C" char *
+MSG_ReformatRFC822Addresses (const char *line)
+{
+  char *names = 0;
+  char *addrs = 0;
+  char *result;
+  int status = MSG_ParseRFC822Addresses (line, &names, &addrs);
+  if (status <= 0)
+	return 0;
+  result = msg_format_rfc822_addresses (names, addrs, status, TRUE);
+  XP_FREE (names);
+  XP_FREE (addrs);
+  return result;
+}
+
+/* Returns a copy of ADDRS which may have had some addresses removed.
+   Addresses are removed if they are already in either ADDRS or OTHER_ADDRS.
+   (If OTHER_ADDRS contain addresses which are not in ADDRS, they are not
+   added.  That argument is for passing in addresses that were already
+   mentioned in other header fields.)
+
+   Addresses are considered to be the same if they contain the same mailbox
+   part (case-insensitive.)  Real names and other comments are not compared.
+
+   removeAliasesToMe allows the address parser to use the preference which
+   contains regular expressions which also mean 'me' for the purpose of
+   stripping the user's email address(es) out of addrs
+ */
+extern "C" char *
+MSG_RemoveDuplicateAddresses (const char *addrs,
+							  const char *other_addrs,
+							  XP_Bool removeAliasesToMe)
+{
+  /* This is probably way more complicated than it should be... */
+  char *s1 = 0, *s2 = 0;
+  char *output = 0, *out = 0;
+  char *result = 0;
+  int count1 = 0, count2 = 0, count3 = 0;
+  int size1 = 0, size2 = 0, size3 = 0;
+  char *names1 = 0, *names2 = 0;
+  char *addrs1 = 0, *addrs2 = 0;
+  char **a_array1 = 0, **a_array2 = 0, **a_array3 = 0;
+  char **n_array1 = 0,                 **n_array3 = 0;
+  int i, j;
+
+  if (!addrs) return 0;
+
+  count1 = MSG_ParseRFC822Addresses (addrs, &names1, &addrs1);
+  if (count1 < 0) goto FAIL;
+  if (count1 == 0)
+	{
+	  result = XP_STRDUP("");
+	  goto FAIL;
+	}
+  if (other_addrs)
+	count2 = MSG_ParseRFC822Addresses (other_addrs, &names2, &addrs2);
+  if (count2 < 0) goto FAIL;
+
+  s1 = names1;
+  s2 = addrs1;
+  for (i = 0; i < count1; i++)
+	{
+	  uint32 j1 = XP_STRLEN (s1);
+	  uint32 j2 = XP_STRLEN (s2);
+	  s1 += j1 + 1;
+	  s2 += j2 + 1;
+	  size1 += j1 + j2 + 10;
+	}
+
+  s1 = names2;
+  s2 = addrs2;
+  for (i = 0; i < count2; i++)
+	{
+	  uint32 j1 = XP_STRLEN (s1);
+	  uint32 j2 = XP_STRLEN (s2);
+	  s1 += j1 + 1;
+	  s2 += j2 + 1;
+	  size2 += j1 + j2 + 10;
+	}
+
+  a_array1 = (char **) XP_ALLOC (count1 * sizeof(char *));
+  if (!a_array1) goto FAIL;
+  n_array1 = (char **) XP_ALLOC (count1 * sizeof(char *));
+  if (!n_array1) goto FAIL;
+
+  if (count2 > 0)
+	{
+	  a_array2 = (char **) XP_ALLOC (count2 * sizeof(char *));
+	  if (!a_array2) goto FAIL;
+	  /* don't need an n_array2 */
+	}
+
+  a_array3 = (char **) XP_ALLOC (count1 * sizeof(char *));
+  if (!a_array3) goto FAIL;
+  n_array3 = (char **) XP_ALLOC (count1 * sizeof(char *));
+  if (!n_array3) goto FAIL;
+
+
+  /* fill in the input arrays */
+  s1 = names1;
+  s2 = addrs1;
+  for (i = 0; i < count1; i++)
+	{
+	  n_array1[i] = s1;
+	  a_array1[i] = s2;
+	  s1 += XP_STRLEN (s1) + 1;
+	  s2 += XP_STRLEN (s2) + 1;
+	}
+
+  s2 = addrs2;
+  for (i = 0; i < count2; i++)
+	{
+	  a_array2[i] = s2;
+	  s2 += XP_STRLEN (s2) + 1;
+	}
+
+  /* Iterate over all addrs in the "1" arrays.
+	 If those addrs are not present in "3" or "2", add them to "3".
+   */
+  for (i = 0; i < count1; i++)			/* iterate over all addrs */
+	{
+	  XP_Bool found = FALSE;
+	  for (j = 0; j < count2; j++)
+		if (!strcasecomp (a_array1[i], a_array2[j]))
+		  {
+			found = TRUE;
+			break;
+		  }
+
+	  if (!found)
+		for (j = 0; j < count3; j++)
+		  if (!strcasecomp (a_array1[i], a_array3[j]))
+			{
+			  found = TRUE;
+			  break;
+			}
+
+      if (!found && removeAliasesToMe)
+	  {
+		  found = MSG_Prefs::IsEmailAddressAnAliasForMe (a_array1[i]);
+		  if (found)
+			  break;
+	  }
+
+	  if (!found)
+		{
+		  n_array3[count3] = n_array1[i];
+		  a_array3[count3] = a_array1[i];
+		  size3 += (XP_STRLEN(n_array3[count3]) + XP_STRLEN(a_array3[count3])
+					+ 10);
+		  count3++;
+		  XP_ASSERT (count3 <= count1);
+		  if (count3 > count1) break;
+		}
+	}
+
+  output = (char *) XP_ALLOC (size3 + 1);
+  if (!output) goto FAIL;
+
+  *output = 0;
+  out = output;
+  s2 = output;
+  for (i = 0; i < count3; i++)
+	{
+	  XP_STRCPY (out, a_array3[i]);
+	  out += XP_STRLEN (out);
+	  *out++ = 0;
+	}
+  s1 = out;
+  for (i = 0; i < count3; i++)
+	{
+	  XP_STRCPY (out, n_array3[i]);
+	  out += XP_STRLEN (out);
+	  *out++ = 0;
+	}
+  result = msg_format_rfc822_addresses (s1, s2, count3, FALSE);
+
+ FAIL:
+  FREEIF (a_array1);
+  FREEIF (a_array2);
+  FREEIF (a_array3);
+  FREEIF (n_array1);
+  FREEIF (n_array3);
+  FREEIF (names1);
+  FREEIF (names2);
+  FREEIF (addrs1);
+  FREEIF (addrs2);
+  FREEIF (output);
+  return result;
+}
+
+
+/* Given an e-mail address and a person's name, cons them together into a
+   single string of the form "name <address>", doing all the necessary quoting.
+   A new string is returned, which you must free when you're done with it.
+ */
+extern "C" char *
+MSG_MakeFullAddress (const char* name, const char* addr)
+{
+  int nl = name ? XP_STRLEN (name) : 0;
+  int al = addr ? XP_STRLEN (addr) : 0;
+  char *buf, *s;
+  int L;
+  if (al == 0)
+	return 0;
+  buf = (char *) XP_ALLOC ((nl * 2) + (al * 2) + 20);
+  if (!buf)
+	return 0;
+  if (nl > 0)
+	{
+	  XP_STRCPY (buf, name);
+	  L = msg_quote_phrase_or_addr (buf, nl, FALSE);
+	  s = buf + L;
+	  *s++ = ' ';
+	  *s++ = '<';
+	}
+  else
+	{
+	  s = buf;
+	}
+
+  XP_STRCPY (s, addr);
+  L = msg_quote_phrase_or_addr (s, al, TRUE);
+  s += L;
+  if (nl > 0)
+	*s++ = '>';
+  *s = 0;
+  L = (s - buf) + 1;
+  buf = (char *) XP_REALLOC (buf, L);
+  return buf;
+}
+
+#if 0
+main (int argc, char **argv)
+{
+  fprintf (stderr, "%s\n",
+		   MSG_RemoveDuplicateAddresses (argv[1], argv[2], FALSE));
+}
+#endif
+
+
+#if 0
+main (int argc, char **argv)
+{
+  fprintf (stderr, "%s\n", MSG_MakeFullAddress (argv[1], argv[2]));
+}
+#endif
+
+
+#if 0
+/* Test cases for the above routines.
+ */
+static void
+test1 (const char *line, XP_Bool np, XP_Bool ap,
+	   uint32 expect_count, const char *expect_n, const char *expect_a)
+{
+  char *names = 0, *addrs = 0;
+  int result;
+  if (! np) expect_n = 0;
+  if (! ap) expect_a = 0;
+  result = MSG_ParseRFC822Addresses (line,
+									 (np ? &names : 0),
+									 (ap ? &addrs : 0));
+  if (result <= 0)
+	printf (" #### error %d\n", result);
+  else
+	{
+	  uint32 i;
+	  char *n = names, *a = addrs;
+	  if (expect_count != result)
+		printf (" #### wrong number of results (%d instead of %d)\n",
+				(int) result, (int) expect_count);
+	  for (i = 0; i < result; i++)
+		{
+		  if (((!!n) != (!!expect_n)) ||
+			  (n && XP_STRCMP (n, expect_n)))
+			{
+			  printf (" ####### name got: %s\n"
+					  " #### name wanted: %s\n",
+					  (n ? n : "<NULL>"),
+					  (expect_n ? expect_n : "<NULL>"));
+			}
+		  if (((!!a) != (!!expect_a)) ||
+			  (a && XP_STRCMP (a, expect_a)))
+			{
+			  printf (" ####### addr got: %s\n"
+					  " #### addr wanted: %s\n",
+					  (a ? a : "<NULL>"),
+					  (expect_a ? expect_a : "<NULL>"));
+			}
+		  if (n) n += XP_STRLEN (n) + 1;
+		  if (a) a += XP_STRLEN (a) + 1;
+		  if (expect_n) expect_n += XP_STRLEN (expect_n) + 1;
+		  if (expect_a) expect_a += XP_STRLEN (expect_a) + 1;
+		}
+	}
+  FREEIF (names);
+  FREEIF (addrs);
+}
+
+static void
+test (const char *line, uint32 expect_n,
+	  const char *expect_names, const char *expect_addrs,
+	  const char *expect_all_names, const char *expect_all_addrs,
+	  const char *canonical)
+{
+  char *s;
+  printf ("testing %s\n", line);
+  test1 (line, TRUE,  TRUE,  expect_n, expect_names, expect_addrs);
+  test1 (line, TRUE,  FALSE, expect_n, expect_names, expect_addrs);
+  test1 (line, FALSE, TRUE,  expect_n, expect_names, expect_addrs);
+  test1 (line, FALSE, FALSE, expect_n, expect_names, expect_addrs);
+
+  s = MSG_ExtractRFC822AddressMailboxes (line);
+  if (!s || XP_STRCMP (s, expect_all_addrs))
+	printf (" #### expected addrs: %s\n"
+			" ######### got addrs: %s\n",
+			expect_all_addrs, (s ? s : "<NULL>"));
+  FREEIF (s);
+
+  s = MSG_ExtractRFC822AddressNames (line);
+  if (!s || XP_STRCMP (s, expect_all_names))
+	printf (" #### expected names: %s\n"
+			" ######### got names: %s\n",
+			expect_all_names, (s ? s : "<NULL>"));
+  FREEIF (s);
+
+  s = MSG_ReformatRFC822Addresses (line);
+  if (!s || XP_STRCMP (s, canonical))
+	printf (" #### expected canonical: %s\n"
+			" ######### got canonical: %s\n",
+			canonical, (s ? s : "<NULL>"));
+  FREEIF (s);
+}
+
+
+void
+main ()
+{
+  test ("spanky",
+		1, "", "spanky",
+		"spanky", "spanky",
+		"spanky");
+
+  test ("<spanky>",
+		1, "", "spanky",
+		"spanky", "spanky",
+		"spanky");
+
+  test ("< spanky>  ",
+		1, "", "spanky",
+		"spanky", "spanky",
+		"spanky");
+
+  test ("Simple Case <simple1>",
+		1,
+		"Simple Case", "simple1",
+		"Simple Case", "simple1",
+		"Simple Case <simple1>");
+
+  test ("   Simple    Case    <   simple1   >  ",
+		1,
+		"Simple Case", "simple1",
+		"Simple Case", "simple1",
+		"Simple Case <simple1>");
+
+  test ("simple2 (Simple Case)",
+		1,
+		"Simple Case", "simple2",
+		"Simple Case", "simple2",
+		"Simple Case <simple2>");
+
+  test ("simple3 (Slightly) (Trickier)",
+		1,
+		"Slightly Trickier", "simple3",
+		"Slightly Trickier", "simple3",
+		"Slightly Trickier <simple3>");
+
+  test ("(Slightly) simple3 (Trickier)",
+		1,
+		"Slightly Trickier", "simple3",
+		"Slightly Trickier", "simple3",
+		"Slightly Trickier <simple3>");
+
+  test ("(  Slightly  )   simple3   (  Trickier  )  ",
+		1,
+		"Slightly Trickier", "simple3",
+		"Slightly Trickier", "simple3",
+		"Slightly Trickier <simple3>");
+
+  test ("(Even) more <trickier> (Trickier\\, I say)",
+		1,
+		"\"(Even) more (Trickier, I say)\"", "trickier",
+		"(Even) more (Trickier, I say)",     "trickier",
+		"\"(Even) more (Trickier, I say)\" <trickier>");
+
+  test ("\"this, is\" <\"some loser\"@address> (foo)",
+		1,
+		"\"this, is (foo)\"", "\"some loser\"@address",
+		"this, is (foo)", "\"some loser\"@address",
+		"\"this, is (foo)\" <\"some loser\"@address>");
+
+  test ("foo, bar",
+		2,
+		""    "\000" "",
+		"foo" "\000" "bar",
+		"foo, bar", "foo, bar",
+		"foo, bar");
+
+  test ("<foo>, <bar>",
+		2,
+		""    "\000" "",
+		"foo" "\000" "bar",
+		"foo, bar", "foo, bar",
+		"foo, bar");
+
+  test ("<  foo  >  , <  bar  >  ",
+		2,
+		""    "\000" "",
+		"foo" "\000" "bar",
+		"foo, bar", "foo, bar",
+		"foo, bar");
+
+  test ("<  foo  > , , , ,,,,, , <  bar  >  ,",
+		2,
+		""    "\000" "",
+		"foo" "\000" "bar",
+		"foo, bar", "foo, bar",
+		"foo, bar");
+
+  test ("\"this, is\" <\"some loser\"@address> (foo), <bar>",
+		2,
+		"\"this, is (foo)\""     "\000" "",
+		"\"some loser\"@address" "\000" "bar",
+		"this, is (foo), bar",
+		"\"some loser\"@address, bar",
+		"\"this, is (foo)\" <\"some loser\"@address>, bar");
+
+  test ("\"this, is\" <some\\ loser@address> (foo), bar",
+		2,
+		"\"this, is (foo)\""     "\000" "",
+		"\"some loser\"@address" "\000" "bar",
+		"this, is (foo), bar",
+		"\"some loser\"@address, bar",
+		"\"this, is (foo)\" <\"some loser\"@address>, bar");
+
+  test ("(I'm a (total) loser) \"space address\"",
+		1,
+		"\"I'm a (total) loser\"", "\"space address\"",
+		"I'm a (total) loser", "\"space address\"",
+		"\"I'm a (total) loser\" <\"space address\">");
+
+  test ("(I'm a (total) loser) \"space address\"@host",
+		1,
+		"\"I'm a (total) loser\"", "\"space address\"@host",
+		"I'm a (total) loser", "\"space address\"@host",
+		"\"I'm a (total) loser\" <\"space address\"@host>");
+
+  test ("It\\'s \"me\" <address>, I'm a (total) loser <\"space address\">",
+		2,
+		"It's me"  "\000" "\"I'm a (total) loser\"",
+		"address"  "\000" "\"space address\"",
+		"It's me, I'm a (total) loser",
+		"address, \"space address\"",
+		"It's me <address>, \"I'm a (total) loser\" <\"space address\">");
+
+  test("It\\'s \"me\" <address>, I'm a (total) loser <\"space address\"@host>",
+		2,
+		"It's me"  "\000" "\"I'm a (total) loser\"",
+		"address"  "\000" "\"space address\"@host",
+		"It's me, I'm a (total) loser",
+		"address, \"space address\"@host",
+	   "It's me <address>, \"I'm a (total) loser\" <\"space address\"@host>");
+
+  test ("(It\\'s \"me\") address, (I'm a (total) loser) \"space address\"",
+		2,
+		"It's me"  "\000" "\"I'm a (total) loser\"",
+		"address"  "\000" "\"space address\"",
+		"It's me, I'm a (total) loser",
+		"address, \"space address\"",
+		"It's me <address>, \"I'm a (total) loser\" <\"space address\">");
+
+  test ("(It\\'s \"me\") address, (I'm a (total) loser) \"space \\\"address\"",
+		2,
+		"It's me"  "\000" "\"I'm a (total) loser\"",
+		"address"  "\000" "\"space \\\"address\"",
+		"It's me, I'm a (total) loser",
+		"address, \"space \\\"address\"",
+		"It's me <address>, \"I'm a (total) loser\" <\"space \\\"address\">");
+
+  test ("(It\\'s \"me\") address, (I'm a (total) loser) \"space @address\"@host",
+		2,
+		"It's me"  "\000" "\"I'm a (total) loser\"",
+		"address"  "\000" "\"space @address\"@host",
+		"It's me, I'm a (total) loser",
+		"address, \"space @address\"@host",
+		"It's me <address>, \"I'm a (total) loser\" <\"space @address\"@host>");
+
+  test ("Probably Bogus <some@loser@somewhere>",
+		1,
+		"Probably Bogus",
+		"\"some@loser\"@somewhere",
+		"Probably Bogus",
+		"\"some@loser\"@somewhere",
+		"Probably Bogus <\"some@loser\"@somewhere>");
+
+  test ("Probably Bogus <\"some$loser,666\"@somewhere>",
+		1,
+		"Probably Bogus",
+		"\"some$loser,666\"@somewhere",
+		"Probably Bogus",
+		"\"some$loser,666\"@somewhere",
+		"Probably Bogus <\"some$loser,666\"@somewhere>");
+
+  test ("Probably Bogus <\"some$loser,666\"@somewhere>",
+		1,
+		"Probably Bogus",
+		"\"some$loser,666\"@somewhere",
+		"Probably Bogus",
+		"\"some$loser,666\"@somewhere",
+		"Probably Bogus <\"some$loser,666\"@somewhere>");
+
+  test ("\"Probably Bogus, Jr.\" <\"some$loser,666\"@somewhere>",
+		1,
+		"\"Probably Bogus, Jr.\"",
+		"\"some$loser,666\"@somewhere",
+		"Probably Bogus, Jr.",
+		"\"some$loser,666\"@somewhere",
+		"\"Probably Bogus, Jr.\" <\"some$loser,666\"@somewhere>");
+
+  test ("Probably Bogus\\, Jr. <\"some$loser,666\"@somewhere>",
+		1,
+		"\"Probably Bogus, Jr.\"",
+		"\"some$loser,666\"@somewhere",
+		"Probably Bogus, Jr.",
+		"\"some$loser,666\"@somewhere",
+		"\"Probably Bogus, Jr.\" <\"some$loser,666\"@somewhere>");
+
+  test ("This isn't legal <some$loser,666@somewhere>",
+		1,
+		"This isn't legal", "\"some$loser,666\"@somewhere",
+		"This isn't legal", "\"some$loser,666\"@somewhere",
+		"This isn't legal <\"some$loser,666\"@somewhere>");
+
+  test ("This isn't legal!! <some$loser,666@somewhere>",
+		1,
+		"\"This isn't legal!!\"", "\"some$loser,666\"@somewhere",
+		"This isn't legal!!", "\"some$loser,666\"@somewhere",
+		"\"This isn't legal!!\" <\"some$loser,666\"@somewhere>");
+
+  test ("addr1, addr2, \n\taddr3",
+		3,
+		""       "\000" ""      "\000" "",
+		"addr1"  "\000" "addr2" "\000" "addr3",
+		"addr1, addr2, addr3",
+		"addr1, addr2, addr3",
+		"addr1, addr2, addr3");
+
+  test ("addr1 addr2 addr3",
+		3,
+		""       "\000" ""      "\000" "",
+		"addr1"  "\000" "addr2" "\000" "addr3",
+		"addr1, addr2, addr3",
+		"addr1, addr2, addr3",
+		"addr1, addr2, addr3");
+
+  test ("   addr1     addr2    addr3    ,,,,,,    ",
+		3,
+		""       "\000" ""      "\000" "",
+		"addr1"  "\000" "addr2" "\000" "addr3",
+		"addr1, addr2, addr3",
+		"addr1, addr2, addr3",
+		"addr1, addr2, addr3");
+
+  test ("addr1, addr2  \n\t addr3",
+		3,
+		""       "\000" ""      "\000" "",
+		"addr1"  "\000" "addr2" "\000" "addr3",
+		"addr1, addr2, addr3",
+		"addr1, addr2, addr3",
+		"addr1, addr2, addr3");
+
+  test ("addr1, addr2, addr3 addr4, <addr5>, (and) addr6 (yeah)",
+		6,
+		""      "\000" ""      "\000" ""      "\000" ""      "\000" ""
+		  "\000" "and yeah",
+		"addr1" "\000" "addr2" "\000" "addr3" "\000" "addr4" "\000" "addr5"
+		  "\000" "addr6",
+		"addr1, addr2, addr3, addr4, addr5, and yeah",
+		"addr1, addr2, addr3, addr4, addr5, addr6",
+		"addr1, addr2, addr3, addr4, addr5, and yeah <addr6>");
+
+  test ("addr1 (and some (nested) parens), addr2 <and unbalanced mbox",
+		2,
+		"\"and some (nested) parens\""  "\000" "",
+		"addr1"                     "\000" "addr2",
+		"and some (nested) parens, addr2",
+		"addr1, addr2",
+		"\"and some (nested) parens\" <addr1>, addr2");
+
+  test ("addr1))) ((()))()()()()()()())), addr2 addr3, addr4 (foo, bar)",
+		4,
+		"\"(())\""        "\000" ""      "\000" ""      "\000" "\"foo, bar\"",
+		"\"addr1))) ))\"" "\000" "addr2" "\000" "addr3" "\000" "addr4",
+		"(()), addr2, addr3, foo, bar",
+		"\"addr1))) ))\", addr2, addr3, addr4",
+		"\"(())\" <\"addr1))) ))\">, addr2, addr3, \"foo, bar\" <addr4>");
+
+  test ("avec le quoted quotes <\"a \\\" quote\">",
+		1,
+		"avec le quoted quotes", "\"a \\\" quote\"",
+		"avec le quoted quotes", "\"a \\\" quote\"",
+		"avec le quoted quotes <\"a \\\" quote\">");
+
+  test ("avec le quoted quotes <\"a \\\" quote\"@host>",
+		1,
+		"avec le quoted quotes", "\"a \\\" quote\"@host",
+		"avec le quoted quotes", "\"a \\\" quote\"@host",
+		"avec le quoted quotes <\"a \\\" quote\"@host>");
+
+  /* bang paths work, right? */
+  test ("nelsonb <abit.com!nelsonb@netscape.com>",
+		1,
+		"nelsonb", "abit.com!nelsonb@netscape.com",
+		"nelsonb", "abit.com!nelsonb@netscape.com",
+		"nelsonb <abit.com!nelsonb@netscape.com>");
+
+# if 0  /* these tests don't pass, but should. */
+
+  /* a perverse example from RFC822: */
+  test ("Muhammed.(I am  the greatest) Ali @(the)Vegas.WBA",
+		1,
+		"I am the greatest", "Muhammed.Ali@Vegas.WBA",
+		"I am the greatest", "Muhammed.Ali@Vegas.WBA",
+		"I am the greatest <Muhammed.Ali@Vegas.WBA>");
+
+  /* Oops, this should work but doesn't. */
+  test ("nelsonb <@abit.com.tw:nelsonb@netscape.com>",
+		1,
+		"nelsonb", "@abit.com.tw:nelsonb@netscape.com",
+		"nelsonb", "@abit.com.tw:nelsonb@netscape.com",
+		"nelsonb <@abit.com.tw:nelsonb@netscape.com>");
+
+  test ("(Sat43Jan@cyberpromo.com) <Ronald.F.Guilmette#$&'*+-/=?^_`|~@monkeys.com> ((#$&'*+-/=?^_`|~)) ((\\)))",
+		1,
+		"(Sat43Jan@cyberpromo.com)", "\"Ronald.F.Guilmette#$&'*+-/=?^_`|~\"@monkeys.com",
+		"(Sat43Jan@cyberpromo.com)", "\"Ronald.F.Guilmette#$&'*+-/=?^_`|~\"@monkeys.com",
+		"(Sat43Jan@cyberpromo.com) <\"Ronald.F.Guilmette#$&'*+-/=?^_`|~\"@monkeys.com>");
+
+  /* Intentionally fail this one */
+  test("my . name @ my . host . com",
+	   1,
+	   "", "my.name@my.host.com",
+	   "", "my.name@my.host.com",
+	   "<my.name@my.host.com>");
+
+  /* but this one should work */
+  test("loser < my . name @ my . host . com > ",
+	   1,
+	   "loser", "my.name@my.host.com",
+	   "loser", "my.name@my.host.com",
+	   "loser <my.name@my.host.com>");
+
+  test("my(@).(@)name(<)@(>)my(:).(;)host(((\\)))).(@)com",
+	   1,
+	   "@", "my.name@my.host.com",
+	   "@", "my.name@my.host.com",
+	   "\"@\" <my.name@my.host.com>");
+
+# endif /* 0 */
+
+  exit (0);
+}
+#endif /* 0 */
diff --git a/mozilla/lib/mailto/ap_decod.c b/mozilla/lib/mailto/ap_decod.c
new file mode 100644
index 00000000000..3a4e150b58b
--- /dev/null
+++ b/mozilla/lib/mailto/ap_decod.c
@@ -0,0 +1,1776 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ *
+ *	apple_double_decode.c
+ *
+ *	---------------------
+ *
+ *		Codes for decoding Apple Single/Double object parts.
+ *
+ *			05aug95		mym		Created.
+ *			25sep95		mym		Add support to write to binhex encoding on non-mac system.
+ */
+
+#include "msg.h"
+#include "appledbl.h"
+#include "ad_codes.h"
+#include "m_binhex.h"
+#ifdef XP_MAC
+#include <StandardFile.h>
+#endif
+
+extern int MK_UNABLE_TO_OPEN_TMP_FILE;
+extern int MK_MIME_ERROR_WRITING_FILE;
+
+/*
+**	Static functions.
+*/
+PRIVATE int from_decoder(appledouble_decode_object* p_ap_decode_obj, 
+			char 	*buff, 
+			int 	buff_size, 
+			uint32	*in_count);
+PRIVATE int from_64(appledouble_decode_object* p_ap_decode_obj, 
+			char 	*buff, 
+			int 	size, 
+			uint32 	*real_size);
+PRIVATE int from_qp(appledouble_decode_object* p_ap_decode_obj, 
+			char 	*buff, 
+			int 	size, 
+			uint32 	*real_size);
+PRIVATE int from_uu(appledouble_decode_object* p_ap_decode_obj, 
+			char 	*buff, 
+			int 	size, 
+			uint32 	*real_size);
+PRIVATE int from_none(appledouble_decode_object* p_ap_decode_obj, 
+			char 	*buff, 
+			int 	size, 
+			uint32 	*real_size);
+
+PRIVATE int decoder_seek(appledouble_decode_object* p_ap_decode_obj, 
+			int 	seek_pos, 
+			int 	start_pos);
+			
+/*
+**	fetch_a_line
+**	-------------
+**
+**		get a line from the in stream..
+*/
+int fetch_a_line(
+	appledouble_decode_object* p_ap_decode_obj,
+	char 	*buff)
+{
+	int  i, left;
+	char *p, c = 0;
+	
+	if (p_ap_decode_obj->s_leftover == 0 && 
+		p_ap_decode_obj->s_inbuff <= p_ap_decode_obj->pos_inbuff)
+	{
+		*buff = '\0';
+		return errEOB;
+	}
+	
+	if (p_ap_decode_obj->s_leftover)
+	{
+		for (p = p_ap_decode_obj->b_leftover, i = p_ap_decode_obj->s_leftover; i>0; i--)
+			*buff++ = *p++;
+			
+		p_ap_decode_obj->s_leftover = 0;
+	}
+	
+	p    = p_ap_decode_obj->inbuff   + p_ap_decode_obj->pos_inbuff;
+	left = p_ap_decode_obj->s_inbuff - p_ap_decode_obj->pos_inbuff;
+	
+	for (i = 0; i < left; )
+	{
+		c = *p++; i++;
+		
+		if (c == CR && *p == LF)
+		{
+			p++; i++;	/* make sure skip both LF & CR	*/
+		}
+
+		if (c == LF || c == CR)
+			break;
+		
+		*buff++ = c; 
+	}
+	p_ap_decode_obj->pos_inbuff += i;
+	
+	if (i == left && c != LF && c != CR)
+	{
+		/*
+		**  we meet the buff end before we can terminate the string,
+		**	save the string to the left_over buff.
+		*/
+		p_ap_decode_obj->s_leftover = i;
+		
+		for (p = p_ap_decode_obj->b_leftover; i>0; i--)
+			*p++ = *(buff-i);
+			
+		return errEOB;
+	}
+	*buff = '\0';
+	return NOERR;
+}
+
+void parse_param(
+	char *p, 
+	char **param, 			/* the param		*/
+	char **define, 			/* the defination.	*/
+	char **np)				/* next position.	*/
+{
+	while (*p == ' ' || *p == '\"' || *p == ';') p++;
+	*param = p;
+	
+	while (*p != ' ' && *p != '=' ) p++;
+	if (*p == ' ')
+		*define = p+1;
+	else
+		*define = p+2;
+		
+	while (*p && *p != ';') p++;
+
+	if (*p == ';')
+		*np = p + 1;
+	else
+		*np = p;
+}
+
+int ap_seek_part_start(
+	appledouble_decode_object* p_ap_decode_obj)
+{
+	int  status;
+	char newline[256];
+	
+	while (1)
+	{
+		status = fetch_a_line(p_ap_decode_obj, newline);
+		if(status != NOERR)
+			break;
+			
+		if (newline[0] == '\0' && p_ap_decode_obj->boundary0 != NULL)
+			return errDone;
+		
+		if (!XP_STRNCASECMP(newline, "--", 2))
+		{
+			/* we meet the start seperator, copy it and it will be our boundary */
+			p_ap_decode_obj->boundary0 = XP_STRDUP(newline+2);
+			return errDone;
+		}
+	}
+	return status;
+}
+
+int ParseFileHeader(
+	appledouble_decode_object *p_ap_decode_obj)
+{
+	int  status;
+	int	 i;
+	char newline[256], *p;
+	char *param, *define;
+	
+	while (1)
+	{
+		status = fetch_a_line(p_ap_decode_obj, newline);
+		if (newline[0] == '\0')
+			break;				/* we get the end of a defination section.	*/
+		
+		p = newline; 
+		while (1)
+		{
+			parse_param(p, &param, &define, &p);
+			/*
+			**	we only care about these params.
+			*/
+			if (!XP_STRNCASECMP(param, "Content-Type:", 13))
+			{
+				if (!XP_STRNCASECMP(define, MULTIPART_APPLEDOUBLE,
+									XP_STRLEN(MULTIPART_APPLEDOUBLE)) ||
+					!XP_STRNCASECMP(define, MULTIPART_HEADER_SET,
+									XP_STRLEN(MULTIPART_HEADER_SET)))
+					p_ap_decode_obj->messagetype = kAppleDouble;
+				else
+					p_ap_decode_obj->messagetype = kGeneralMine;
+			}
+			else if (!XP_STRNCASECMP(param, "boundary=", 9))
+			{
+				for (i = 0; *define && *define != '\"'; )
+					p_ap_decode_obj->boundary0[i++] = *define++;
+					
+				p_ap_decode_obj->boundary0[i] = '\0';
+			}
+			else if (!XP_STRNCASECMP(param, "Content-Disposition:", 20))
+			{
+				if (!XP_STRNCASECMP(define, "inline", 5))
+					p_ap_decode_obj->deposition = kInline;
+				else
+					p_ap_decode_obj->deposition = kDontCare;
+			}
+			else if (!XP_STRNCASECMP(param, "filename=", 9))
+			{
+				for (i = 0, p=define; *p && *p != '\"'; )
+					p_ap_decode_obj->fname[i++] = *p++;
+					
+				p_ap_decode_obj->fname[i] = '\0';
+			}
+			
+			if (*p == '\0')
+				break;
+		}
+	}
+		
+	return NOERR;
+}
+
+int ap_seek_to_boundary(
+	appledouble_decode_object *p_ap_decode_obj, 
+	XP_Bool firstime)
+{
+	int  status = NOERR;
+	char buff[256];
+	
+	while (status == NOERR)
+	{
+		status = fetch_a_line(p_ap_decode_obj, buff);
+		if (status != NOERR)
+			break;
+				
+		if ((!XP_STRNCASECMP(buff, "--", 2) &&
+			!XP_STRNCASECMP(	buff+2, 
+						p_ap_decode_obj->boundary0, 
+						XP_STRLEN(p_ap_decode_obj->boundary0))) 
+		  ||!XP_STRNCASECMP(	buff, 
+						p_ap_decode_obj->boundary0, 
+						XP_STRLEN(p_ap_decode_obj->boundary0)))
+		{
+			TRACEMSG(("Found boundary: %s", p_ap_decode_obj->boundary0));
+			status = errDone;
+			break;
+		}
+	}
+	
+	if (firstime && status == errEOB)
+		status = NOERR;				/* so we can do it again.	*/
+
+	return	status;
+}
+
+int ap_parse_header(
+	appledouble_decode_object *p_ap_decode_obj, 
+	XP_Bool firstime) 
+{
+	int	 	status, i;
+	char 	newline[256], *p;
+	char 	*param, *define;
+	
+	if (firstime)
+	{
+		/* do the clean ups. */
+		p_ap_decode_obj->encoding = kEncodeNone;
+		p_ap_decode_obj->which_part = kFinishing;
+	}
+		
+	while (1)
+	{
+		status = fetch_a_line(p_ap_decode_obj, newline);
+		if (status != NOERR)
+			return status;		/* a possible end of buff happened.			*/
+			
+		if (newline[0] == '\0')
+			break;				/* we get the end of a defination section.	*/
+		
+		p = newline;
+		while (1)
+		{
+			parse_param(p, &param, &define, &p);
+			/*
+			**	we only care about these params.
+			*/
+			if (!XP_STRNCASECMP(param, "Content-Type:", 13))
+			{
+				if (!XP_STRNCASECMP(define, "application/applefile", 21))
+					p_ap_decode_obj->which_part = kHeaderPortion;
+				else
+				{
+					p_ap_decode_obj->which_part = kDataPortion;
+					if (!XP_STRNCASECMP(define, "text/plain", 10))
+						p_ap_decode_obj->is_binary = FALSE;
+					else
+						p_ap_decode_obj->is_binary = TRUE; 
+				}
+				
+				/* Broken QuickMail messages */
+				if (!XP_STRNCASECMP(define, "x-uuencode-apple-single", 23))
+					p_ap_decode_obj->encoding = kEncodeUU;
+			}
+			else if (!XP_STRNCASECMP(param, "Content-Transfer-Encoding:",26))
+			{
+				if (!XP_STRNCASECMP(define, "base64", 6))
+					p_ap_decode_obj->encoding = kEncodeBase64;
+				else if (!XP_STRNCASECMP(define, "quoted-printable", 16))
+					p_ap_decode_obj->encoding = kEncodeQP;
+				else 
+					p_ap_decode_obj->encoding = kEncodeNone;
+			}
+			else if (!XP_STRNCASECMP(param, "Content-Disposition:", 20))
+			{
+				if (!XP_STRNCASECMP(define, "inline", 5))
+					p_ap_decode_obj->deposition = kInline;
+				else
+					p_ap_decode_obj->deposition = kDontCare;
+			}
+			else if (!XP_STRNCASECMP(param, "filename=", 9))
+			{
+				if (p_ap_decode_obj->fname[0] == '\0')
+				{
+					for (i = 0; *define && *define != '\"'; )
+						p_ap_decode_obj->fname[i++] = *define++;
+					
+					p_ap_decode_obj->fname[i] = '\0';
+				}
+			}
+			
+			if (*p == '\0')
+				break;
+		}
+	}
+	return errDone;
+}
+
+
+/*
+**	decode the head portion.
+*/
+
+
+int ap_decode_file_infor(appledouble_decode_object *p_ap_decode_obj)
+{
+	ap_header 	head;
+	ap_entry 	entries[NUM_ENTRIES + 1];
+	int 		i, j;
+	int			st_pt;
+	uint32		in_count;
+	int			status;
+	char		name[256];
+	XP_Bool		positionedAtRFork = FALSE;
+	
+	st_pt = p_ap_decode_obj->pos_inbuff;
+	
+	/*
+	** 	Read & verify header 
+	*/
+	status = from_decoder(
+					p_ap_decode_obj, 
+					(char *) &head, 
+					26, 		/* sizeof (head), 	*/
+					&in_count);
+	if (status != NOERR)
+		return status;
+	
+	if (p_ap_decode_obj->is_apple_single)
+	{
+		if (ntohl(head.magic) != APPLESINGLE_MAGIC)
+			return errVersion;
+	}
+	else
+	{
+		if(ntohl(head.magic) != APPLEDOUBLE_MAGIC) 
+			return errVersion;
+	}
+		
+	if (ntohl(head.version) != VERSION) 
+	{
+		return errVersion;
+	}
+	
+	/* read entries */
+	head.entries = ntohs(head.entries);
+	for (i = j = 0; i < head.entries; ++i) 
+	{
+		status = from_decoder(
+					p_ap_decode_obj,
+					(char *) (entries + j), 
+					sizeof (ap_entry), 
+					&in_count);
+		if (status != NOERR)
+			return errDecoding;
+		
+		/*
+		**	correct the byte order now.
+		*/
+		entries[j].id 	  = ntohl(entries[j].id);
+		entries[j].offset = ntohl(entries[j].offset);
+		entries[j].length = ntohl(entries[j].length);
+		/*
+		**	only care about these entries...
+		*/
+		if (j < NUM_ENTRIES) 
+		switch (entries[j].id) 
+		{
+			case ENT_NAME:
+			case ENT_FINFO:
+			case ENT_DATES:
+			case ENT_COMMENT:
+			case ENT_RFORK:
+			case ENT_DFORK:
+				++j;
+				break;
+		}
+	}
+	
+	in_count = XP_STRLEN(p_ap_decode_obj->fname);
+
+		/* if the user has not provided the output file name, read it
+		 * from the ENT_NAME entry
+		 */
+
+	if (in_count == 0) 
+	{
+		/* read name */
+		for (i = 0; i < j && entries[i].id != ENT_NAME; ++i)
+			;
+		if (i == j) 
+			return errDecoding;
+			
+		status = decoder_seek(
+						p_ap_decode_obj, 
+						entries[i].offset,
+						st_pt);	
+		if (status != NOERR)
+			return status;
+			
+		if (entries[i].length > 63) 
+			entries[i].length = 63;
+			
+		status = from_decoder(
+						p_ap_decode_obj, 
+						p_ap_decode_obj->fname, 
+						entries[i].length,
+						&in_count);
+		if (status != NOERR)
+			return status;
+
+		p_ap_decode_obj->fname[in_count] = '\0';
+	}
+
+	/* P_String version of the file name. */
+	XP_STRCPY((char *)name+1, p_ap_decode_obj->fname);
+	name[0] = (char) in_count;
+	
+	if (p_ap_decode_obj->write_as_binhex)
+	{
+		/*
+		**	fill out the simple the binhex head.
+		*/
+		binhex_header head;
+		myFInfo		  myFInfo;
+
+		status = (*p_ap_decode_obj->binhex_stream->put_block)
+					(p_ap_decode_obj->binhex_stream->data_object,
+					name, 
+					name[0] + 2);
+		if (status != NOERR)
+			return status;
+		
+		/* get finder info */
+		for (i = 0; i < j && entries[i].id != ENT_FINFO; ++i)
+			;
+		if (i < j) 
+		{
+			status = decoder_seek(p_ap_decode_obj, 
+						entries[i].offset, 
+						st_pt);
+			if (status != NOERR)
+				return status;
+				
+			status = from_decoder(p_ap_decode_obj, 
+						(char *) &myFInfo, 
+						sizeof (myFInfo), 
+						&in_count);
+			if (status != NOERR)
+				return status;				
+		}
+		
+		head.type 		= myFInfo.fdType;
+		head.creator 	= myFInfo.fdCreator;
+		head.flags 		= myFInfo.fdFlags;
+
+		for (i = 0; i < j && entries[i].id != ENT_DFORK; ++i)
+			;
+		if (i < j && entries[i].length != 0)
+		{
+			head.dlen = entries[i].length;	/* set the data fork length 	*/
+		}	
+		else
+		{
+			head.dlen = 0;
+		}
+	
+		for (i = 0; i < j && entries[i].id != ENT_RFORK; ++i)
+			;
+		if (i < j && entries[i].length != 0)
+		{
+			head.rlen = entries[i].length;	/* set the resource fork length */
+		}
+		else
+		{
+			head.rlen = 0;
+		}
+
+		/*
+		**	and the dlen, rlen is in the host byte order, correct it if needed ...
+		*/
+		head.dlen = htonl(head.dlen);
+		head.rlen = htonl(head.rlen);
+		/*
+		**	then encode them in binhex.
+		*/
+		status = (*p_ap_decode_obj->binhex_stream->put_block)
+					(p_ap_decode_obj->binhex_stream->data_object,
+					(char*)&head,
+					sizeof(binhex_header));
+		if (status != NOERR)
+			return status;
+		
+		/*
+		**	after we have done with the header, end the binhex header part.
+		*/
+		status = (*p_ap_decode_obj->binhex_stream->put_block)
+					(p_ap_decode_obj->binhex_stream->data_object,
+					NULL,
+					0);
+	}
+	else
+	{
+	
+#ifdef	XP_MAC
+
+		ap_dates 	dates;
+		HFileInfo 	*fpb;
+		CInfoPBRec 	cipbr;
+		IOParam 	vinfo;
+		GetVolParmsInfoBuffer vp;
+		DTPBRec 	dtp;
+		char 		comment[256];
+
+		unsigned char filename[256]; /* this is a pascal string - should be unsigned char. */
+		StandardFileReply reply;
+
+		/* convert char* p_ap_decode_obj->fname to a pascal string */
+		XP_STRCPY((char*)filename + 1, p_ap_decode_obj->fname);
+		filename[0] = XP_STRLEN(p_ap_decode_obj->fname);
+														
+		if( !p_ap_decode_obj->mSpec )
+		{
+			StandardPutFile("\pSave decoded file as:", 
+						(const unsigned char*)filename, 
+						&reply);
+						
+			if (!reply.sfGood) 
+			{
+				return errUsrCancel;
+			}
+		}
+		else
+		{
+			reply.sfFile.vRefNum = p_ap_decode_obj->mSpec->vRefNum;
+			reply.sfFile.parID = p_ap_decode_obj->mSpec->parID;
+			XP_MEMCPY(&reply.sfFile.name, p_ap_decode_obj->mSpec->name , 63 );		
+		}
+		
+		XP_MEMCPY(p_ap_decode_obj->fname, 
+					reply.sfFile.name+1, 
+					*(reply.sfFile.name)+1);
+		p_ap_decode_obj->fname[*(reply.sfFile.name)] = '\0';
+			
+		p_ap_decode_obj->vRefNum = reply.sfFile.vRefNum;
+		p_ap_decode_obj->dirId   = reply.sfFile.parID;
+	
+		/* create & get info for file */
+		HDelete(reply.sfFile.vRefNum, 
+					reply.sfFile.parID, 
+					reply.sfFile.name);
+
+#define DONT_CARE_TYPE	0x3f3f3f3f
+	
+		if (HCreate(reply.sfFile.vRefNum,
+					reply.sfFile.parID, 
+					reply.sfFile.name, 
+					DONT_CARE_TYPE, 
+					DONT_CARE_TYPE) != NOERR) 
+		{
+			return errFileOpen;
+		}
+		
+		fpb = (HFileInfo *) &cipbr;
+		fpb->ioVRefNum = reply.sfFile.vRefNum;
+		fpb->ioDirID   = reply.sfFile.parID;
+		fpb->ioNamePtr = reply.sfFile.name;
+		fpb->ioFDirIndex = 0;
+		PBGetCatInfoSync(&cipbr);
+	
+		/* get finder info */
+		for (i = 0; i < j && entries[i].id != ENT_FINFO; ++i)
+			;
+		if (i < j) 
+		{
+			status = decoder_seek(p_ap_decode_obj, 
+							entries[i].offset, 
+							st_pt);
+			if (status != NOERR)
+				return status;
+				
+			status = from_decoder(p_ap_decode_obj, 
+							(char *) &fpb->ioFlFndrInfo, 
+							sizeof (FInfo), 
+							&in_count);
+			if (status != NOERR)
+				return status;
+				
+			status = from_decoder(p_ap_decode_obj,
+							(char *) &fpb->ioFlXFndrInfo, 
+							sizeof (FXInfo),
+							&in_count);
+		
+			if (status != NOERR && status != errEOP )
+				return status;
+				
+			fpb->ioFlFndrInfo.fdFlags &= 0xfc00; /* clear flags maintained by finder */
+		}
+	
+		/*
+		** 	get file date info 
+		*/
+		for (i = 0; i < j && entries[i].id != ENT_DATES; ++i)
+			;
+		if (i < j) 
+		{
+			status = decoder_seek(p_ap_decode_obj, 
+							entries[i].offset, 
+							st_pt);
+			if (status != NOERR && status != errEOP )
+				return status;
+				
+			status = from_decoder(p_ap_decode_obj,
+							(char *) &dates, 
+							sizeof (dates), 
+							&in_count);
+			if (status != NOERR)
+				return status;
+				
+			fpb->ioFlCrDat = dates.create - CONVERT_TIME;
+			fpb->ioFlMdDat = dates.modify - CONVERT_TIME;
+			fpb->ioFlBkDat = dates.backup - CONVERT_TIME;
+		}
+		
+		/*
+		** 	update info 
+		*/
+		fpb->ioDirID = fpb->ioFlParID;
+		PBSetCatInfoSync(&cipbr);
+		
+		/*
+		** 	get comment & save it 
+		*/
+		for (i = 0; i < j && entries[i].id != ENT_COMMENT; ++i)
+			;
+		if (i < j && entries[i].length != 0) 
+		{
+			memset((void *) &vinfo, '\0', sizeof (vinfo));
+			vinfo.ioVRefNum = fpb->ioVRefNum;
+			vinfo.ioBuffer  = (Ptr) &vp;
+			vinfo.ioReqCount = sizeof (vp);
+			if (PBHGetVolParmsSync((HParmBlkPtr) &vinfo) == NOERR &&
+				((vp.vMAttrib >> bHasDesktopMgr) & 1)) 
+			{
+				memset((void *) &dtp, '\0', sizeof (dtp));
+				dtp.ioVRefNum = fpb->ioVRefNum;
+				if (PBDTGetPath(&dtp) == NOERR) 
+				{
+					if (entries[i].length > 255) 
+						entries[i].length = 255;
+						
+					status = decoder_seek(p_ap_decode_obj, 
+								entries[i].offset, 
+								st_pt);
+					if (status != NOERR)
+						return status;
+						
+					status = from_decoder(p_ap_decode_obj, 
+								comment, 
+								entries[i].length, 
+								&in_count);
+					if (status != NOERR)
+						return status;
+						
+					dtp.ioDTBuffer = (Ptr) comment;
+					dtp.ioNamePtr  = fpb->ioNamePtr;
+					dtp.ioDirID    = fpb->ioDirID;
+					dtp.ioDTReqCount = entries[i].length;
+					if (PBDTSetCommentSync(&dtp) == NOERR) 
+					{
+						PBDTFlushSync(&dtp);
+					}
+				}
+			}
+		}
+		
+#else
+		/*
+		**	in non-mac system, creating a data fork file will be it.
+		*/
+#endif
+	}
+	
+	/* 
+	** Get the size of the resource fork, and (maybe) position to the beginning of it. 
+	*/
+	for (i = 0; i < j && entries[i].id != ENT_RFORK; ++i)
+		;
+	if (i < j && entries[i].length != 0)
+	{
+#ifdef XP_MAC
+		/* Seek to the start of the resource fork only if we're on a Mac */
+		status = decoder_seek(p_ap_decode_obj, 
+								entries[i].offset, 
+								st_pt);
+		positionedAtRFork = TRUE;
+#endif
+		p_ap_decode_obj->rksize = entries[i].length;
+	}
+	else
+		p_ap_decode_obj->rksize = 0;
+	
+	/*
+	** Get the size of the data fork, and (maybe) position to the beginning of it.
+	*/
+	for (i = 0; i < j && entries[i].id != ENT_DFORK; ++i)
+		;
+	if (i < j && entries[i].length != 0)
+	{
+		if (p_ap_decode_obj->is_apple_single && !positionedAtRFork)
+			status = decoder_seek(p_ap_decode_obj, 
+									entries[i].offset, 
+									st_pt);
+		p_ap_decode_obj->dksize = entries[i].length;
+	}	
+	else
+		p_ap_decode_obj->dksize = 0;
+
+	/*
+	**	Prepare a tempfile to hold the resource fork decoded by the decoder,
+	**		because in binhex, resource fork appears after the data fork!!!
+	*/
+	if (p_ap_decode_obj->write_as_binhex)
+	{
+		if (p_ap_decode_obj->rksize != 0)
+		{
+			/* we need a temp file to hold all the resource data, because the */
+			p_ap_decode_obj->tmpfname 
+				= WH_TempName(xpTemporary, "apmail");
+			
+			p_ap_decode_obj->tmpfd 
+				= XP_FileOpen(p_ap_decode_obj->tmpfname, 
+								xpTemporary, 
+								XP_FILE_TRUNCATE_BIN);
+								
+			if (p_ap_decode_obj->tmpfd == NULL)
+				return errFileOpen;
+		}
+	}
+	return NOERR;
+}
+
+/*
+**	ap_decode_process_header
+**
+**
+*/
+int ap_decode_process_header(
+	appledouble_decode_object* p_ap_decode_obj, 
+	XP_Bool firstime)
+{
+	uint32 	in_count;
+	int		status = NOERR;
+	char	wr_buff[1024];
+	
+	if (firstime)
+	{
+		status = ap_decode_file_infor(p_ap_decode_obj);
+		if (status != NOERR)
+			return status;
+		
+		if (p_ap_decode_obj->rksize > 0)
+		{
+#ifdef XP_MAC
+			if(!p_ap_decode_obj->write_as_binhex)
+			{
+				Str63	fname;
+				short	refNum;
+					
+				fname[0] = XP_STRLEN(p_ap_decode_obj->fname);
+				XP_STRCPY((char*)fname+1, p_ap_decode_obj->fname);
+				 
+				if (HOpenRF(p_ap_decode_obj->vRefNum,
+							p_ap_decode_obj->dirId,
+							fname,
+							fsWrPerm,
+							&refNum) != NOERR)
+				{
+					return (errFileOpen);
+				}
+				p_ap_decode_obj->fileId = refNum;
+			}
+#endif
+		}
+		else
+		{
+			status = errDone;
+		}
+	}
+	
+	/*
+	**	Time to continue decoding all the resource data.
+	*/	
+	while (status == NOERR && p_ap_decode_obj->rksize > 0)
+	{
+		in_count = MIN(1024, p_ap_decode_obj->rksize);
+		
+		status = from_decoder(p_ap_decode_obj, 
+							wr_buff, 
+							in_count, 
+							&in_count);
+		
+		if (p_ap_decode_obj->write_as_binhex)
+		{	
+			/*
+			**	Write to the temp file first, because the resource fork appears after
+			**	 the data fork in the binhex encoding.
+			*/
+			if (XP_FileWrite(wr_buff, 
+							in_count, 
+							p_ap_decode_obj->tmpfd)  != in_count)
+			{
+				status = errFileWrite;						
+				break;
+			}
+			p_ap_decode_obj->data_size += in_count;
+		}
+		else
+		{
+#ifdef XP_MAC
+			long howMuch = in_count;
+			
+			if (FSWrite(p_ap_decode_obj->fileId, 
+							&howMuch,
+							wr_buff) != NOERR)
+			{
+				status = errFileWrite;
+				break;
+			}
+#else
+			/* ======	Write nothing in a non mac file system	============ */
+#endif
+		}
+		
+		p_ap_decode_obj->rksize -= in_count;
+	}
+	
+	if (p_ap_decode_obj->rksize <= 0 || status == errEOP)
+	{
+		if (p_ap_decode_obj->write_as_binhex)
+		{
+			/*
+			**	No more resource data, but we are not done
+			**  with tempfile yet, just seek back to the start point, 
+			**		-- ready for a readback later 
+			*/
+			if (p_ap_decode_obj->tmpfd)
+				XP_FileSeek(p_ap_decode_obj->tmpfd, 0L, 1);
+		}
+		
+#ifdef XP_MAC
+		else if (p_ap_decode_obj->fileId)	/* close the resource fork of the macfile	*/
+		{
+			FSClose(p_ap_decode_obj->fileId);
+			p_ap_decode_obj->fileId = 0;
+		}
+#endif
+		if (!p_ap_decode_obj->is_apple_single)
+		{
+			p_ap_decode_obj->left 	 = 0;
+			p_ap_decode_obj->state64 = 0;
+		}
+		status = errDone;
+	}	
+	return status;
+}
+
+int ap_decode_process_data(
+	appledouble_decode_object* p_ap_decode_obj, 
+	XP_Bool 	firstime)
+{
+	char 	wr_buff[1024];
+	uint32  in_count;
+	int	 	status = NOERR;
+	int  	retval = NOERR;
+	
+	if (firstime)
+	{
+		if (!p_ap_decode_obj->write_as_binhex)
+		{
+#ifdef XP_MAC
+			char	*filename;
+			FSSpec	fspec;
+			
+			fspec.vRefNum = p_ap_decode_obj->vRefNum;
+			fspec.parID   = p_ap_decode_obj->dirId;
+			fspec.name[0] = XP_STRLEN(p_ap_decode_obj->fname);
+			XP_STRCPY((char*)fspec.name+1, p_ap_decode_obj->fname);
+			
+			filename = my_PathnameFromFSSpec(&fspec);
+			if (p_ap_decode_obj->is_binary)
+				p_ap_decode_obj->fd = 
+						XP_FileOpen(filename+7, xpURL, XP_FILE_TRUNCATE_BIN);
+			else
+				p_ap_decode_obj->fd = 
+						XP_FileOpen(filename+7, xpURL, XP_FILE_TRUNCATE);
+			XP_FREE(filename);				
+#else			
+			if (p_ap_decode_obj->is_binary)
+				p_ap_decode_obj->fd = 
+						XP_FileOpen(p_ap_decode_obj->fname, xpURL, XP_FILE_TRUNCATE_BIN);
+			else
+				p_ap_decode_obj->fd = 
+						XP_FileOpen(p_ap_decode_obj->fname, xpURL, XP_FILE_TRUNCATE);
+#endif
+		}
+		else
+		{
+			;	/*	== don't need do anything to binhex stream, it is ready already  == */
+		}
+	}
+	
+	if (p_ap_decode_obj->is_apple_single && 
+		p_ap_decode_obj->dksize == 0)
+	{
+		/* if no data in apple single, we already done then.	*/
+		status = errDone;
+	}
+
+	while (status == NOERR && retval == NOERR)
+	{	
+		retval = from_decoder(p_ap_decode_obj,
+						wr_buff, 
+						1024, 
+						&in_count);
+
+		if (p_ap_decode_obj->is_apple_single)		/* we know the data fork size in 			*/
+			p_ap_decode_obj->dksize -= in_count;	/*	apple single, use it to decide the end	*/
+						
+		if (p_ap_decode_obj->write_as_binhex)		
+			status = (*p_ap_decode_obj->binhex_stream->put_block)
+						(p_ap_decode_obj->binhex_stream->data_object, 
+						wr_buff, 
+						in_count);
+		else
+			status = XP_FileWrite(wr_buff, 
+						in_count, 
+						p_ap_decode_obj->fd) == in_count ? NOERR : errFileWrite;
+								
+		if (retval == errEOP ||						/* for apple double, we meet the boundary	*/
+			( p_ap_decode_obj->is_apple_single && 
+			  p_ap_decode_obj->dksize <= 0))		/* for apple single, we know it is ending	*/
+		{
+			status = errDone;
+			break;
+		}
+	}
+	
+	if (status == errDone)
+	{
+		if (p_ap_decode_obj->write_as_binhex)		
+		{
+			/* CALL with data == NULL && size == 0 to end a part object in binhex encoding */			
+			status = (*p_ap_decode_obj->binhex_stream->put_block)
+						(p_ap_decode_obj->binhex_stream->data_object, 
+						 NULL, 
+						 0);
+			if (status != NOERR)
+				return status;
+		}
+		else if (p_ap_decode_obj->fd)
+		{
+			XP_FileClose(p_ap_decode_obj->fd);
+			p_ap_decode_obj->fd = 0;		
+		}
+
+		status = errDone;
+	}
+	return status;
+}
+
+/*
+**	Fill the data from the decoder stream.
+*/
+PRIVATE int from_decoder(
+	appledouble_decode_object* p_ap_decode_obj, 
+	char 	*buff, 
+	int 	buff_size, 
+	uint32	*in_count)
+{
+	int 	status;
+	
+	switch (p_ap_decode_obj->encoding)
+	{
+		case kEncodeQP:
+			status = from_qp(p_ap_decode_obj,
+						buff,
+						buff_size,
+						in_count);
+			break;
+		case kEncodeBase64:
+			status = from_64(p_ap_decode_obj,
+						buff,
+						buff_size,
+						in_count);
+			break;
+		case kEncodeUU:
+			status = from_uu(p_ap_decode_obj,
+						buff,
+						buff_size,
+						in_count);
+			break;
+		case kEncodeNone:
+		default:
+			status = from_none(p_ap_decode_obj, 
+						buff,
+						buff_size,
+						in_count);
+			break;
+	}
+	return status;
+}
+
+/*
+**	decoder_seek
+**
+**	simulate a stream seeking on the encoded stream.
+*/
+PRIVATE int decoder_seek(
+	appledouble_decode_object* p_ap_decode_obj, 
+	int 	seek_pos, 
+	int 	start_pos)
+{
+	char 	tmp[1024];
+	int  	status = NOERR;
+	uint32	 in_count;
+	
+	/*
+	**	 force a reset on the in buffer.
+	*/
+	p_ap_decode_obj->state64 	= 0;
+	p_ap_decode_obj->left    	= 0;
+	p_ap_decode_obj->pos_inbuff = start_pos;
+	p_ap_decode_obj->uu_starts_line = TRUE;
+	p_ap_decode_obj->uu_bytes_written = p_ap_decode_obj->uu_line_bytes = 0;
+	p_ap_decode_obj->uu_state = kWaitingForBegin;
+	
+	while (seek_pos > 0)
+	{
+		status = from_decoder(p_ap_decode_obj, 
+						tmp, 
+						MIN(1024, seek_pos), 
+						&in_count);
+		if (status != NOERR)
+			break;
+		
+		seek_pos -= in_count;
+	}
+	return status;
+}
+
+#define XX 127
+/*
+ * Table for decoding base64
+ */
+static char index_64[256] = {
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,62, XX,XX,XX,63,
+    52,53,54,55, 56,57,58,59, 60,61,XX,XX, XX,XX,XX,XX,
+    XX, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
+    15,16,17,18, 19,20,21,22, 23,24,25,XX, XX,XX,XX,XX,
+    XX,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
+    41,42,43,44, 45,46,47,48, 49,50,51,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+};
+
+#ifdef XP_OS2_HACK
+/*DSR102196 - the OS/2 Visual Age compiler croaks when it tries*/
+/*to optomize this macro (/O+ on CSD4)                         */ 
+char CHAR64(int c)
+{
+   unsigned char index;
+   char rc;
+
+   index = (unsigned char) c;
+   rc = index_64[index];
+   return rc;
+} 
+#else /*normal code...*/
+#define CHAR64(c)  (index_64[(unsigned char)(c)])
+#endif
+#define EndOfBuff(p)	((p)->pos_inbuff >= (p)->s_inbuff)
+
+PRIVATE int fetch_next_char_64(
+	appledouble_decode_object* p_ap_decode_obj)
+{
+	char c;
+	
+	c = p_ap_decode_obj->inbuff[p_ap_decode_obj->pos_inbuff++];
+	if (c == '-')
+		--p_ap_decode_obj->pos_inbuff;		/* put back					*/
+	
+	while (c == LF || c == CR)				/* skip the CR character.	*/
+	{
+		if (EndOfBuff(p_ap_decode_obj))
+		{
+			c = 0;
+			break;
+		}
+		
+		c = p_ap_decode_obj->inbuff[p_ap_decode_obj->pos_inbuff++];
+		if (c == '-')
+		{
+			--p_ap_decode_obj->pos_inbuff;	/* put back					*/
+		}
+	}
+	return (int)c;
+}
+
+
+PRIVATE int from_64(
+	appledouble_decode_object* p_ap_decode_obj, 
+	char	 *buff, 
+	int 	size, 
+	uint32 	*real_size)
+{
+	int 	i, j, buf[4];
+	int 	c1, c2, c3, c4;
+	
+	(*real_size) = 0;
+	
+	/*
+	** 	decode 4 by 4s characters
+	*/
+	for (i = p_ap_decode_obj->state64; i<4; i++)
+	{
+		if (EndOfBuff(p_ap_decode_obj))
+		{
+			p_ap_decode_obj->state64 = i;
+			break;
+		}
+		if ((p_ap_decode_obj->c[i] = fetch_next_char_64(p_ap_decode_obj)) == 0)
+			break;
+	}
+	
+	if (i != 4)
+	{
+		/*
+		** not enough data to fill the decode buff.
+		*/
+		return errEOB;						/* end of buff	*/
+	}
+		
+	while (size > 0)
+	{
+		c1 = p_ap_decode_obj->c[0];
+		c2 = p_ap_decode_obj->c[1];
+		c3 = p_ap_decode_obj->c[2];
+		c4 = p_ap_decode_obj->c[3];
+		
+		if (c1 == '-' || c2 == '-' || c3 == '-' || c4 == '-')
+		{
+			return errEOP;			/* we meet the part boundary.	*/
+		}
+		
+        if (c1 == '=' || c2 == '=') 
+        {
+            return errDecoding;
+        }
+        
+        c1 = CHAR64(c1);
+        c2 = CHAR64(c2);
+		buf[0] = ((c1<<2) | ((c2&0x30)>>4));
+		
+        if (c3 != '=') 
+        {
+            c3 = CHAR64(c3);
+		    buf[1] = (((c2&0x0F) << 4) | ((c3&0x3C) >> 2));
+
+            if (c4 != '=') 
+            {
+                c4 = CHAR64(c4);
+				buf[2] = (((c3&0x03) << 6) | c4);
+            }
+            else
+            {
+            	if (p_ap_decode_obj->left == 0)
+            	{
+	        		*buff++ = buf[0]; (*real_size)++;
+	        	}
+	        	*buff++ = buf[1]; (*real_size)++;
+				/* return errEOP; */ /* bug 87784 */
+				return EndOfBuff(p_ap_decode_obj) ? errEOP : NOERR;
+            }
+        }
+        else
+        {
+        	*buff++ = *buf;
+        	(*real_size)++;
+			/* return errEOP; *bug 87784*/	/* we meet the the end	*/	
+			return EndOfBuff(p_ap_decode_obj) ? errEOP : NOERR;
+        }
+        /*
+		** copy the content
+		*/
+		for (j = p_ap_decode_obj->left; j<3; )
+		{
+			*buff++ = buf[j++];	
+			(*real_size)++;
+			if (--size <= 0)
+				break;
+		}
+		p_ap_decode_obj->left = j % 3;
+			
+		if (size <=0)
+		{
+			if (j == 3)
+				p_ap_decode_obj->state64 = 0;	/* See if we used up all data, 	*/
+												/* ifnot, keep the data, 		*/
+												/* we need it for next time.	*/
+			else
+				p_ap_decode_obj->state64 = 4;
+				
+			break;
+		}
+			
+		/*
+		**	fetch the next 4 character group. 
+		*/
+		for (i = 0; i < 4; i++)
+		{
+			if (EndOfBuff(p_ap_decode_obj))
+				break;
+
+			if ((p_ap_decode_obj->c[i] = fetch_next_char_64(p_ap_decode_obj)) == 0)
+				break;
+		}
+
+		p_ap_decode_obj->state64 = i % 4;
+	
+		if (i != 4)
+			break;								/* some kind of end of buff met.*/
+	}
+
+	/*
+	**	decide the size and status. 
+	*/
+	return EndOfBuff(p_ap_decode_obj) ? errEOB : NOERR;
+}
+
+/*
+ * Table for decoding hexadecimal in quoted-printable
+ */
+static char index_hex[256] = {
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+     0, 1, 2, 3,  4, 5, 6, 7,  8, 9,XX,XX, XX,XX,XX,XX,
+    XX,10,11,12, 13,14,15,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,10,11,12, 13,14,15,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+};
+
+#define HEXCHAR(c)  	(index_hex[(unsigned char)(c)])
+#define NEXT_CHAR(p)	((int)((p)->inbuff[(p)->pos_inbuff++]))
+#define CURRENT_CHAR(p)	((int)((p)->inbuff[(p)->pos_inbuff]))
+/* 
+**	quoted printable decode, as defined in RFC 1521, page18 - 20
+*/
+PRIVATE int from_qp(
+	appledouble_decode_object* p_ap_decode_obj, 
+	char	*buff, 
+	int 	size, 
+	uint32 	*real_size)
+{
+    char c;
+    int c1, c2;
+	
+	*real_size = 0;
+	
+	if (p_ap_decode_obj->c[0] == '=')
+	{
+		/*
+		** continue with the last time's left over.
+		*/
+		p_ap_decode_obj->c[0] = 0;
+		
+		c1 = p_ap_decode_obj->c[1];		p_ap_decode_obj->c[1] = 0;
+		
+		if ( c1 == 0)
+		{
+			c1 = NEXT_CHAR(p_ap_decode_obj);
+			c2 = NEXT_CHAR(p_ap_decode_obj);
+		}
+		else
+		{
+			c2 = NEXT_CHAR(p_ap_decode_obj);
+		}
+		c = HEXCHAR(c1) << 4 | HEXCHAR(c2);
+		
+		size --;
+		*buff ++ = c;
+		(*real_size) ++;
+	}
+
+	/* 
+	**	Then start to work on the new data 
+	*/
+	while (size > 0)
+	{
+		if (EndOfBuff(p_ap_decode_obj))
+			break;
+
+		c1 = NEXT_CHAR(p_ap_decode_obj);
+	
+		if (c1 == '=')
+		{
+			if (EndOfBuff(p_ap_decode_obj))
+			{
+				p_ap_decode_obj->c[0] = c1;
+				break;				
+			}
+			
+			c1 = NEXT_CHAR(p_ap_decode_obj);
+			if (c1 != '\n') 
+			{
+				/*
+				**	Rule #2	
+				*/
+				c1 = HEXCHAR(c1);
+				if (EndOfBuff(p_ap_decode_obj))
+				{
+					p_ap_decode_obj->c[0] = '=';
+					p_ap_decode_obj->c[1] = c1;
+					break;
+				}
+				
+				c2 = NEXT_CHAR(p_ap_decode_obj);
+				c2 = HEXCHAR(c2);
+				c = c1 << 4 | c2;
+				if (c != '\r')
+				{
+					size --;
+					*buff++ = c;
+					(*real_size)++;
+				}
+			}
+			else
+			{
+				/* ignore the line break -- soft line break, rule #5	*/
+			}
+		}
+		else 
+		{
+			if (c1 == CR || c1 == LF)
+			{
+				if (p_ap_decode_obj->pos_inbuff < p_ap_decode_obj->s_inbuff)
+				{
+					if (p_ap_decode_obj->boundary0 && 
+					 	(!XP_STRNCASECMP(p_ap_decode_obj->pos_inbuff+p_ap_decode_obj->inbuff, 
+									"--",
+									2) 
+					&&
+						!XP_STRNCASECMP(p_ap_decode_obj->pos_inbuff+p_ap_decode_obj->inbuff+2, 
+									p_ap_decode_obj->boundary0, 
+									XP_STRLEN(p_ap_decode_obj->boundary0))))
+						{
+							return errEOP;
+						} 
+				}
+			}
+			
+			/* 
+			**	general 8bits case, Rule #1
+			*/ 
+			size -- ;
+			*buff++ = c1;
+			(*real_size) ++;
+		}
+	}
+	return EndOfBuff(p_ap_decode_obj) ? errEOB : NOERR;
+}
+
+#define UUEOL(c) (((c) == CR) || ((c) == LF))
+# undef UUDEC
+# define UUDEC(c) (((c) - ' ') & 077)
+
+/* Check for and skip past the "begin" line of a uuencode body. */
+PRIVATE void ensure_uu_body_state(appledouble_decode_object* p)
+{
+	char *end = &(p->inbuff[p->s_inbuff]);
+	char *current = &(p->inbuff[p->pos_inbuff]);
+
+	if (p->uu_state == kMainBody && p->uu_starts_line
+		&& !XP_STRNCASECMP(current, "end", MIN(3, end - current)))
+		p->uu_state = kEnd;
+
+	while (p->uu_state != kMainBody && (current < end))
+	{
+		switch(p->uu_state)
+		{
+			case kWaitingForBegin:
+			case kBegin:
+				/* If we're not at the beginning of a line, move to the next line. */
+				if (! p->uu_starts_line)
+				{
+					while(current < end && !UUEOL(*current))
+						current++;
+					while(current < end && UUEOL(*current))
+						current++;
+
+					p->uu_starts_line = TRUE; /* we reached the start of a line */
+					if (p->uu_state == kBegin) 
+						p->uu_state = kMainBody;
+
+					continue;
+				}
+				else
+				{
+					/*
+						At the start of a line. Test for "begin". 
+
+						### mwelch:
+
+						There is a potential danger here. If a buffer ends with a line
+						starting with some substring of "begin", this code will be fooled
+						into thinking that the uuencode body starts with the following line.
+						If the message itself contains lines that begin with a substring of
+						"begin", such as "be", "because", or "bezoar", and if those lines happen
+						to end a 1024-byte chunk, this becomes Really Bad. However, there is 
+						no good, safe way to overcome this problem. So, for now, I hope and 
+						pray that the 1024 character limit will always incorporate the entire 
+						first line of a uuencode body.
+
+						It should be noted that broken messages that have the body text in 
+						the same MIME part as the uuencode attachment also risk this same 
+						pitfall if any line in the message starts with "begin". 
+					*/
+
+					if ((p->uu_state == kWaitingForBegin)
+						&& !XP_STRNCASECMP(current, "begin", MIN(5, end - current)))
+						p->uu_state = kBegin;
+					p->uu_starts_line = FALSE; /* make us advance to next line */
+				}
+				break;
+			case kEnd:
+				/* Run out the buffer. */
+				current = end;
+		}
+	}
+
+	/* Record where we stopped scanning. */	
+	p->pos_inbuff = p->s_inbuff - (end - current);
+}
+
+#define UU_VOID_CHAR 0
+
+PRIVATE int fetch_next_char_uu(appledouble_decode_object* p, XP_Bool newBunch)
+{
+	char c=0;
+	XP_Bool gotChar = FALSE;
+
+	if (EndOfBuff(p))
+		return 0;
+
+	while(!gotChar)
+	{
+		if (EndOfBuff(p))
+		{
+			c = 0;
+			gotChar = TRUE;
+		}
+		else if (p->uu_starts_line)
+		{
+			char *end = &(p->inbuff[p->s_inbuff]);
+			char *current = &(p->inbuff[p->pos_inbuff]);
+			
+			/* Look here for 'end' line signifying end of uuencode body. */
+			if (!XP_STRNCASECMP(current, "end", MIN(3, end - current)))
+			{
+				p->uu_state = kEnd; /* set the uuencode state to end */
+				p->pos_inbuff = p->s_inbuff; /* run out the current buffer */
+
+				c = 0;				/* return a 0 to uudecoder */
+				gotChar = TRUE;
+			}
+		}
+		if (gotChar) 
+			continue;
+
+		c = NEXT_CHAR(p);
+		
+		if ((c == CR) || (c == LF))
+		{
+			if (newBunch)
+			{
+				/*	A new line could immediately follow either a CR or an LF. 
+					If we reach the end of a buffer, simply assume the next buffer
+					will start a line (as it should in the current libmime implementation).
+					If it starts with CR or LF, that line will be skipped as well. */
+				if (EndOfBuff(p) || ((CURRENT_CHAR(p) != CR) && (CURRENT_CHAR(p) != LF)))
+					p->uu_starts_line = TRUE;
+
+				continue;
+			}
+			
+			/* End of line, but we have to finish a 4-tuple. Stop here. */
+			-- p->pos_inbuff; /* give back the end-of-line character */
+			c = UU_VOID_CHAR; /* flag as truncated */
+			gotChar = TRUE;
+		}
+
+		/* At this point, we have a valid char. */
+
+		else if (p->uu_starts_line)
+		{
+			/* read length char at start of each line */
+			p->uu_line_bytes = UUDEC(c);
+			p->uu_starts_line = FALSE;
+			continue;
+		}
+
+		else if (p->uu_line_bytes <= 0)
+			/* We ran out of bytes to decode on this line. Skip spare chars until
+				we reach the end of (line or buffer). */
+			continue;
+
+		else
+			gotChar = TRUE; /* valid returnable char */
+	}
+	
+	return (int) c;
+}
+
+/* 
+**	uudecode
+*/
+
+PRIVATE int from_uu(
+	appledouble_decode_object* p_ap_decode_obj, 
+	char	*buff, 
+	int 	size, 
+	uint32 	*real_size)
+{
+    char c;
+    int i;
+    int returnVal = NOERR;
+	int 	c1, c2, c3, c4;
+	
+	*real_size = 0;
+	
+	/*	Make sure that we're in the uuencode body, or run out the buffer if
+		we don't have any body text in this buffer. */
+	ensure_uu_body_state(p_ap_decode_obj);
+	
+	if (p_ap_decode_obj->uu_state == kEnd)
+		return errEOP;
+	
+	/* Continue with what was left over last time. */
+	for (i = p_ap_decode_obj->state64; i<4; i++)
+	{
+		if (EndOfBuff(p_ap_decode_obj))
+		{
+			p_ap_decode_obj->state64 = i;
+			break;
+		}
+		if ((p_ap_decode_obj->c[i] = fetch_next_char_uu(p_ap_decode_obj, (i==0))) == 0)
+			break;
+	}
+
+	if ( (i < p_ap_decode_obj->uu_line_bytes+1)
+		&& (EndOfBuff(p_ap_decode_obj)))
+		/* not enough data to decode, return here. */
+		return errEOB;
+
+	while((size > 0) && (!EndOfBuff(p_ap_decode_obj)))
+	{
+		c1 = p_ap_decode_obj->c[0];
+		c2 = p_ap_decode_obj->c[1];
+		c3 = p_ap_decode_obj->c[2];
+		c4 = p_ap_decode_obj->c[3];
+		
+		/*
+			At this point we have characters ready to decode.
+			Convert them to binary bytes.
+		*/
+		if ((i > 1) 
+			&& (p_ap_decode_obj->uu_bytes_written < 1)
+			&& (p_ap_decode_obj->uu_line_bytes > 0))
+		{
+			c = UUDEC(c1) << 2 | UUDEC(c2) >> 4;
+			size --;
+			*buff ++ = c;
+			(*real_size) ++;
+			p_ap_decode_obj->uu_line_bytes--;
+			p_ap_decode_obj->uu_bytes_written++;
+		}
+		
+		if ((i > 2) && (size > 0) 
+			&& (p_ap_decode_obj->uu_bytes_written < 2)
+			&& (p_ap_decode_obj->uu_line_bytes > 0))
+		{
+			c = UUDEC(c2) << 4 | UUDEC(c3) >> 2;
+			size --;
+			*buff ++ = c;
+			(*real_size) ++;
+			p_ap_decode_obj->uu_line_bytes--;
+			p_ap_decode_obj->uu_bytes_written++;
+		}
+
+		if ((i > 3) && (size > 0)
+			&& (p_ap_decode_obj->uu_line_bytes > 0))
+		{
+			c = UUDEC(c3) << 6 | UUDEC(c4);
+			size --;
+			*buff ++ = c;
+			(*real_size) ++;
+			p_ap_decode_obj->uu_line_bytes--;
+			p_ap_decode_obj->uu_bytes_written = 0;
+		}
+
+		if (p_ap_decode_obj->uu_state == kEnd)
+			continue;
+
+		/* If this line is finished, this tuple is also finished. */
+		if (p_ap_decode_obj->uu_line_bytes <= 0)
+			p_ap_decode_obj->uu_bytes_written = 0;
+
+		if (p_ap_decode_obj->uu_bytes_written > 0)
+		{
+			/* size == 0, but we have bytes left in current tuple */
+			p_ap_decode_obj->state64 = i;
+			continue;
+		}
+			
+		/*
+		**	fetch the next 4 character group. 
+		*/
+			
+		for (i = 0; i < 4; i++)
+		{
+			if (EndOfBuff(p_ap_decode_obj))
+				break;
+
+			if ((p_ap_decode_obj->c[i] = fetch_next_char_uu(p_ap_decode_obj, (i == 0))) == 0)
+				break;
+		}
+
+		p_ap_decode_obj->state64 = i;
+
+		if ( (i < p_ap_decode_obj->uu_line_bytes+1)
+			&& (EndOfBuff(p_ap_decode_obj)))
+			/* not enough data to decode, return here. */
+			continue;
+	}
+
+	if (p_ap_decode_obj->uu_state == kEnd)
+		returnVal = errEOP;
+	else if (EndOfBuff(p_ap_decode_obj))
+		returnVal = errEOB;
+		
+	return returnVal;
+}
+
+/*
+**	from_none
+**
+**	plain text transfer.
+*/
+PRIVATE int from_none(
+	appledouble_decode_object* p_ap_decode_obj, 
+	char 	*buff, 
+	int 	size, 
+	uint32 	*real_size)
+{
+	char 	c;
+    int  	i, status = NOERR; 
+    int		left = p_ap_decode_obj->s_inbuff - p_ap_decode_obj->pos_inbuff;
+    int		total = MIN(size, left);
+    
+	for (i = 0; i < total; i++)
+	{	
+		*buff ++ = c = NEXT_CHAR(p_ap_decode_obj);
+		if (c == CR || c == LF)
+		{
+			/* make sure the next thing is not a boundary string */
+			if (p_ap_decode_obj->pos_inbuff < p_ap_decode_obj->s_inbuff)
+			{
+				if (p_ap_decode_obj->boundary0 && 
+				 	(!XP_STRNCASECMP(p_ap_decode_obj->pos_inbuff+p_ap_decode_obj->inbuff, 
+								"--",
+								2) 
+				&&
+					!XP_STRNCASECMP(p_ap_decode_obj->pos_inbuff+p_ap_decode_obj->inbuff+2, 
+								p_ap_decode_obj->boundary0, 
+								XP_STRLEN(p_ap_decode_obj->boundary0))))
+					{
+						status = errEOP;
+						break;
+					} 
+			}
+		}
+	}
+	
+	*real_size = i;
+	if (status == NOERR)
+		status = (left == i) ? errEOB : status;
+	return status;
+}
+
diff --git a/mozilla/lib/mailto/ap_encod.c b/mozilla/lib/mailto/ap_encod.c
new file mode 100644
index 00000000000..6e820900c78
--- /dev/null
+++ b/mozilla/lib/mailto/ap_encod.c
@@ -0,0 +1,733 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ *
+ *   apple_double_encode.c
+ *	 ---------------------
+ *
+ *    The routines doing the Apple Double Encoding.
+ *		
+ *			2aug95	mym	Created.
+ *		
+ */
+
+#include "msg.h"
+#include "appledbl.h"
+#include "ad_codes.h"
+
+#ifdef XP_MAC
+
+extern int MK_UNABLE_TO_OPEN_TMP_FILE;
+extern int MK_MIME_ERROR_WRITING_FILE;
+
+#include <Errors.h>
+
+/*
+**	Local Functions prototypes.
+*/
+PRIVATE int output64chunk( appledouble_encode_object* p_ap_encode_obj, 
+				int c1, int c2, int c3, int pads);
+				
+PRIVATE int to64(appledouble_encode_object* p_ap_encode_obj, 
+				char	*p, 
+				int 	in_size);
+ 
+PRIVATE int finish64(appledouble_encode_object* p_ap_encode_obj);
+
+
+#define BUFF_LEFT(p)	((p)->s_outbuff - (p)->pos_outbuff)	
+
+/*
+**	write_stream.
+*/
+int write_stream(
+	appledouble_encode_object *p_ap_encode_obj,
+	char 	*out_string,
+	int	 	len)			
+{	
+	if (p_ap_encode_obj->pos_outbuff + len < p_ap_encode_obj->s_outbuff)
+	{
+		XP_MEMCPY(p_ap_encode_obj->outbuff + p_ap_encode_obj->pos_outbuff, 
+				out_string, 
+				len);
+		p_ap_encode_obj->pos_outbuff += len;
+		return noErr;
+	}
+	else
+	{
+		/*
+		**	If the buff doesn't have enough space, use the overflow buffer then.
+		*/
+		int s_len = p_ap_encode_obj->s_outbuff - p_ap_encode_obj->pos_outbuff;
+		
+		XP_MEMCPY(p_ap_encode_obj->outbuff + p_ap_encode_obj->pos_outbuff, 
+					out_string, 
+					s_len);
+		XP_MEMCPY(p_ap_encode_obj->b_overflow + p_ap_encode_obj->s_overflow,
+					out_string + s_len,
+					p_ap_encode_obj->s_overflow += (len - s_len));
+		p_ap_encode_obj->pos_outbuff += s_len;
+		return errEOB;
+	}
+}
+
+int fill_apple_mime_header(
+	appledouble_encode_object *p_ap_encode_obj)
+{
+	int  status;
+	
+	char tmpstr[266];
+	
+#if 0	
+//	strcpy(tmpstr, "Content-Type: multipart/mixed; boundary=\"-\"\n\n---\n");
+//	status = write_stream(p_ap_encode_env, 
+//						tmpstr,
+//						strlen(tmpstr));
+//	if (status != noErr)
+//		return status;
+
+	sprintf(tmpstr,
+			"Content-Type: multipart/appledouble; boundary=\"=\"; name=\"");
+	status = write_stream(p_ap_encode_obj, 
+						tmpstr,
+						strlen(tmpstr));
+	if (status != noErr)
+		return status;
+		
+	status = write_stream(p_ap_encode_obj,
+						p_ap_encode_obj->fname,
+						XP_STRLEN(p_ap_encode_obj->fname));
+	if (status != noErr)
+		return status;
+		
+	XP_SPRINTF(tmpstr,
+			"\"\nContent-Disposition: inline; filename=\"%s\"\n\n\n--=\n",
+			p_ap_encode_obj->fname);
+#endif
+	XP_SPRINTF(tmpstr, "--%s"CRLF, p_ap_encode_obj->boundary);
+	status = write_stream(p_ap_encode_obj, 
+						tmpstr, 
+						XP_STRLEN(tmpstr));
+	return status;
+} 
+
+int ap_encode_file_infor(
+	appledouble_encode_object *p_ap_encode_obj)
+{
+	CInfoPBRec cipbr;
+	HFileInfo *fpb = (HFileInfo *)&cipbr;
+	ap_header	head;
+	ap_entry 	entries[NUM_ENTRIES];
+	ap_dates 	dates;
+	short 		i;
+	long 		comlen, procID;
+	DateTimeRec cur_time;
+	unsigned 	long cur_secs;
+	IOParam 	vinfo;
+	GetVolParmsInfoBuffer vp;
+	DTPBRec 	dtp;
+	char 		comment[256];
+	Str63		fname;
+	int	 		status;
+
+	strcpy((char *)fname+1,p_ap_encode_obj->fname);
+	fname[0] = XP_STRLEN(p_ap_encode_obj->fname);
+	
+	fpb->ioNamePtr = fname;
+	fpb->ioDirID   = p_ap_encode_obj->dirId;
+	fpb->ioVRefNum = p_ap_encode_obj->vRefNum;
+	fpb->ioFDirIndex = 0;
+	if (PBGetCatInfoSync(&cipbr) != noErr) 
+	{
+		return errFileOpen;
+	}
+
+	/* get a file comment, if possible */
+	procID = 0;
+	GetWDInfo(p_ap_encode_obj->vRefNum, &fpb->ioVRefNum, &fpb->ioDirID, &procID);
+	memset((void *) &vinfo, '\0', sizeof (vinfo));
+	vinfo.ioCompletion  = nil;
+	vinfo.ioVRefNum 	= fpb->ioVRefNum;
+	vinfo.ioBuffer 		= (Ptr) &vp;
+	vinfo.ioReqCount 	= sizeof (vp);
+	comlen = 0;
+	if (PBHGetVolParmsSync((HParmBlkPtr) &vinfo) == noErr &&
+		((vp.vMAttrib >> bHasDesktopMgr) & 1)) 
+	{
+		memset((void *) &dtp, '\0', sizeof (dtp));
+		dtp.ioVRefNum = fpb->ioVRefNum;
+		if (PBDTGetPath(&dtp) == noErr) 
+		{
+			dtp.ioCompletion = nil;
+			dtp.ioDTBuffer = (Ptr) comment;
+			dtp.ioNamePtr  = fpb->ioNamePtr;
+			dtp.ioDirID    = fpb->ioFlParID;
+			if (PBDTGetCommentSync(&dtp) == noErr) 
+				comlen = dtp.ioDTActCount;
+		}
+	}
+	
+	/* write header */
+//	head.magic = dfork ? APPLESINGLE_MAGIC : APPLEDOUBLE_MAGIC;
+	head.magic   = APPLEDOUBLE_MAGIC;		/* always do apple double */
+	head.version = VERSION;
+	memset(head.fill, '\0', sizeof (head.fill));
+	head.entries = NUM_ENTRIES - 1;
+	status = to64(p_ap_encode_obj,
+					(char *) &head,
+					sizeof (head));				
+	if (status != noErr)
+		return status;
+
+	/* write entry descriptors */
+	entries[0].offset = sizeof (head) + sizeof (ap_entry) * head.entries;
+	entries[0].id 	= ENT_NAME;
+	entries[0].length = *fpb->ioNamePtr;
+	entries[1].id 	= ENT_FINFO;
+	entries[1].length = sizeof (FInfo) + sizeof (FXInfo);
+	entries[2].id 	= ENT_DATES;
+	entries[2].length = sizeof (ap_dates);
+	entries[3].id 	= ENT_COMMENT;
+	entries[3].length = comlen;
+	entries[4].id 	= ENT_RFORK;
+	entries[4].length = fpb->ioFlRLgLen;
+	entries[5].id 	= ENT_DFORK;
+	entries[5].length = fpb->ioFlLgLen;
+
+	/* correct the link in the entries. */
+	for (i = 1; i < NUM_ENTRIES; ++i) 
+	{
+		entries[i].offset = entries[i-1].offset + entries[i-1].length;
+	}
+	status = to64(p_ap_encode_obj,
+					(char *) entries,
+					sizeof (ap_entry) * head.entries); 
+	if (status != noErr)
+		return status;
+
+	/* write name */
+	status = to64(p_ap_encode_obj,
+					(char *) fpb->ioNamePtr + 1,
+					*fpb->ioNamePtr); 
+	if (status != noErr)
+		return status;
+	
+	/* write finder info */
+	status = to64(p_ap_encode_obj,
+					(char *) &fpb->ioFlFndrInfo,
+					sizeof (FInfo));
+	if (status != noErr)
+		return status;
+					  
+	status = to64(p_ap_encode_obj,
+					(char *) &fpb->ioFlXFndrInfo,
+					sizeof (FXInfo));
+	if (status != noErr)
+		return status;
+
+	/* write dates */
+	GetTime(&cur_time);
+	DateToSeconds(&cur_time, &cur_secs);
+	dates.create = fpb->ioFlCrDat + CONVERT_TIME;
+	dates.modify = fpb->ioFlMdDat + CONVERT_TIME;
+	dates.backup = fpb->ioFlBkDat + CONVERT_TIME;
+	dates.access = cur_secs + CONVERT_TIME;
+	status = to64(p_ap_encode_obj,
+					(char *) &dates,
+					sizeof (ap_dates)); 
+	if (status != noErr)
+		return status;
+	
+	/* write comment */
+	if (comlen)
+	{
+		status = to64(p_ap_encode_obj,
+					comment,
+					comlen * sizeof(char));
+	}
+	/*
+	**	Get some help information on deciding the file type.
+	*/
+	if (fpb->ioFlFndrInfo.fdType == 'TEXT' || fpb->ioFlFndrInfo.fdType == 'text')
+	{
+		p_ap_encode_obj->text_file_type = true;
+	}
+	
+	return status;	
+}
+/*
+**	ap_encode_header
+**
+**		encode the file header and the resource fork.
+**
+*/
+int ap_encode_header(
+	appledouble_encode_object* p_ap_encode_obj, 
+	XP_Bool  firstime)
+{
+	Str255 	name;
+	char   	rd_buff[256];
+	short   fileId;
+	OSErr	retval = noErr;
+	int    	status;
+	long	inCount;
+	
+	if (firstime)
+	{
+		XP_STRCPY(rd_buff, 
+			"Content-Type: application/applefile\nContent-Transfer-Encoding: base64\n\n");
+		status = write_stream(p_ap_encode_obj,
+			 				rd_buff, 
+			 				strlen(rd_buff)); 
+		if (status != noErr)
+			return status;
+			
+		status = ap_encode_file_infor(p_ap_encode_obj); 
+		if (status != noErr)
+			return status;
+		
+		/*
+		** preparing to encode the resource fork.
+		*/
+		name[0] = strlen(p_ap_encode_obj->fname);
+		strcpy((char *)name+1, p_ap_encode_obj->fname);
+		if (HOpenRF(p_ap_encode_obj->vRefNum, p_ap_encode_obj->dirId,
+					name, fsRdPerm,
+					&p_ap_encode_obj->fileId) != noErr)
+		{
+			return errFileOpen;			
+		}
+	}
+
+	fileId = p_ap_encode_obj->fileId;
+	while (retval == noErr)
+	{
+		if (BUFF_LEFT(p_ap_encode_obj) < 400)
+			break;
+			
+		inCount = 256;
+		retval = FSRead(fileId, &inCount, rd_buff);
+		if (inCount)
+		{
+			status = to64(p_ap_encode_obj,
+							rd_buff,
+							inCount);
+			if (status != noErr)
+				return status;
+		}
+	}
+	
+	if (retval == eofErr)
+	{
+		FSClose(fileId);
+
+		status = finish64(p_ap_encode_obj);
+		if (status != noErr)
+			return status;
+		
+		/*
+		** write out the boundary 
+		*/
+		XP_SPRINTF(rd_buff, 
+						CRLF"--%s"CRLF, 
+						p_ap_encode_obj->boundary);
+					
+		status = write_stream(p_ap_encode_obj,
+						rd_buff,
+						XP_STRLEN(rd_buff));
+		if (status == noErr)
+			status = errDone;
+	}
+	return status;
+}
+
+static void replace(char *p, int len, char frm, char to)
+{
+	for (; len > 0; len--, p++)
+		if (*p == frm)	*p = to;
+}
+
+/* Description of the various file formats and their magic numbers 		*/
+struct magic 
+{
+    char 	*name;			/* Name of the file format 					*/
+    char 	*num;			/* The magic number 						*/
+    int 	len;			/* Length (0 means strlen(magicnum)) 		*/
+};
+
+/* The magic numbers of the file formats we know about */
+static struct magic magic[] = 
+{
+    { "image/gif", 	"GIF", 			  0 },
+    { "image/jpeg", "\377\330\377",   0 },
+    { "video/mpeg", "\0\0\001\263",	  4 },
+    { "application/postscript", "%!", 0 },
+};
+static int 	num_magic = (sizeof(magic)/sizeof(magic[0]));
+
+static char *text_type    = TEXT_PLAIN;					/* the text file type.	*/		
+static char *default_type = APPLICATION_OCTET_STREAM;
+
+
+/*
+ * Determins the format of the file "inputf".  The name
+ * of the file format (or NULL on error) is returned.
+ */
+PRIVATE char *magic_look(char *inbuff, int numread)
+{
+    int i, j;
+
+	for (i=0; i<num_magic; i++) 
+	{
+	   	if (magic[i].len == 0) 
+	   		magic[i].len = XP_STRLEN(magic[i].num);
+	}
+
+    for (i=0; i<num_magic; i++) 
+    {
+		if (numread >= magic[i].len) 
+		{
+	    	for (j=0; j<magic[i].len; j++) 
+	    	{
+				if (inbuff[j] != magic[i].num[j]) break;
+	    	}
+	    	
+	    	if (j == magic[i].len) 
+	    		return magic[i].name;
+		}
+    }
+
+    return default_type;
+}
+/*
+**	ap_encode_data
+**
+**	---------------
+**
+**		encode on the data fork.
+**
+*/
+int ap_encode_data(
+	appledouble_encode_object* p_ap_encode_obj, 
+	XP_Bool firstime)
+{
+	Str255		name;
+	char   		rd_buff[256];
+	short		fileId;
+	OSErr		retval = noErr;
+	long		in_count;
+	int			status;
+	
+	if (firstime)
+	{	
+		char* magic_type;
+			
+		/*
+		** preparing to encode the data fork.
+		*/
+		name[0] = XP_STRLEN(p_ap_encode_obj->fname);
+		XP_STRCPY((char*)name+1, p_ap_encode_obj->fname);
+		if (HOpen( 	p_ap_encode_obj->vRefNum,
+					p_ap_encode_obj->dirId, 
+					name, 
+					fsRdPerm, 
+					&fileId) != noErr)
+		{
+			return errFileOpen;
+		}
+		p_ap_encode_obj->fileId = fileId;
+			
+		
+		if (!p_ap_encode_obj->text_file_type)
+		{	
+			OSErr 	err;
+			FSSpec	file_spec;
+			char*	path;
+			Bool	do_magic = true;
+			
+			/* 	First attempt to get the file's mime type via FE_FileType.
+				If that fails, we'll do a "magic_look"
+			*/
+			
+			err = FSMakeFSSpec(p_ap_encode_obj->vRefNum, p_ap_encode_obj->dirId, name, &file_spec);
+			if (err == noErr)
+			{
+				path = my_PathnameFromFSSpec(&file_spec);
+				if (path != NULL)
+				{
+					char* ignore;
+					FE_FileType(path, &do_magic, &magic_type, &ignore);
+					
+					/* 
+					   if we ended up with the default type, dispose of it
+					   so we can do a magic_look
+					*/
+					 
+					if (do_magic && magic_type)
+						XP_FREE(magic_type);
+				}
+			}
+		
+			if (do_magic)
+			{
+				/*
+				**	do a smart check for the file type.
+				*/
+				in_count = 256;
+				retval 	 = FSRead(fileId, &in_count, rd_buff);
+				magic_type = magic_look(rd_buff, in_count);
+				
+				/* don't forget to rewind the index to start point. */ 
+				SetFPos(fileId, fsFromStart, 0L);
+			}
+		}
+		else
+		{
+			magic_type = text_type;		/* we already know it is a text type.	*/
+		}
+
+		/*
+		**	the data portion header information.
+		*/
+		XP_SPRINTF(rd_buff, 
+			"Content-Type: %s; name=\"%s\"" CRLF "Content-Transfer-Encoding: base64" CRLF "Content-Disposition: inline; filename=\"%s\""CRLF CRLF,
+			magic_type,
+			p_ap_encode_obj->fname,
+			p_ap_encode_obj->fname);
+			
+		status = write_stream(p_ap_encode_obj, 
+					rd_buff, 
+					XP_STRLEN(rd_buff)); 
+		if (status != noErr)
+			return status;
+	}
+	
+	while (retval == noErr)
+	{
+		if (BUFF_LEFT(p_ap_encode_obj) < 400)
+			break;
+			
+		in_count = 256;
+		retval = FSRead(p_ap_encode_obj->fileId, 
+						&in_count, 
+						rd_buff);
+		if (in_count)
+		{
+/*			replace(rd_buff, in_count, '\r', '\n');	 						*/
+/* ** may be need to do character set conversion here for localization.	**  */		
+			status = to64(p_ap_encode_obj,
+						rd_buff,
+						in_count);
+			if (status != noErr)
+				return status;
+		}
+	}
+	
+	if (retval == eofErr)
+	{
+		FSClose(p_ap_encode_obj->fileId);
+
+		status = finish64(p_ap_encode_obj);
+		if (status != noErr)
+			return status;
+		
+		/* write out the boundary 	*/
+		
+		XP_SPRINTF(rd_buff, 
+						CRLF"--%s--"CRLF CRLF, 
+						p_ap_encode_obj->boundary);
+	
+		status = write_stream(p_ap_encode_obj,
+						rd_buff,
+						XP_STRLEN(rd_buff));
+	
+		if (status == noErr)				
+			status = errDone;
+	}
+	return status;
+}
+
+static char basis_64[] =
+   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/* 
+**	convert the stream in the inbuff to 64 format and put it in the out buff.
+**  To make the life easier, the caller will responcable of the cheking of the outbuff's bundary.
+*/
+PRIVATE int 
+to64(appledouble_encode_object* p_ap_encode_obj, 
+	char	*p, 
+	int 	in_size) 
+{
+	int 	status;
+    int c1, c2, c3, ct;
+    unsigned char *inbuff = (unsigned char*)p;
+    
+	ct = p_ap_encode_obj->ct;			/* the char count left last time. */
+	
+	/*
+	**	 resume the left state of the last conversion.
+	*/
+	switch (p_ap_encode_obj->state64)
+	{
+		case 0:
+			p_ap_encode_obj->c1 = c1 = *inbuff ++;
+			if (--in_size <= 0)
+			{
+				p_ap_encode_obj->state64 = 1;
+				return noErr;
+			}
+			p_ap_encode_obj->c2 = c2 = *inbuff ++;
+			if (--in_size <= 0)
+			{
+				p_ap_encode_obj->state64 = 2;
+				return noErr;
+			}
+			c3 = *inbuff ++;		--in_size;
+			break;
+		case 1:
+			c1 = p_ap_encode_obj->c1;
+			p_ap_encode_obj->c2 = c2 = *inbuff ++;
+			if (--in_size <= 0)
+			{
+				p_ap_encode_obj->state64 = 2;
+				return noErr;
+			}
+			c3 = *inbuff ++;		--in_size;
+			break;
+		case 2:
+			c1 = p_ap_encode_obj->c1;
+			c2 = p_ap_encode_obj->c2;
+			c3 = *inbuff ++;		--in_size;
+			break;
+	}
+	
+    while (in_size >= 0) 
+    {
+    	status = output64chunk(p_ap_encode_obj, 
+    							c1, 
+    							c2, 
+    							c3, 
+    							0);
+    	if (status != noErr)
+    		return status;
+    		
+    	ct += 4;
+        if (ct > 71) 
+        { 
+        	status = write_stream(p_ap_encode_obj, 
+        						CRLF, 
+        						2);
+        	if (status != noErr)
+        		return status;
+        		
+            ct = 0;
+        }
+
+		if (in_size <= 0)
+		{
+			p_ap_encode_obj->state64 = 0;
+			break;
+		}
+		
+		c1 = (int)*inbuff++;
+		if (--in_size <= 0)
+		{
+			p_ap_encode_obj->c1 = c1;
+			p_ap_encode_obj->state64 = 1;
+			break;
+		}
+		c2 = *inbuff++;
+		if (--in_size <= 0)
+		{
+			p_ap_encode_obj->c1 	 = c1;
+			p_ap_encode_obj->c2 	 = c2;
+			p_ap_encode_obj->state64 = 2;
+			break;
+		}
+		c3 = *inbuff++;
+		in_size--;
+    }
+    p_ap_encode_obj->ct = ct;
+    return status;
+}
+
+/*
+** clear the left base64 encodes.
+*/
+PRIVATE int 
+finish64(appledouble_encode_object* p_ap_encode_obj)
+{
+	int status;
+	
+	switch (p_ap_encode_obj->state64)
+	{
+		case 0:
+			break;
+		case 1:
+			status = output64chunk(p_ap_encode_obj, 
+									p_ap_encode_obj->c1, 
+									0, 
+									0, 
+									2);
+			break;
+		case 2:
+			status = output64chunk(p_ap_encode_obj, 
+									p_ap_encode_obj->c1, 
+									p_ap_encode_obj->c2, 
+									0, 
+									1);
+			break;
+	}
+	status = write_stream(p_ap_encode_obj, CRLF, 2);
+	p_ap_encode_obj->state64 = 0;
+	p_ap_encode_obj->ct	  	 = 0;
+	return status;
+}
+
+PRIVATE int output64chunk(
+	appledouble_encode_object* p_ap_encode_obj, 
+	int c1, int c2, int c3, int pads)
+{
+	char tmpstr[32];
+	char *p = tmpstr;
+	
+    *p++ = basis_64[c1>>2];
+    *p++ = basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)];
+    if (pads == 2) 
+    {
+        *p++ = '=';
+        *p++ = '=';
+    } 
+    else if (pads) 
+    {
+        *p++ = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)];
+        *p++ = '=';
+    } 
+    else 
+    {
+        *p++ = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)];
+        *p++ = basis_64[c3 & 0x3F];
+    }
+	return write_stream(p_ap_encode_obj,
+						tmpstr,
+						p-tmpstr);
+}
+
+#endif			/* if define XP_MAC */
diff --git a/mozilla/lib/mailto/appledbl.c b/mozilla/lib/mailto/appledbl.c
new file mode 100644
index 00000000000..f498518f69b
--- /dev/null
+++ b/mozilla/lib/mailto/appledbl.c
@@ -0,0 +1,615 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+*
+*   apple-double.c
+*	--------------
+*
+*  	  The codes to do apple double encoding/decoding.
+*		
+*		02aug95		mym		created.
+*		27sep95		mym		Add the XP_Mac to ensure the cross-platform.
+*		
+*/
+
+#include "msg.h"
+#include "appledbl.h"
+#include "ad_codes.h"
+
+#ifdef XP_MAC
+
+#pragma warn_unusedarg off
+#include "m_cvstrm.h"
+
+#pragma cplusplus on
+#include "InternetConfig.h"
+#include "ufilemgr.h"
+#include "BufferStream.h"
+#include "Umimemap.h"
+#include "uprefd.h"
+#include "ulaunch.h"
+void DecodingDone( appledouble_decode_object* p_ap_decode_obj );
+
+OSErr my_FSSpecFromPathname(char* src_filename, FSSpec* fspec)
+{
+	/* don't resolve aliases... */
+	return CFileMgr::FSSpecFromLocalUnixPath(src_filename, fspec, false);
+}
+
+char* my_PathnameFromFSSpec(FSSpec* fspec)
+{
+	return CFileMgr::GetURLFromFileSpec(*fspec);
+}
+
+/* returns true if the resource fork should be sent */
+XP_Bool	isMacFile(char* filename)
+{
+	Boolean returnValue = FALSE;
+	
+	FSSpec fspec;
+	my_FSSpecFromPathname(filename, &fspec);
+
+	returnValue = CFileMgr::FileHasResourceFork(fspec);
+	/* always use IC even if the pref isn't checked since we have no
+	 other way to determine if the resource is significant */
+	if ( returnValue  )
+	{
+		
+		CMimeMapper * mapper = CPrefs::sMimeTypes.FindMimeType(fspec);
+		if ( mapper )
+		{
+			returnValue =  mapper->GetFileFlags()& ICmap_resource_fork_mask;
+			return returnValue;
+		}
+		
+		// Get the Internet Config file mapping for this type
+		// and see if the existing resources are significant.
+		
+		// First, get the type/creator of the file.
+		FInfo fileInfo;
+		OSErr err = ::FSpGetFInfo(&fspec, &fileInfo);
+		if (err == noErr)
+		{
+			if ( fileInfo.fdType == 'APPL' )
+				return TRUE;
+			ICMapEntry ent;
+			err = CInternetConfigInterface::GetInternetConfigFileMapping(fileInfo.fdType,
+																		fileInfo.fdCreator,
+																		fspec.name, &ent);
+			if (err == noErr)
+			{
+				// resource fork is significant if the resource fork mask bit is set
+				returnValue = (ent.flags & ICmap_resource_fork_mask) != 0;
+			}
+		}
+	}
+
+	return (XP_Bool) returnValue;
+}
+
+void DecodingDone( appledouble_decode_object* p_ap_decode_obj )
+{
+	FSSpec	fspec;
+			
+	fspec.vRefNum = p_ap_decode_obj->vRefNum;
+	fspec.parID   = p_ap_decode_obj->dirId;
+	fspec.name[0] = XP_STRLEN(p_ap_decode_obj->fname);
+	XP_STRCPY((char*)fspec.name+1, p_ap_decode_obj->fname);
+	CMimeMapper * mapper = CPrefs::sMimeTypes.FindMimeType(fspec);
+	if( mapper && (mapper->GetLoadAction() == CMimeMapper::Launch ) )
+	{
+		 LFileBufferStream file( fspec );
+		 LaunchFile( &file );
+	}	
+}
+
+#pragma cplusplus reset
+
+/*
+*	ap_encode_init
+*	--------------
+*	
+*	Setup the encode envirment
+*/
+
+int ap_encode_init(
+	appledouble_encode_object *p_ap_encode_obj, 
+	char* 	fname,
+	char*	separator)
+{
+	FSSpec	fspec;
+	
+	if (my_FSSpecFromPathname(fname, &fspec) != noErr )
+		return -1;
+	
+	XP_MEMSET(p_ap_encode_obj, 0, sizeof(appledouble_encode_object));
+	
+	/*
+	**	Fill out the source file inforamtion.
+	*/	
+	XP_MEMCPY(p_ap_encode_obj->fname, fspec.name+1, *fspec.name);
+	p_ap_encode_obj->fname[*fspec.name] = '\0';
+	p_ap_encode_obj->vRefNum = fspec.vRefNum;
+	p_ap_encode_obj->dirId   = fspec.parID;
+	
+	p_ap_encode_obj->boundary = XP_STRDUP(separator);
+	return noErr;
+}
+/*
+**	ap_encode_next
+**	--------------
+**		
+**		return :
+**			noErr	:	everything is ok
+**			errDone	:	when encoding is done.
+**			errors	:	otherwise.
+*/
+int ap_encode_next(
+	appledouble_encode_object* p_ap_encode_obj, 
+	char 	*to_buff, 
+	int32 	buff_size, 
+	int32* 	real_size)
+{
+	int status;
+	
+	/*
+	** 	install the out buff now.
+	*/
+	p_ap_encode_obj->outbuff     = to_buff;
+	p_ap_encode_obj->s_outbuff 	 = buff_size;
+	p_ap_encode_obj->pos_outbuff = 0;
+	
+	/*
+	**	first copy the outstandind data in the overflow buff to the out buffer. 
+	*/
+	if (p_ap_encode_obj->s_overflow)
+	{
+		status = write_stream(p_ap_encode_obj, 
+								p_ap_encode_obj->b_overflow,
+								p_ap_encode_obj->s_overflow);
+		if (status != noErr)
+			return status;
+				
+		p_ap_encode_obj->s_overflow = 0;
+	}
+
+	/*
+	** go the next processing stage based on the current state. 
+	*/
+	switch (p_ap_encode_obj->state)
+	{
+		case kInit:
+			/*
+			** We are in the  starting position, fill out the header.
+			*/
+			status = fill_apple_mime_header(p_ap_encode_obj); 
+			if (status != noErr)
+				break;					/* some error happens */
+				
+			p_ap_encode_obj->state = kDoingHeaderPortion;
+			status = ap_encode_header(p_ap_encode_obj, true); 
+										/* it is the first time to calling 		*/							
+			if (status == errDone)
+			{
+				p_ap_encode_obj->state = kDoneHeaderPortion;
+			}
+			else
+			{
+				break;					/* we need more work on header portion.	*/
+			}			
+				
+			/*
+			** we are done with the header, so let's go to the data port.
+			*/
+			p_ap_encode_obj->state = kDoingDataPortion;
+			status = ap_encode_data(p_ap_encode_obj, true);		 	
+										/* it is first time call do data portion */
+							
+			if (status == errDone)
+			{
+				p_ap_encode_obj->state  = kDoneDataPortion;
+				status = noErr;
+			}
+			break;
+
+		case kDoingHeaderPortion:
+		
+			status = ap_encode_header(p_ap_encode_obj, false); 			
+										/* continue with the header portion.	*/
+			if (status == errDone)
+			{
+				p_ap_encode_obj->state = kDoneHeaderPortion;
+			}
+			else
+			{
+				break;					/* we need more work on header portion.	*/				
+			}
+			
+			/*
+			** start the data portion.
+			*/
+			p_ap_encode_obj->state = kDoingDataPortion;
+			status = ap_encode_data(p_ap_encode_obj, true); 					
+										/* it is the first time calling 		*/
+			if (status == errDone)
+			{
+				p_ap_encode_obj->state  = kDoneDataPortion;
+				status = noErr;
+			}
+			break;
+
+		case kDoingDataPortion:
+		
+			status = ap_encode_data(p_ap_encode_obj, false); 				
+										/* it is not the first time				*/
+													
+			if (status == errDone)
+			{
+				p_ap_encode_obj->state = kDoneDataPortion;
+				status = noErr;
+			}
+			break;
+
+		case kDoneDataPortion:
+#if 0
+			status = write_stream(p_ap_encode_obj,
+									"\n-----\n\n",
+									8);
+			if (status == noErr)
+#endif
+				status = errDone;		/* we are really done.					*/
+
+			break;
+	}
+	
+	*real_size = p_ap_encode_obj->pos_outbuff;
+	return status;
+}
+
+/*
+**	ap_encode_end
+**	-------------
+**
+**	clear the apple encoding.
+*/
+
+int ap_encode_end(
+	appledouble_encode_object *p_ap_encode_obj, 
+	XP_Bool is_aborting)
+{
+	/*
+	** clear up the apple doubler.
+	*/
+	if (p_ap_encode_obj == NULL)
+		return noErr;
+
+	if (p_ap_encode_obj->fileId)			/* close the file if it is open.	*/
+		FSClose(p_ap_encode_obj->fileId);
+
+	FREEIF(p_ap_encode_obj->boundary);		/* the boundary string.				*/
+	
+	return noErr;
+}
+
+#endif	/* the ifdef of XP_MAC */
+
+
+/* 
+** The initial of the apple double decoder.
+**
+**	 Set up the next output stream based on the input.
+*/
+int ap_decode_init(
+	appledouble_decode_object* p_ap_decode_obj,
+	XP_Bool	is_apple_single, 
+	XP_Bool	write_as_binhex,
+	void  	*closure)
+{	
+	XP_MEMSET(p_ap_decode_obj, 0, sizeof(appledouble_decode_object));
+	
+	/* presume first buff starts a line */
+	p_ap_decode_obj->uu_starts_line = TRUE; 
+
+	if (write_as_binhex)
+	{
+		p_ap_decode_obj->write_as_binhex = TRUE;
+		p_ap_decode_obj->binhex_stream   = (NET_StreamClass*)closure;
+		p_ap_decode_obj->data_size       = 0;
+	}
+	else
+	{
+		p_ap_decode_obj->write_as_binhex = FALSE;
+		p_ap_decode_obj->binhex_stream   = NULL;
+		
+		p_ap_decode_obj->context = (MWContext*)closure;
+	}
+	
+	p_ap_decode_obj->is_apple_single = is_apple_single;
+	
+	if (is_apple_single)
+	{
+		p_ap_decode_obj->encoding = kEncodeNone;
+	}
+	
+	return NOERR;
+}
+
+static int ap_decode_state_machine(appledouble_decode_object* p_ap_decode_obj);
+/*
+*	process the buffer 
+*/
+int ap_decode_next(
+	appledouble_decode_object* p_ap_decode_obj, 
+	char 	*in_buff, 
+	int32 	buff_size)
+{	
+	/*
+	** install the buff to the decoder.
+	*/
+	p_ap_decode_obj->inbuff   	= in_buff;
+	p_ap_decode_obj->s_inbuff 	= buff_size;
+	p_ap_decode_obj->pos_inbuff = 0;
+	
+	/*
+	**	run off the decode state machine
+	*/	
+	return ap_decode_state_machine(p_ap_decode_obj);
+}
+
+PRIVATE int ap_decode_state_machine(
+	appledouble_decode_object* p_ap_decode_obj)
+{
+	int 	status = NOERR;
+	int32 	size;
+		
+	switch (p_ap_decode_obj->state)
+	{
+		case kInit:
+			/*
+			**	Make sure that there are stuff in the buff 
+			**		before we can parse the file head .
+			*/
+			if (p_ap_decode_obj->s_inbuff <=1 )
+				return NOERR;
+			
+			if (p_ap_decode_obj->is_apple_single)
+			{
+				p_ap_decode_obj->state = kBeginHeaderPortion;
+			}
+			else
+			{
+				status = ap_seek_part_start(p_ap_decode_obj);
+				if (status != errDone)
+					return status;
+	
+				p_ap_decode_obj->state = kBeginParseHeader;
+			}
+			status = ap_decode_state_machine(p_ap_decode_obj);
+			break;
+		
+		case kBeginSeekBoundary:
+			p_ap_decode_obj->state = kSeekingBoundary;
+			status = ap_seek_to_boundary(p_ap_decode_obj, TRUE);
+			if (status == errDone)
+			{
+				p_ap_decode_obj->state = kBeginParseHeader;
+				status = ap_decode_state_machine(p_ap_decode_obj);
+			}	
+			break;
+			
+		case kSeekingBoundary:
+			status = ap_seek_to_boundary(p_ap_decode_obj, FALSE);
+			if (status == errDone)
+			{
+				p_ap_decode_obj->state = kBeginParseHeader;
+				status = ap_decode_state_machine(p_ap_decode_obj);
+			}
+			break;
+		
+		case kBeginParseHeader:
+			p_ap_decode_obj->state = kParsingHeader;
+			status = ap_parse_header(p_ap_decode_obj, TRUE);
+			if (status == errDone)
+			{
+				if (p_ap_decode_obj->which_part == kDataPortion)
+					p_ap_decode_obj->state = kBeginDataPortion;
+				else if (p_ap_decode_obj->which_part == kHeaderPortion)
+					p_ap_decode_obj->state = kBeginHeaderPortion;
+				else
+					p_ap_decode_obj->state = kFinishing;
+	
+				status = ap_decode_state_machine(p_ap_decode_obj);
+			}
+			break;
+				
+		case kParsingHeader:
+			status = ap_parse_header(p_ap_decode_obj, FALSE);
+			if (status == errDone)
+			{
+				if (p_ap_decode_obj->which_part == kDataPortion)
+					p_ap_decode_obj->state = kBeginDataPortion;
+				else if (p_ap_decode_obj->which_part == kHeaderPortion)
+					p_ap_decode_obj->state = kBeginHeaderPortion;
+				else
+					p_ap_decode_obj->state = kFinishing;
+										
+				status = ap_decode_state_machine(p_ap_decode_obj);
+			
+			}
+			break;
+				
+		case kBeginHeaderPortion:
+			p_ap_decode_obj->state = kProcessingHeaderPortion;
+			status = ap_decode_process_header(p_ap_decode_obj, TRUE);
+			if (status == errDone)
+			{
+				if (p_ap_decode_obj->is_apple_single)
+					p_ap_decode_obj->state = kBeginDataPortion;
+				else
+					p_ap_decode_obj->state = kBeginSeekBoundary;
+					
+				status = ap_decode_state_machine(p_ap_decode_obj);
+			}
+			break;
+		case kProcessingHeaderPortion:
+			status = ap_decode_process_header(p_ap_decode_obj, FALSE);
+			if (status == errDone)
+			{
+				if (p_ap_decode_obj->is_apple_single)
+					p_ap_decode_obj->state = kBeginDataPortion;
+				else
+					p_ap_decode_obj->state = kBeginSeekBoundary;
+					
+				status = ap_decode_state_machine(p_ap_decode_obj);
+			}
+			break;
+		
+		case kBeginDataPortion:
+			p_ap_decode_obj->state = kProcessingDataPortion;
+			status = ap_decode_process_data(p_ap_decode_obj, TRUE);
+			if (status == errDone)
+			{
+				if (p_ap_decode_obj->is_apple_single)
+					p_ap_decode_obj->state = kFinishing;
+				else
+					p_ap_decode_obj->state = kBeginSeekBoundary;
+					
+				status = ap_decode_state_machine(p_ap_decode_obj);
+			}
+			break;
+		
+		case kProcessingDataPortion:
+			status = ap_decode_process_data(p_ap_decode_obj, FALSE);
+			if (status == errDone)
+			{
+				if (p_ap_decode_obj->is_apple_single)
+					p_ap_decode_obj->state = kFinishing;
+				else
+					p_ap_decode_obj->state = kBeginSeekBoundary;
+		
+				status = ap_decode_state_machine(p_ap_decode_obj);
+			}
+			break;
+			
+		case kFinishing:
+			if (p_ap_decode_obj->write_as_binhex)
+			{
+				if (p_ap_decode_obj->tmpfd)
+				{
+					/*
+					**	It is time to append the data fork to bin hex encoder.
+					**	
+					**	The reason behind this dirt work is resource fork is the last
+					**	piece in the binhex, while it is the first piece in apple double. 
+					*/
+					XP_FileSeek(p_ap_decode_obj->tmpfd, 0L, SEEK_SET);
+					
+					while (p_ap_decode_obj->data_size > 0)
+					{
+						char buff[1024];
+					
+						size = MIN(1024, p_ap_decode_obj->data_size);
+						XP_FileRead(buff, size, p_ap_decode_obj->tmpfd);
+					
+						status = (*p_ap_decode_obj->binhex_stream->put_block)
+									(p_ap_decode_obj->binhex_stream->data_object, 
+									buff, 
+									size);
+						
+						p_ap_decode_obj->data_size -= size;
+					}
+				}
+				
+				if (p_ap_decode_obj->data_size <= 0)
+				{
+					/* CALL put_block with size == 0 to close a part. */
+					status = (*p_ap_decode_obj->binhex_stream->put_block)
+								(p_ap_decode_obj->binhex_stream->data_object, 
+								NULL, 
+								0);
+					if (status != NOERR)
+						break;
+											
+					/* and now we are really done.					*/
+					status = errDone;
+				}
+				else
+					status = NOERR;
+			}
+			break;
+	}						
+	return (status == errEOB) ? NOERR : status;	
+}
+
+int ap_decode_end(
+	appledouble_decode_object* p_ap_decode_obj, 
+	XP_Bool 	is_aborting)
+{
+	/*
+	** clear up the apple doubler object.
+	*/
+	if (p_ap_decode_obj == NULL)
+		return NOERR;
+		
+	FREEIF(p_ap_decode_obj->boundary0);
+
+#ifdef	XP_MAC
+	if (p_ap_decode_obj->fileId)
+		FSClose(p_ap_decode_obj->fileId);
+	if( p_ap_decode_obj->vRefNum )
+		FlushVol(nil, p_ap_decode_obj->vRefNum );
+#endif
+
+	if (p_ap_decode_obj->write_as_binhex)
+	{
+		/*		
+		** make sure close the binhex stream too. 
+		*/
+		if (is_aborting)
+		{
+			(*p_ap_decode_obj->binhex_stream->abort)
+				(p_ap_decode_obj->binhex_stream->data_object, 0);		
+		}
+		else
+		{
+			(*p_ap_decode_obj->binhex_stream->complete)
+				(p_ap_decode_obj->binhex_stream->data_object);		
+		}
+
+		if (p_ap_decode_obj->tmpfd)
+			XP_FileClose(p_ap_decode_obj->tmpfd);
+		
+		if (p_ap_decode_obj->tmpfname)
+		{
+			XP_FileRemove(p_ap_decode_obj->tmpfname, xpTemporary);		
+														/* remove tmp file if we used it	*/	
+			XP_FREE(p_ap_decode_obj->tmpfname);			/* and release the file name too.	*/
+		}
+	}
+	else if (p_ap_decode_obj->fd)
+	{
+		XP_FileClose(p_ap_decode_obj->fd);
+	}
+#ifdef XP_MAC
+	if( !is_aborting )
+		DecodingDone( p_ap_decode_obj);
+#endif
+	return NOERR;
+
+}
diff --git a/mozilla/lib/mailto/appledbl.h b/mozilla/lib/mailto/appledbl.h
new file mode 100644
index 00000000000..2d255ea0db0
--- /dev/null
+++ b/mozilla/lib/mailto/appledbl.h
@@ -0,0 +1,232 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* 
+*   AppleDouble.h
+*	-------------
+*
+*  	  The header file for a stream based apple single/double encodor/decodor.
+*		
+*		2aug95	mym		
+*		
+*/
+
+
+#ifndef AppleDouble_h
+#define AppleDouble_h
+
+#include "xp.h"
+#include "xp_file.h"
+#include "msg.h"
+
+#define NOERR			0
+#define errDone			1
+								/* Done with current operation.	*/
+#define errEOB			2
+								/* 	End of a buffer.			*/
+#define errEOP			3	
+								/* 	End of a Part.				*/
+
+					
+#define errMemoryAlloc 	MK_OUT_OF_MEMORY
+#define errDataCrupt	-1
+#define errDiskFull		MK_DISK_FULL
+#define errFileOpen		MK_UNABLE_TO_OPEN_TMP_FILE
+
+#define errVersion		-1
+#define errFileWrite	MK_MIME_ERROR_WRITING_FILE
+#define errDecoding		-1
+
+#define errUsrCancel	MK_INTERRUPTED
+/*
+** The envirment block data type. 
+*/
+enum 
+{ 
+	kInit, 
+	kDoingHeaderPortion, 
+	kDoneHeaderPortion, 
+	kDoingDataPortion, 
+	kDoneDataPortion 
+};
+
+typedef struct _appledouble_encode_object 
+{
+	char	fname[64];
+	int32	dirId; 
+	int16	vRefNum;
+	int16	fileId;				/* the id for the open file (data/resource fork) */
+
+	int 	state;
+	int		text_file_type;		/* if the file has a text file type with it.	*/
+	char	*boundary;			/* the boundary string.							*/
+
+	int		status;				/* the error code if anyerror happens.			*/
+	char 	b_overflow[200];
+	int		s_overflow;
+	
+	int		state64;			/* the left over state of base64 enocding 		*/
+	int		ct;					/* the character count of base64 encoding		*/
+	int 	c1, c2;				/* the left of the last base64 encoding 		*/		
+
+	char 	*outbuff;			/* the outbuff by the caller.           		*/
+	int		s_outbuff;			/* the size of the buffer.						*/
+	int		pos_outbuff;		/* the offset in the current buffer.			*/ 
+
+} appledouble_encode_object;
+
+/* The possible content transfer encodings */
+
+enum 
+{ 
+	kEncodeNone,
+	kEncodeQP,
+	kEncodeBase64,
+	kEncodeUU
+};
+
+enum 
+{ 
+	kGeneralMine,
+	kAppleDouble,
+	kAppleSingle
+};
+
+enum 
+{ 
+	kInline,
+	kDontCare
+};
+
+enum 
+{ 
+	kHeaderPortion,
+	kDataPortion
+};
+
+/* the decode states.	*/
+enum 
+{ 
+	kBeginParseHeader = 3,
+	kParsingHeader,
+	kBeginSeekBoundary,
+	kSeekingBoundary,
+	kBeginHeaderPortion, 
+	kProcessingHeaderPortion, 
+	kBeginDataPortion, 
+	kProcessingDataPortion, 
+	kFinishing
+};
+
+/* uuencode states */
+enum
+{
+	kWaitingForBegin = (int) 0,
+	kBegin,
+	kMainBody,
+	kEnd
+};
+
+typedef struct _appledouble_decode_object 
+{
+	int		is_binary;
+	int		is_apple_single;	/* if the object encoded is in apple single		*/
+	int		write_as_binhex;
+	
+	int		messagetype;
+	char*	boundary0;			/* the boundary for the enclosure.				*/
+	int		deposition;			/* the deposition.								*/
+	int		encoding;			/* the encoding method.							*/
+	int		which_part;
+	
+	char	fname[256];
+#ifdef XP_MAC
+	FSSpec* mSpec;			/* the filespec to save the file to*/
+	int16	vRefNum;
+	int32	dirId; 
+	int16	fileId;				/* the id for the open file (data/resource fork) */
+#endif
+	XP_File	fd;					/* the fd for data fork work.					 */
+
+	MWContext *context;
+    NET_StreamClass* binhex_stream;		/* the stream to output as binhex output.*/
+
+	int 	state;
+	
+	int		rksize;				/* the resource fork size count.				*/
+	int		dksize;				/* the data fork size count.					*/
+	 
+	int		status;				/* the error code if anyerror happens.			*/
+	char 	b_leftover[256];
+	int		s_leftover;
+	
+	int		encode;				/* the encode type of the message.				*/
+	int		state64;			/* the left over state of base64 enocding 		*/
+	int		left;				/* the character count of base64 encoding		*/
+	int 	c[4];				/* the left of the last base64 encoding 		*/		
+	int		uu_starts_line;		/* is decoder at the start of a line? (uuencode)	*/
+	int		uu_state;			/* state w/r/t the uuencode body */
+	int		uu_bytes_written;	/* bytes written from the current tuple (uuencode) */
+	int		uu_line_bytes;		/* encoded bytes remaining in the current line (uuencode) */
+
+	char 	*inbuff;			/* the outbuff by the caller.           		*/
+	int		s_inbuff;			/* the size of the buffer.						*/
+	int		pos_inbuff;			/* the offset in the current buffer.			*/ 
+
+
+	char*	tmpfname;			/* the temp file to hold the decode data fork 	*/
+								/* when doing the binhex exporting.				*/
+	XP_File	tmpfd;
+	int32	data_size;			/* the size of the data in the tmp file.		*/
+
+} appledouble_decode_object;
+
+
+/*
+**	The protypes.
+*/
+
+XP_BEGIN_PROTOS
+
+int ap_encode_init(appledouble_encode_object *p_ap_encode_obj, 
+					char* fname,
+					char* separator);
+
+int ap_encode_next(appledouble_encode_object* p_ap_encode_obj, 
+					char 	*to_buff,
+					int32 	buff_size,
+					int32*	real_size);
+
+int ap_encode_end(appledouble_encode_object* p_ap_encode_obj,
+					XP_Bool	is_aborting);
+
+int ap_decode_init(appledouble_decode_object* p_ap_decode_obj,
+					XP_Bool	is_apple_single,
+					XP_Bool	write_as_bin_hex,
+					void  	*closure);
+
+int ap_decode_next(appledouble_decode_object* p_ap_decode_obj, 
+					char 	*in_buff, 
+					int32 	buff_size);
+
+int ap_decode_end(appledouble_decode_object* p_ap_decode_obj, 
+				 	XP_Bool is_aborting);
+
+XP_END_PROTOS
+
+#endif
diff --git a/mozilla/lib/mailto/bh_strm.c b/mozilla/lib/mailto/bh_strm.c
new file mode 100644
index 00000000000..a280f39170d
--- /dev/null
+++ b/mozilla/lib/mailto/bh_strm.c
@@ -0,0 +1,411 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+**
+**	 Binhex_stream.c
+**	 ---------------
+**
+**		The code for the binhex encode/decode stream.
+**
+**		20sep95		mym		Created.
+**
+*/
+
+#include "msg.h"
+#include "appledbl.h"
+#include "m_binhex.h"
+#include "m_cvstrm.h"
+#include "ad_codes.h"
+
+#ifdef XP_MAC
+#pragma warn_unusedarg off
+#endif /* XP_MAC */
+
+/*
+**	-----------------------------------------------------------
+**
+**		The BinHex encode writer stream.
+**
+**	-----------------------------------------------------------
+*/
+extern int MK_MIME_ERROR_WRITING_FILE;
+
+#define WORKING_BUFF_SIZE	8192
+
+typedef struct 
+{
+	binhex_encode_object	bh_encode_obj;
+
+	char 	*buff;					/* the working buff							  */
+	int32	s_buff;					/* the size of workiong buff.				  */			
+
+	XP_File	fp;
+	char	*fname;					/* the filename for file holding the encoding */
+
+} BinHexEncodeObject ;
+
+
+/*
+**	Let's go "l" characters forward of the encoding for this write.
+**	Note:	
+**		"s" is just a dummy paramter. 
+*/
+PRIVATE int net_BinHex_Encode_Write (void *dataObject, const char* s, int32 l)
+{
+	int  	status = 0;
+	BinHexEncodeObject * obj = (BinHexEncodeObject*)dataObject;
+	int32 	count;
+	int32	size;	
+	
+	do	
+	{
+		size = obj->s_buff * 11 / 16;
+		size = MIN(l, size);
+		status = binhex_encode_next(&(obj->bh_encode_obj), 
+							(char*)s,
+							size,
+							obj->buff, 
+							obj->s_buff, 
+							&count);
+		if (status == NOERR || status == errDone)
+		{
+			/*
+			 * we get the encode data, so call the next stream to write it to the disk.
+			 */
+			if ((int) XP_FileWrite(obj->buff, count, obj->fp) != count )
+				return errFileWrite;
+		}
+		
+		if (status < 0) 			/* abort */
+			break;
+	
+		l -= size;
+		s += size;
+		
+	} while (l > 0);
+	
+	return status;
+}
+
+PRIVATE unsigned int net_BinHex_Encode_Ready (NET_StreamClass *dataObject)
+{	
+   return(MAX_WRITE_READY);  					/* always ready for writing 		*/ 
+}
+
+
+PRIVATE void net_BinHex_Encode_Complete (void *dataObject)
+{
+	int32	count, len = 0;
+	BinHexEncodeObject *obj = (BinHexEncodeObject *)dataObject;	
+	
+	/*
+	**	push the close part.
+	*/
+	len = binhex_encode_next(&(obj->bh_encode_obj), 
+							NULL,
+							0,
+							obj->buff, 
+							obj->s_buff, 
+							&count);		/* this help us generate the finishing */
+								
+	len = XP_FileWrite(obj->buff, count, obj->fp);
+	
+	/*
+	**	time to do some dirty work -- fix the real file size. 
+	**			(since we can only know by now)
+	*/
+		
+	binhex_reencode_head(&(obj->bh_encode_obj), 
+							obj->buff, 
+							obj->s_buff, 
+							&count);			/* get the head part encoded again 	*/
+	
+	XP_FileSeek(obj->fp, 0L, SEEK_SET);			/* and override the previous dummy	*/
+	XP_FileWrite(obj->buff, count, obj->fp);
+
+    binhex_encode_end(&(obj->bh_encode_obj), FALSE);	/* now we get a real ending */
+ 	
+ 	if (obj->fp)
+ 	{
+    	XP_FileClose(obj->fp);					/* we are done with the target file	*/
+        FREEIF(obj->fname);						/* free the space for the file name */
+    }
+								
+   	FREEIF(obj->buff);							/* and free the working buff.	*/
+    XP_FREE(obj);
+}
+
+PRIVATE void net_BinHex_Encode_Abort (void *dataObject, int status)
+{
+	BinHexEncodeObject * obj = (BinHexEncodeObject*)dataObject;	
+	
+    binhex_encode_end(&(obj->bh_encode_obj), TRUE);	/* it is an aborting exist... 	*/
+
+ 	if (obj->fp)
+ 	{
+    	XP_FileClose(obj->fp);					/* we are aboring with the decoding	*/
+        XP_FileRemove(obj->fname, xpURL);	
+        										/* remove the incomplete file.		*/
+        FREEIF (obj->fname);					/* free the space for the file name */
+	}
+	
+    FREEIF(obj->buff);							/* free the working buff.			*/
+    XP_FREE(obj);
+}
+
+
+/*
+**	Will create a apple double encode stream:
+**
+**		-> take the filename as the input source (it needs to be a mac file.)
+**		-> tkae a stream to take care of the writing to a temp file.
+*/
+PUBLIC NET_StreamClass * 
+fe_MakeBinHexEncodeStream (int  format_out,
+                         void       *data_obj,
+                         URL_Struct *URL_s,
+                         MWContext  *window_id,
+                         char*		dst_filename )
+{
+    BinHexEncodeObject* obj;
+    NET_StreamClass* 	stream;
+    char*				working_buff = NULL;
+	int					bSize = WORKING_BUFF_SIZE;
+    
+    TRACEMSG(("Setting up apple encode stream. Have URL: %s\n", URL_s->address));
+
+    stream = XP_NEW(NET_StreamClass);
+    if(stream == NULL) 
+        return(NULL);
+
+    obj = XP_NEW(BinHexEncodeObject);
+    if (obj == NULL) 
+    {
+        XP_FREE (stream);
+        return(NULL);
+    }
+   
+	while (!working_buff && (bSize >= 512))
+	{
+   		working_buff = (char *)XP_ALLOC(bSize);
+		if (!working_buff)
+			bSize /= 2;
+	}
+   	if (working_buff == NULL)
+   	{
+   		XP_FREE (obj);
+   		XP_FREE (stream);
+		return (NULL);
+   	}
+   	
+    stream->name           = "BinHex Encode";
+    stream->complete       = (MKStreamCompleteFunc) 	net_BinHex_Encode_Complete;
+    stream->abort          = (MKStreamAbortFunc) 		net_BinHex_Encode_Abort;
+    stream->put_block      = (MKStreamWriteFunc) 		net_BinHex_Encode_Write;
+    stream->is_write_ready = (MKStreamWriteReadyFunc) 	net_BinHex_Encode_Ready;
+    stream->data_object    = obj;  							/* document info object */
+    stream->window_id      = window_id;
+
+	obj->fname = XP_STRDUP(dst_filename);	
+	obj->fp  =  XP_FileOpen(obj->fname, xpURL, XP_FILE_TRUNCATE);		
+								/* this file will hold all the encoded data			*/	
+	if (obj->fp == NULL)
+	{
+		XP_FREE(working_buff);	/* if we can't open the target file, roll back then */ 
+		if(obj->fname) XP_FREE(obj->fname);
+   		XP_FREE (obj);
+   		XP_FREE (stream);
+   		return (NULL);
+	}
+	
+	obj->buff	= working_buff;
+	obj->s_buff	= WORKING_BUFF_SIZE;
+	
+	/*
+	** 	setup all the need information on the apple double encoder.
+	*/
+	binhex_encode_init(&(obj->bh_encode_obj));		/* pass the file name of the source.*/
+
+    TRACEMSG(("Returning stream from NET_BinHexEncoder\n"));
+
+    return stream;
+}
+
+/*
+**	-----------------------------------------------------------
+**
+**		The BinHex decode writer stream.
+**
+**	-----------------------------------------------------------
+*/
+
+typedef	struct BinHexDecodeObject
+{
+	binhex_decode_object	bh_decode_obj;
+	
+	char*	in_buff;
+	int32	bytes_in_buff;
+	
+} BinHexDecodeObject;
+
+
+PRIVATE int 
+net_BinHex_Decode_Write (
+	void *dataObject, const char* s, int32 l)
+{
+	int		status = NOERR;
+	BinHexDecodeObject * obj = (BinHexDecodeObject*)dataObject;
+	int32 	size;	
+	
+	if (obj->bytes_in_buff + l > 1024)
+	{
+		size = 1024 - obj->bytes_in_buff;
+		XP_MEMCPY(obj->in_buff+obj->bytes_in_buff, 
+					s, 
+					size);
+		s += size;
+		l -= size;
+		
+		status = binhex_decode_next(&(obj->bh_decode_obj), 
+					obj->in_buff, 
+					1024);
+		if (status != NOERR)
+			return status;
+							
+		obj->bytes_in_buff = 0;
+	}
+	
+	if (l > 1024)		
+	{
+		/* we are sure that obj->bytes_in_buff == 0 at this point. */
+		status = binhex_decode_next(&(obj->bh_decode_obj), 
+					s, 
+					l);
+	}
+	else
+	{
+		XP_MEMCPY(obj->in_buff+obj->bytes_in_buff, 
+					s, 
+					l);
+		obj->bytes_in_buff += l;
+	}
+	return status;
+}
+
+/*
+ * is the stream ready for writeing?
+ */
+PRIVATE unsigned int net_BinHex_Decode_Ready (void *stream)
+{	
+   return(MAX_WRITE_READY); 	 						/* always ready for writing */ 
+}
+
+
+PRIVATE void net_BinHex_Decode_Complete (void *dataObject)
+{
+	BinHexDecodeObject *obj = (BinHexDecodeObject *)	dataObject;	
+
+	if (obj->bytes_in_buff)
+	{
+		/* do the last calls.	*/
+		binhex_decode_next(&(obj->bh_decode_obj), 
+				(char *)obj->in_buff,
+				obj->bytes_in_buff);
+		obj->bytes_in_buff = 0;
+	}
+	
+    binhex_decode_end(&(obj->bh_decode_obj), FALSE);	/* it is a normal clean up classes.	*/
+
+	if (obj->in_buff)
+		XP_FREE(obj->in_buff);
+
+	XP_FREE(obj);
+}
+
+PRIVATE void net_BinHex_Decode_Abort (void *dataObject, int status)
+{
+	BinHexDecodeObject *obj = (BinHexDecodeObject *)dataObject;
+
+	binhex_decode_end(&(obj->bh_decode_obj), TRUE);		/* it is an abort. 	*/
+	
+	if (obj->in_buff)
+		XP_FREE(obj->in_buff);
+		
+	XP_FREE(obj);
+}
+
+/*
+**	Create the bin hex decode stream.
+**
+*/
+PUBLIC NET_StreamClass * 
+fe_MakeBinHexDecodeStream (int  format_out,
+                         void       *data_obj,
+                         URL_Struct *URL_s,
+                         MWContext  *window_id )
+{
+    BinHexDecodeObject* obj;
+    NET_StreamClass* 	stream;
+    
+    TRACEMSG(("Setting up bin hex decode stream. Have URL: %s\n", URL_s->address));
+
+    stream = XP_NEW(NET_StreamClass);
+    if(stream == NULL) 
+        return(NULL);
+
+    obj = XP_NEW(BinHexDecodeObject);
+    if (obj == NULL)
+    {
+    	XP_FREE(stream);
+        return(NULL);
+    }
+    
+ 	if ((obj->in_buff = (char *)XP_ALLOC(1024)) == NULL)
+ 	{
+ 		XP_FREE(obj);
+ 		XP_FREE(stream);
+ 		return (NULL);
+   	}
+   	
+    stream->name           = "BinHex Decoder";
+    stream->complete       = (MKStreamCompleteFunc) 	net_BinHex_Decode_Complete;
+    stream->abort          = (MKStreamAbortFunc) 		net_BinHex_Decode_Abort;
+    stream->put_block      = (MKStreamWriteFunc) 		net_BinHex_Decode_Write;
+    stream->is_write_ready = (MKStreamWriteReadyFunc) 	net_BinHex_Decode_Ready;
+    stream->data_object    = obj;
+    stream->window_id      = window_id;
+
+	/*
+	**	Some initial to the object.
+	*/
+	obj->bytes_in_buff	   = 0;	
+	
+	/*
+	** setup all the need information on the apple double encoder.
+	*/
+	binhex_decode_init(&(obj->bh_decode_obj),window_id);
+	#ifdef XP_MAC
+	obj->bh_decode_obj.mSpec = (FSSpec*)( URL_s->fe_data );
+    #endif
+    TRACEMSG(("Returning stream from NET_BinHexDecode\n"));
+
+    return stream;
+}
+
+
diff --git a/mozilla/lib/mailto/bytearr.cpp b/mozilla/lib/mailto/bytearr.cpp
new file mode 100644
index 00000000000..c9254978926
--- /dev/null
+++ b/mozilla/lib/mailto/bytearr.cpp
@@ -0,0 +1,221 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "msg.h"
+#include "xp.h"
+#include "bytearr.h"
+
+#ifdef XP_WIN16
+#define SIZE_T_MAX    0xFF80		            // Maximum allocation size
+#define MAX_ARR_ELEMS SIZE_T_MAX/sizeof(BYTE)
+#endif
+
+
+XPByteArray::XPByteArray()
+{
+	m_nSize = 0;
+	m_nMaxSize = 0;
+	m_pData = NULL;
+}
+
+XPByteArray::~XPByteArray()
+{
+	SetSize(0);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+int XPByteArray::GetSize() const
+{
+	return m_nSize;
+}
+
+XP_Bool XPByteArray::SetSize(int nSize)
+{
+	XP_ASSERT(nSize >= 0);
+
+#ifdef MAX_ARR_ELEMS
+	if (nSize > MAX_ARR_ELEMS);
+	{
+		XP_ASSERT(nSize <= MAX_ARR_ELEMS); // Will fail
+		return FALSE;
+	}
+#endif
+
+	if (nSize == 0)
+	{
+		// Remove all elements
+		XP_FREE(m_pData);
+		m_nSize = 0;
+		m_nMaxSize = 0;
+		m_pData = NULL;
+	}
+	else if (m_pData == NULL)
+	{
+		// Create a new array
+		m_nMaxSize = MAX(8, nSize);
+		m_pData = (BYTE *)XP_CALLOC(1, m_nMaxSize * sizeof(BYTE));
+		if (m_pData)
+			m_nSize = nSize;
+		else
+			m_nSize = m_nMaxSize = 0;
+	}
+	else if (nSize <= m_nMaxSize)
+	{
+		// The new size is within the current maximum size, make sure new
+		// elements are to initialized to zero
+		if (nSize > m_nSize)
+			XP_MEMSET(&m_pData[m_nSize], 0, (nSize - m_nSize) * sizeof(BYTE));
+
+		m_nSize = nSize;
+	}
+	else
+	{
+		// The array needs to grow, figure out how much
+		int nGrowBy, nMaxSize;
+		nGrowBy  = MIN(1024, MAX(8, m_nSize / 8));
+		nMaxSize = MAX(nSize, m_nMaxSize + nGrowBy);
+#ifdef MAX_ARR_ELEMS
+		nMaxSize = MIN(MAX_ARR_ELEMS, nMaxSize);
+#endif
+
+		BYTE *pNewData = (BYTE *)XP_ALLOC(nMaxSize * sizeof(BYTE));
+		if (pNewData)
+		{
+			// Copy the data from the old array to the new one
+			XP_MEMCPY(pNewData, m_pData, m_nSize * sizeof(BYTE));
+
+			// Zero out the remaining elements
+			XP_MEMSET(&pNewData[m_nSize], 0, (nSize - m_nSize) * sizeof(BYTE));
+			m_nSize = nSize;
+			m_nMaxSize = nMaxSize;
+
+			// Free the old array
+			XP_FREE(m_pData);
+			m_pData = pNewData;
+		}
+	}
+
+	return nSize == m_nSize;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+BYTE &XPByteArray::ElementAt(int nIndex)
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	return m_pData[nIndex];
+}
+
+BYTE XPByteArray::GetAt(int nIndex) const
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	return m_pData[nIndex];
+}
+
+void XPByteArray::SetAt(int nIndex, BYTE newElement)
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	m_pData[nIndex] = newElement;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+int XPByteArray::Add(BYTE newElement)
+{
+	int nIndex = m_nSize;
+
+#ifdef MAX_ARR_ELEMS
+	if (nIndex >= MAX_ARR_ELEMS) 
+		return -1;	     
+#endif			
+
+	SetAtGrow(nIndex, newElement);
+	return nIndex;
+}
+
+void XPByteArray::InsertAt(int nIndex, BYTE newElement, int nCount)
+{
+	XP_ASSERT(nIndex >= 0);
+	XP_ASSERT(nCount > 0);
+
+	if (nIndex >= m_nSize)
+	{
+		// If the new element is after the end of the array, grow the array
+		SetSize(nIndex + nCount);
+	}
+	else
+	{
+		// The element is being insert inside the array
+		int nOldSize = m_nSize;
+		SetSize(m_nSize + nCount);
+
+		// Move the data after the insertion point
+		XP_MEMMOVE(&m_pData[nIndex + nCount], &m_pData[nIndex],
+			       (nOldSize - nIndex) * sizeof(BYTE));
+	}
+
+	// Insert the new elements
+	XP_ASSERT(nIndex + nCount <= m_nSize);
+	while (nCount--)
+		m_pData[nIndex++] = newElement;
+}
+
+void XPByteArray::InsertAt(int nStartIndex, const XPByteArray *pNewArray)
+{
+	XP_ASSERT(nStartIndex >= 0);
+	XP_ASSERT(pNewArray != NULL);
+
+	if (pNewArray->GetSize() > 0)
+	{
+		InsertAt(nStartIndex, pNewArray->GetAt(0), pNewArray->GetSize());
+		for (int i = 1; i < pNewArray->GetSize(); i++)
+			m_pData[nStartIndex + i] = pNewArray->GetAt(i);
+	}
+}
+
+void XPByteArray::RemoveAll()
+{
+	SetSize(0);
+}
+
+void XPByteArray::RemoveAt(int nIndex, int nCount)
+{
+	XP_ASSERT(nIndex >= 0);
+	XP_ASSERT(nIndex + nCount <= m_nSize);
+
+	if (nCount > 0)
+	{
+		// Make sure not to overstep the end of the array
+		int nMoveCount = m_nSize - (nIndex + nCount);
+		if (nCount && nMoveCount >= 0)
+			XP_MEMMOVE(&m_pData[nIndex], &m_pData[nIndex + nCount],
+		               nMoveCount * sizeof(BYTE));
+
+		m_nSize -= nCount;
+	}
+}
+
+void XPByteArray::SetAtGrow(int nIndex, BYTE newElement)
+{
+	XP_ASSERT(nIndex >= 0);
+
+	if (nIndex >= m_nSize)
+		SetSize(nIndex+1);
+	m_pData[nIndex] = newElement;
+}
diff --git a/mozilla/lib/mailto/bytearr.h b/mozilla/lib/mailto/bytearr.h
new file mode 100644
index 00000000000..7b3e6914c9d
--- /dev/null
+++ b/mozilla/lib/mailto/bytearr.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _ByteArray_H_
+#define _ByteArray_H_
+
+#if !defined(_WINDOWS) && !defined(XP_OS2)
+typedef uint8       BYTE;
+#endif
+
+class XPByteArray 
+{
+public:
+	// Construction/destruction
+	                   XPByteArray();
+	                   ~XPByteArray();
+
+	// State/attribute member functions
+	int                GetSize() const;
+	XP_Bool            SetSize(int nNewSize);
+
+	// Accessor member functions
+	BYTE              &ElementAt(int nIndex);
+	BYTE               GetAt(int nIndex) const;
+	void               SetAt(int nIndex, BYTE newElement);
+
+	// Insertion/deletion member functions
+	int                Add(BYTE newElement);
+	void	           InsertAt(int nIndex, BYTE newElement, int nCount = 1);
+	void               InsertAt(int nStartIndex, const XPByteArray *pNewArray);
+	void               RemoveAll();
+	void               RemoveAt(int nIndex, int nCount = 1);
+	void               SetAtGrow(int nIndex, BYTE newElement);
+
+	// Overloaded operators
+	BYTE               operator[](int nIndex) const { return GetAt(nIndex); }
+	BYTE              &operator[](int nIndex) { return ElementAt(nIndex); }
+
+	// Use the result carefully, it is only valid until another function called on the array
+	BYTE              *GetArray(void) {return((BYTE *)m_pData);}
+
+protected:
+    // Member data
+	int m_nSize;
+	int m_nMaxSize;
+	BYTE* m_pData;
+};
+
+#endif
diff --git a/mozilla/lib/mailto/dwordarr.cpp b/mozilla/lib/mailto/dwordarr.cpp
new file mode 100644
index 00000000000..c5c01eba195
--- /dev/null
+++ b/mozilla/lib/mailto/dwordarr.cpp
@@ -0,0 +1,281 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "msg.h"
+#include "xp.h"
+#include "dwordarr.h"
+#include "xp_qsort.h"
+
+#ifdef XP_WIN16
+#define SIZE_T_MAX    0xFF80		            // Maximum allocation size
+#define MAX_ARR_ELEMS SIZE_T_MAX/sizeof(uint32)
+#endif
+
+
+XPDWordArray::XPDWordArray()
+{
+	m_nSize = 0;
+	m_nMaxSize = 0;
+	m_nGrowBy = 0;
+	m_pData = NULL;
+}
+
+XPDWordArray::~XPDWordArray()
+{
+	SetSize(0);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+int XPDWordArray::GetSize() const
+{
+	return m_nSize;
+}
+
+XP_Bool XPDWordArray::SetSize(int nSize, int nGrowBy)
+{
+	XP_ASSERT(nSize >= 0);
+
+	if (nGrowBy >= 0)
+		m_nGrowBy = nGrowBy;
+
+#ifdef MAX_ARR_ELEMS
+	if (nSize > MAX_ARR_ELEMS);
+	{
+		XP_ASSERT(nSize <= MAX_ARR_ELEMS); // Will fail
+		return FALSE;
+	}
+#endif
+
+	if (nSize == 0)
+	{
+		// Remove all elements
+		XP_FREE(m_pData);
+		m_nSize = 0;
+		m_nMaxSize = 0;
+		m_pData = NULL;
+	}
+	else if (m_pData == NULL)
+	{
+		// Create a new array
+		m_nMaxSize = MAX(8, nSize);
+		m_pData = (uint32 *)XP_CALLOC(1, m_nMaxSize * sizeof(uint32));
+		if (m_pData)
+			m_nSize = nSize;
+		else
+			m_nSize = m_nMaxSize = 0;
+	}
+	else if (nSize <= m_nMaxSize)
+	{
+		// The new size is within the current maximum size, make sure new
+		// elements are to initialized to zero
+		if (nSize > m_nSize)
+			XP_MEMSET(&m_pData[m_nSize], 0, (nSize - m_nSize) * sizeof(uint32));
+
+		m_nSize = nSize;
+	}
+	else
+	{
+		// The array needs to grow, figure out how much
+		int nMaxSize;
+		nGrowBy  = MAX(m_nGrowBy, MIN(1024, MAX(8, m_nSize / 8)));
+		nMaxSize = MAX(nSize, m_nMaxSize + nGrowBy);
+#ifdef MAX_ARR_ELEMS
+		nMaxSize = MIN(MAX_ARR_ELEMS, nMaxSize);
+#endif
+
+		uint32 *pNewData = (uint32 *)XP_ALLOC(nMaxSize * sizeof(uint32));
+		if (pNewData)
+		{
+			// Copy the data from the old array to the new one
+			XP_MEMCPY(pNewData, m_pData, m_nSize * sizeof(uint32));
+
+			// Zero out the remaining elements
+			XP_MEMSET(&pNewData[m_nSize], 0, (nSize - m_nSize) * sizeof(uint32));
+			m_nSize = nSize;
+			m_nMaxSize = nMaxSize;
+
+			// Free the old array
+			XP_FREE(m_pData);
+			m_pData = pNewData;
+		}
+	}
+
+	return nSize == m_nSize;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+uint32 &XPDWordArray::ElementAt(int nIndex)
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	return m_pData[nIndex];
+}
+
+uint32 XPDWordArray::GetAt(int nIndex) const
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	return m_pData[nIndex];
+}
+
+uint32 *XPDWordArray::GetData() 
+{
+	return m_pData;
+}
+
+void XPDWordArray::SetAt(int nIndex, uint32 newElement)
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	m_pData[nIndex] = newElement;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+int XPDWordArray::Add(uint32 newElement)
+{
+	int nIndex = m_nSize;
+
+#ifdef MAX_ARR_ELEMS
+	if (nIndex >= MAX_ARR_ELEMS) 
+		return -1;	     
+#endif			
+
+	SetAtGrow(nIndex, newElement);
+	return nIndex;
+}
+
+uint XPDWordArray::Add(uint32 *elementPtr, uint numElements) 
+{ 
+	if (SetSize(m_nSize + numElements))
+		XP_MEMCPY(m_pData + m_nSize, elementPtr, numElements * sizeof(uint32)); 
+
+	return m_nSize; 
+} 
+
+uint32 *XPDWordArray::CloneData() 
+{ 
+	uint32 *copyOfData = (uint32 *)XP_ALLOC(m_nSize * sizeof(uint32)); 
+	if (copyOfData) 
+		XP_MEMCPY(copyOfData, m_pData, m_nSize * sizeof(uint32)); 
+
+	return copyOfData; 
+} 
+
+void XPDWordArray::InsertAt(int nIndex, uint32 newElement, int nCount)
+{
+	XP_ASSERT(nIndex >= 0);
+	XP_ASSERT(nCount > 0);
+
+	if (nIndex >= m_nSize)
+	{
+		// If the new element is after the end of the array, grow the array
+		SetSize(nIndex + nCount);
+	}
+	else
+	{
+		// The element is being insert inside the array
+		int nOldSize = m_nSize;
+		SetSize(m_nSize + nCount);
+
+		// Move the data after the insertion point
+		XP_MEMMOVE(&m_pData[nIndex + nCount], &m_pData[nIndex],
+			       (nOldSize - nIndex) * sizeof(uint32));
+	}
+
+	// Insert the new elements
+	XP_ASSERT(nIndex + nCount <= m_nSize);
+	while (nCount--)
+		m_pData[nIndex++] = newElement;
+}
+
+void XPDWordArray::InsertAt(int nStartIndex, const XPDWordArray *pNewArray)
+{
+	XP_ASSERT(nStartIndex >= 0);
+	XP_ASSERT(pNewArray != NULL);
+
+	if (pNewArray->GetSize() > 0)
+	{
+		InsertAt(nStartIndex, pNewArray->GetAt(0), pNewArray->GetSize());
+		for (int i = 1; i < pNewArray->GetSize(); i++)
+			m_pData[nStartIndex + i] = pNewArray->GetAt(i);
+	}
+}
+
+void XPDWordArray::RemoveAll()
+{
+	SetSize(0);
+}
+
+void XPDWordArray::RemoveAt(int nIndex, int nCount)
+{
+	XP_ASSERT(nIndex >= 0);
+	XP_ASSERT(nIndex + nCount <= m_nSize);
+
+	if (nCount > 0)
+	{
+		// Make sure not to overstep the end of the array
+		int nMoveCount = m_nSize - (nIndex + nCount);
+		if (nCount && nMoveCount)
+			XP_MEMMOVE(&m_pData[nIndex], &m_pData[nIndex + nCount],
+		               nMoveCount * sizeof(uint32));
+
+		m_nSize -= nCount;
+	}
+}
+
+void XPDWordArray::SetAtGrow(int nIndex, uint32 newElement)
+{
+	XP_ASSERT(nIndex >= 0);
+
+	if (nIndex >= m_nSize)
+		SetSize(nIndex+1);
+	m_pData[nIndex] = newElement;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void XPDWordArray::CopyArray(XPDWordArray *oldA)
+{
+	CopyArray(*oldA);
+}
+
+void XPDWordArray::CopyArray(XPDWordArray &oldA)
+{
+	if (m_pData)
+		XP_FREE(m_pData);
+	m_nSize = oldA.m_nSize;
+	m_nMaxSize = oldA.m_nMaxSize;
+	m_pData = (uint32 *)XP_ALLOC(m_nSize * sizeof(uint32));
+	if (m_pData)
+		XP_MEMCPY(m_pData, oldA.m_pData, m_nSize * sizeof(uint32));
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+static int CompareDWord (const void *v1, const void *v2)
+{
+	// QuickSort callback to compare array values
+	uint32 i1 = *(uint32 *)v1;
+	uint32 i2 = *(uint32 *)v2;
+	return i1 - i2;
+}
+
+void XPDWordArray::QuickSort (int (*compare) (const void *elem1, const void *elem2))
+{
+	if (m_nSize > 1)
+		XP_QSORT (m_pData, m_nSize, sizeof(void*), compare ? compare : CompareDWord);
+}
diff --git a/mozilla/lib/mailto/dwordarr.h b/mozilla/lib/mailto/dwordarr.h
new file mode 100644
index 00000000000..e47fd19c63e
--- /dev/null
+++ b/mozilla/lib/mailto/dwordarr.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef _DWordArray_H_
+#define _DWordArray_H_
+
+class XPDWordArray
+{
+public:
+	// Construction/destruction
+	                   XPDWordArray();
+	                   ~XPDWordArray();
+
+	// State/attribute member functions
+	int                GetSize() const;
+	XP_Bool            SetSize(int nNewSize, int nGrowBy = -1);
+
+	// Accessor member functions
+	uint32            &ElementAt(int nIndex);
+	uint32             GetAt(int nIndex) const;
+	uint32            *GetData();
+	void               SetAt(int nIndex, uint32 newElement);
+
+	// Insertion/deletion member functions
+	int                Add(uint32 newElement);
+	uint               Add(uint32 *elementPtr, uint numElements); 
+	void	           InsertAt(int nIndex, uint32 newElement, int nCount = 1);
+	void               InsertAt(int nStartIndex, const XPDWordArray *pNewArray);
+	void               RemoveAll();
+	void               RemoveAt(int nIndex, int nCount = 1);
+	void               SetAtGrow(int nIndex, uint32 newElement);
+
+	// Sorting member functions
+	void               QuickSort(int (*compare) (const void *elem1, const void *elem2) = NULL);
+
+	// Overloaded operators
+	uint32             operator[](int nIndex) const { return GetAt(nIndex); }
+	uint32            &operator[](int nIndex) { return ElementAt(nIndex); }
+
+	// Miscellaneous member functions
+	uint32            *CloneData(); 
+	void               CopyArray(XPDWordArray *oldA);
+	void               CopyArray(XPDWordArray &oldA);
+
+protected:
+    // Member data
+	int m_nSize;
+	int m_nMaxSize;
+	int m_nGrowBy;
+	uint32* m_pData;
+};
+
+
+#endif // _DWordArray_H_
diff --git a/mozilla/lib/mailto/errcode.h b/mozilla/lib/mailto/errcode.h
new file mode 100644
index 00000000000..147bebddee2
--- /dev/null
+++ b/mozilla/lib/mailto/errcode.h
@@ -0,0 +1,118 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+// errcode.h
+
+#ifndef _ERRCODE_H_
+#define _ERRCODE_H_
+
+
+/* 
+**	Error classifications (Database, RPC, Network, etc) 
+**
+**	Each error classification defines a range of up to 0xffff error codes.
+**
+**	The top word of an msgERR is the classification, the low byte is an error 
+**	offset within that classification.
+**
+**	For diagnostic purposes, each classification can register it's strings for GetErrorString
+**	support.  These are NOT nationalizable strings; the string tables are autogenerated from the 
+**	MsgError() macro machinery, not stored in .rc files.  They're intended for use in debugging,
+**	logfiles, etc.
+*/
+
+typedef uint32 MsgERR;
+typedef MsgERR msgErrorClass;
+
+#define msgErrorDb 		0xFF000000	/* DB errors (generic) */
+#define msgErrorVw 		0xF8000000	/* View layer */
+#define msgErrorMisc	0xF0000000	/* Random miscellaneous errors. */
+#define msgErrorOk 		0x00000000
+
+/*
+** GetErrorClass(msgERR)
+**
+**		Returns classification range for an error.
+**
+**		For example,
+**			if (GetErrorClass(err) == msgErrorRp) 
+**				Alert("Problem chatting with forum service.");
+**
+*/
+#define GetErrorClass(err)	((err) & ((MsgERR) 0xFFFF0000))
+
+/*
+** RegisterErrorClass (msgErrorClass, pFn)
+**
+**	Register a function to return error-strings in the given class.
+**
+**	(Note:  this could be best done by automatically building a linked list of 
+**			diagnostic routines/classes - by simply using a C++ class for error 
+**			classes, and a static constructor to link each class into the queue.
+**			However, we've had problems with static constructors within DLL's
+**			that use MFC and DLL's on NT - so we're avoiding them for now.)
+**
+**	See dberror.cpp (in the database) for an example of an auto-generated diagnostic
+**	map.  The error-code to string mapping function implementation can be generated 
+**	automatically, but the client must register the function manually.
+**
+**	There is no limit on how many ranges a given diagnostic function might handle.  
+**	The function must be registered once for each class, of course.
+**
+**	Normally there will be a function for every specific .h that defines error codes
+**	(whether that .h defines one or more classes of error codes).  For example, 
+**	dberror.h defines 3 error class ranges, so the DB registers one diagnostic function 
+**	that handles those 3 classes accordingly.
+**
+*/
+//typedef const char * (msgCALLBACK *msgErrorDiagnosticCallback) (msgERR);
+
+//extern void RegisterErrorClass (msgErrorClass, msgErrorDiagnosticCallback pFn);
+
+/*
+** NOTE: remainder of this file may be multiply-included  
+**		 place all one-shot definitions above this point
+*/
+#endif // __msgERROR_H__
+
+
+/*
+**	Within an error-class range, the errors are allocated/declared independently. 
+**	See, for example, dberror.h, rperror.h, ecerror.h, etc.
+*/
+
+/* msgError:  wrapper-macro for an error code definition */
+#ifndef MsgError
+#define	MsgError(errorclass, name, offset)		const MsgERR name = (MsgERR) (errorclass + offset);
+#endif
+
+/* msgErrorDiagnostic:  causes wrapper-macro to generate a diagnostic string */
+#ifndef MsgErrorDiagnostic
+#define MsgErrorDiagnostic(errorclass, name, offset)	case ((errorclass)+(offset)):	return #name;
+#endif
+
+/*
+** msgSUCCESS - 	universal no-error indication (zero).  
+**				'! msgERR' is guaranteed to mean success.
+*/
+#ifndef MsgErrorBasic
+#define MsgErrorBasic
+MsgError	(msgErrorOk, eSUCCESS, 				0x0000)	/*  0   Success */
+MsgError	(msgErrorMisc, eUNKNOWN,		    0x0001)	//  1   Something weird
+														//  	happened.
+#endif
+
diff --git a/mozilla/lib/mailto/error.h b/mozilla/lib/mailto/error.h
new file mode 100644
index 00000000000..0de180f0764
--- /dev/null
+++ b/mozilla/lib/mailto/error.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef DBERROR_H
+#define DBERROR_H
+
+#include "errcode.h"
+
+/* General errors */
+MsgError (msgErrorDb, eFAILURE,					0xFFFF)	/* -1	Unqualified DB failure */
+MsgError (msgErrorDb, eBAD_PARAMETER,			0xFFFE)	/* -2	Null pointer, empty string, etc. */
+MsgError (msgErrorDb, eMORE,					0xFFFD)	/* -3	More work to do. */
+MsgError (msgErrorDb, eNYI,						0xFFFC)	/* -4	Not yet implemented */
+MsgError (msgErrorDb, eEXCEPTION,				0xFFFB)	/* -5	An unexpected exception occurred */
+MsgError (msgErrorDb, eBAD_VIEW_INTF,			0xFFFA)	/* -6	COM intf to view layer is out of sync */
+MsgError (msgErrorDb, eBAD_DB_INTF,				0xFFF9)	/* -7 	COM intf to db is out of sync */
+MsgError (msgErrorDb, eID_NOT_FOUND,			0xFFF8) /* -8   Message id not found */
+MsgError (msgErrorDb, eDBEndOfList,				0xFFF7) /* -9   iterator reached end of db */
+MsgError (msgErrorDb, eBAD_URL,					0xFFF5) /* -11  Unable to parse URL */
+/* NewsRC errors */
+MsgError (msgErrorDb, eNewsRCError,				0xFFF4) /* -10   General news rc error */
+/* News errors */
+MsgError (msgErrorDb, eXOverParseError,			0xFFF3) /* -13  Error parsing XOver data */
+/* Internal db errors */
+MsgError (msgErrorDb, eDBExistsNot,				0xFFF2)  /* -14 db doesn't exist */
+MsgError (msgErrorDb, eDBNotOpen,			0xFFF1)  /* -15 our db is not open (or ptr NULL) */
+MsgError (msgErrorDb, eErrorOpeningDB,		0xFFF0) /* -16 Error opening internal db */
+MsgError (msgErrorDb, eOldSummaryFile,			0xFFE0) /* -32 Attempt to oepn old summary file format */
+MsgError (msgErrorDb, eNullView,				0xFFE1) /* -31 View Null */
+MsgError (msgErrorDb, eNotThread,				0xFFE2) /* -30 operation requires a thread */
+MsgError (msgErrorDb, eNoSummaryFile,			0xFFE3)  /* -31 summary file was gone */
+MsgError (msgErrorDb, eBuildViewInBackground,	0xFFE4)  /* -32 db is huge - build view in background */
+MsgError (msgErrorDb, eCorruptDB,				0xFFE5) /* -33 db is corrupt - throw it away */
+/* Platform System Errors */
+ 			
+MsgError (msgErrorDb, eOUT_OF_MEMORY,			0xFF7F)	/* -129	Out of memory for buffer or file-level objects */
+
+/* file errors */
+MsgError (msgErrorDb, eWRITE_ERROR,				0xFFC0) /* -64 Error writing to disk */
+#endif
diff --git a/mozilla/lib/mailto/m_binhex.c b/mozilla/lib/mailto/m_binhex.c
new file mode 100644
index 00000000000..8947378df42
--- /dev/null
+++ b/mozilla/lib/mailto/m_binhex.c
@@ -0,0 +1,1041 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+*
+*	Mac_BinHex.c
+*	------------
+*
+*	The decode and encode for BinHex 4.0
+*
+*		09sep95	mym		Created
+*		18sep95	mym		Added the functions to do encoding from 
+*						the input stream instead of file.
+*/
+
+#include "msg.h"
+#include "appledbl.h"
+#include "m_binhex.h"
+#include "ad_codes.h"
+/* for XP_GetString() */
+#include "xpgetstr.h"
+
+#ifdef XP_MAC
+#include <StandardFile.h>
+#pragma warn_unusedarg off
+#endif
+
+extern int MK_MSG_SAVE_DECODED_AS;
+
+extern int MK_UNABLE_TO_OPEN_TMP_FILE;
+extern int MK_MIME_ERROR_WRITING_FILE;
+extern int MK_MIME_DATA_CORRUPTED;
+
+static char BinHexTable[64] = 
+{
+	0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+	0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x30, 0x31, 0x32,
+	0x33, 0x34, 0x35, 0x36, 0x38, 0x39, 0x40, 0x41,
+	0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+	0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x50, 0x51, 0x52,
+	0x53, 0x54, 0x55, 0x56, 0x58, 0x59, 0x5a, 0x5b,
+	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x68,
+	0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x70, 0x71, 0x72 
+};
+
+/*
+ * 	The encode for bin hex format.
+ */
+ 
+PRIVATE int binhex_fill_data(
+	binhex_encode_object* p_bh_encode_obj, char c)
+{
+	int i;
+	
+	if (p_bh_encode_obj->pos_outbuff >= p_bh_encode_obj->s_outbuff)
+	{
+		p_bh_encode_obj->overflow[p_bh_encode_obj->s_overflow++] = c;
+	}
+	else
+	{
+		p_bh_encode_obj->outbuff[p_bh_encode_obj->pos_outbuff++] =c;
+	}
+	
+	if (++p_bh_encode_obj->line_length == 64)
+	{
+		/*
+		**  Incase the new line is 2 character. LRCR
+		*/
+		for(i = 1; i <= p_bh_encode_obj->newline[0]; i++)
+			binhex_fill_data(p_bh_encode_obj, p_bh_encode_obj->newline[i]);
+			
+		p_bh_encode_obj->line_length = 0;
+	}
+	
+	return p_bh_encode_obj->s_overflow ? errEOB : NOERR;
+}
+
+/************************************************************************
+ * EncodeDataChar - encode an 8-bit data char into a six-bit buffer
+ * returns the number of valid encoded characters generated
+ ************************************************************************/
+PRIVATE int binhex_encode_data_char(
+	binhex_encode_object *p_bh_encode_obj, 
+	unsigned char c)
+{
+	int status = 0;
+
+	switch (p_bh_encode_obj->state86++)
+	{
+		case 0:
+			status = binhex_fill_data(p_bh_encode_obj,
+							BinHexTable[(c>>2)&0x3f]);
+			p_bh_encode_obj->saved_bits = (c&0x3)<<4;
+			break;
+		case 1:
+			status = binhex_fill_data(p_bh_encode_obj, 
+							BinHexTable[p_bh_encode_obj->saved_bits | ((c>>4)&0xf)]);
+			p_bh_encode_obj->saved_bits = (c&0xf)<<2;
+			break;
+		case 2:
+			status = binhex_fill_data(p_bh_encode_obj, 
+							BinHexTable[p_bh_encode_obj->saved_bits | ((c>>6)&0x3)]);
+			if (status != NOERR)
+				break;
+			
+			status = binhex_fill_data(p_bh_encode_obj, 
+							BinHexTable[c&0x3f]);
+			p_bh_encode_obj->state86 = 0;
+			break;
+	}
+	return status;
+} 
+
+#define BYTEMASK 	0xff
+#define BYTEBIT 	0x100
+#define WORDMASK 	0xffff
+#define WORDBIT 	0x10000
+#define CRCCONSTANT 0x1021
+
+#define WOW { \
+		c <<= 1; \
+		if ((temp <<= 1) & WORDBIT) \
+			temp = (temp & WORDMASK) ^ CRCCONSTANT; \
+		temp ^= (c >> 8); \
+		c &= BYTEMASK; \
+	}
+
+PRIVATE void binhex_comp_q_crc_out(
+	binhex_encode_object *p_bh_encode_obj, uint16 c)
+{
+	register uint32 temp = p_bh_encode_obj->CRC;
+
+	WOW;
+	WOW;
+	WOW;
+	WOW;
+	WOW;
+	WOW;
+	WOW;
+	WOW;
+	p_bh_encode_obj->CRC = temp;
+}
+
+PRIVATE int binhex_encode_buff(
+	binhex_encode_object *p_bh_encode_obj,
+	unsigned char* 	data, 
+	int 	size)
+{
+	int  i, status = 0;
+	unsigned char dc;
+	
+	for (i = 0; i < size; i++)
+	{
+		dc = *data++;
+
+		status = binhex_encode_data_char(p_bh_encode_obj, dc);
+		if ((char)dc == (char)0x90)
+			status = binhex_encode_data_char(p_bh_encode_obj, 0);
+			
+		if (status != NOERR)
+			break;
+			
+		binhex_comp_q_crc_out(p_bh_encode_obj, dc);		/* and compute the CRC too */ 
+	}
+	return status;
+}
+
+PRIVATE int binhex_encode_end_a_part(
+	binhex_encode_object* p_bh_encode_obj)
+{
+	int		status;
+	uint16  tempCrc;
+	
+	/*
+	** write the CRC to the encode.
+	*/
+	binhex_comp_q_crc_out(p_bh_encode_obj, 0);
+	binhex_comp_q_crc_out(p_bh_encode_obj, 0);
+	tempCrc = (uint16)(p_bh_encode_obj->CRC & 0xffff);
+	tempCrc = htons(tempCrc);
+	status = binhex_encode_buff(p_bh_encode_obj,
+					(unsigned char*)&tempCrc, 
+					sizeof(uint16));
+	p_bh_encode_obj->CRC = 0;
+	return status;
+}
+
+PRIVATE int binhex_encode_finishing(
+	binhex_encode_object *p_bh_encode_obj)
+{
+	int i, status = 0;
+	
+	if (p_bh_encode_obj->state86) 
+		status = binhex_encode_buff(p_bh_encode_obj, (unsigned char*)&status, 1);
+	
+	/*
+	**	The close token.
+	*/	
+	status = binhex_fill_data(p_bh_encode_obj, ':');
+
+	for (i=1; i <= p_bh_encode_obj->newline[0]; i++)
+		status = binhex_fill_data(p_bh_encode_obj, 
+					p_bh_encode_obj->newline[i]);
+
+	return errDone;		
+}
+
+
+int binhex_encode_init(binhex_encode_object *p_bh_encode_obj)
+{	
+	/*
+	** init all the status.
+	*/
+	XP_MEMSET(p_bh_encode_obj, 0, sizeof(binhex_encode_object));
+	
+	p_bh_encode_obj->line_length = 1;
+	
+	p_bh_encode_obj->newline[0] = 2;
+	p_bh_encode_obj->newline[1] = CR;
+	p_bh_encode_obj->newline[2] = LF;		/*	to confirm with rfc822, use CRLF	*/
+	
+	return NOERR;
+}
+
+int binhex_encode_next(
+	binhex_encode_object* p_bh_encode_obj, 
+	char	*in_buff,
+	int32	in_size,
+	char 	*out_buff, 
+	int32	buff_size,
+	int32	*real_size)
+{
+	int status = 0;
+	/*
+	** setup the buffer information.
+	*/
+	p_bh_encode_obj->outbuff 	 = out_buff;
+	p_bh_encode_obj->s_outbuff 	 = buff_size;
+	p_bh_encode_obj->pos_outbuff = 0;
+	
+	/*
+	** copy over the left over from last time.
+	*/
+	if (p_bh_encode_obj->s_overflow)
+	{
+		XP_MEMCPY(p_bh_encode_obj->overflow, 
+				p_bh_encode_obj->outbuff, 
+				p_bh_encode_obj->s_overflow);
+				
+		p_bh_encode_obj->pos_outbuff = p_bh_encode_obj->s_overflow;
+		p_bh_encode_obj->s_overflow = 0;
+	} 
+	
+	/*
+	** 	Jump to the right state.
+	*/
+	if ( p_bh_encode_obj->state < BINHEX_STATE_DONE)
+	{
+		if (in_buff == NULL && in_size == 0)
+		{
+			/* this is our special token of end of a part, time to append crc codes	*/
+			if (p_bh_encode_obj->state != BINHEX_STATE_FINISH)			
+				status = binhex_encode_end_a_part(p_bh_encode_obj);
+			else
+				status = binhex_encode_finishing(p_bh_encode_obj);
+			
+			p_bh_encode_obj->state += 2;		/* so we can jump to the next state.*/
+		}
+		else
+		{
+			if  (p_bh_encode_obj->state == BINHEX_STATE_START)
+			{
+				XP_STRCPY(p_bh_encode_obj->outbuff + p_bh_encode_obj->pos_outbuff,
+							"\r\n(This file must be converted with BinHex 4.0)\r\n\r\n:");
+				p_bh_encode_obj->pos_outbuff += 52;
+			
+				p_bh_encode_obj->state = BINHEX_STATE_HEADER;
+				
+				XP_MEMCPY(p_bh_encode_obj->name,
+							in_buff, 
+							in_size);	
+			}
+			else if  (p_bh_encode_obj->state == BINHEX_STATE_HEADER)
+			{
+				XP_MEMCPY(&(p_bh_encode_obj->head),
+							in_buff, 
+							sizeof(binhex_header));
+				
+				if (in_size == 20)	/* in the platform that alignment is 4-bytes. */
+					in_size = 18;
+							
+				p_bh_encode_obj->head.dlen = 0;		/* we just can't trust the dlen from 	*/
+													/* apple double decoder told us. 		*/
+													/* do our own counting.					*/				
+			}			
+			else if  (p_bh_encode_obj->state == BINHEX_STATE_DFORK)
+			{
+				if (p_bh_encode_obj->head.dlen == 0)
+				{
+					p_bh_encode_obj->c[0] = in_buff[0];	/* save the first 2 bytes, in case  */
+					p_bh_encode_obj->c[1] = in_buff[1]; /* head and data share 1 code block */
+				}
+				p_bh_encode_obj->head.dlen += in_size;
+			}
+			
+			status 	= binhex_encode_buff(p_bh_encode_obj, 
+							(unsigned char *)in_buff, 
+							in_size);
+		}
+	}				
+	*real_size = p_bh_encode_obj->pos_outbuff;
+	return status;
+}
+
+/*
+**	Only generate the header part of the encoding,
+**	 	so we can fix up the 
+*/
+int binhex_reencode_head(
+	binhex_encode_object *p_bh_encode_obj,
+	char* 	outbuff,
+	int32	buff_size,
+	int32*  real_size)
+{
+	int32	size, dlen;
+	int 	status;
+	char	buff[64];
+	
+	p_bh_encode_obj->state	 	= 0;	
+	p_bh_encode_obj->state86 	= 0;	
+	p_bh_encode_obj->CRC		= 0;
+	p_bh_encode_obj->line_length= 1;
+	p_bh_encode_obj->saved_bits = 0;
+	p_bh_encode_obj->s_overflow = 0	;
+	
+	status = binhex_encode_next(
+						p_bh_encode_obj, 
+						p_bh_encode_obj->name,		
+						p_bh_encode_obj->name[0]+2,		/* in_size */
+						outbuff, 
+						buff_size,
+						real_size);
+	if (status != NOERR)
+		return status;
+		
+	size = *real_size;
+	
+	/* now we should have the right data length in the head structure, but don't 		*/
+	/* forget convert it back to the net byte order (i.e., Motolora) before write it	*/
+	/*																					*/
+	/* Note:	since we don't change the size of rlen, so don't need to worry about it	*/
+	
+	p_bh_encode_obj->head.dlen = htonl(dlen = p_bh_encode_obj->head.dlen);
+	
+	/* make a copy before do the encoding, -- it may modify the head!!!. */
+	XP_MEMCPY(buff, (char*)&p_bh_encode_obj->head, 
+						sizeof(binhex_header));
+	if (18 < sizeof(binhex_header))
+	{
+		/* we get an alignment problem here.	*/
+		XP_MEMCPY(buff + 10, buff + 12, 8);
+	}
+									
+	status = binhex_encode_next(
+						p_bh_encode_obj, 
+						(char*)buff,		
+						18,						/* sizeof(binhex_header),*/
+						outbuff   + size, 
+						buff_size - size,
+						real_size);
+	if (status != NOERR)
+		return status;
+	
+	size += *real_size;
+		
+	status = binhex_encode_next(					/* for CRC */
+						p_bh_encode_obj, 
+						NULL,		
+						0,							/* in_size */
+						outbuff  + size, 
+						buff_size - size,
+						real_size);
+	
+	if (status != NOERR)
+		return status;
+		
+	size += *real_size;
+
+	if (p_bh_encode_obj->state86 != 0)
+	{
+		/*	
+		**	Make sure we don't destroy the orignal valid coding.
+		**
+		**	(Keep in mind that 3 characters share 4 coding chars,
+		**	 so it is possible for the head and data stream share one 4 code group.
+		**
+		**	How about only one or zero character in the data fork?
+		**		---- just rerun the encoding, not a big deal.
+		*/
+		if (dlen <= 1)
+		{
+			/* why just rerun the encoding once more.	*/
+			status = binhex_encode_next(
+						p_bh_encode_obj,
+						p_bh_encode_obj->c,
+						dlen,
+						outbuff   + size,
+						buff_size - size,
+						real_size);
+			if (status != NOERR)
+				return status;
+				
+			size += *real_size;							/* encode the data fork		*/
+			
+			status = binhex_encode_next(
+						p_bh_encode_obj,
+						NULL,
+						0,
+						outbuff   + size,
+						buff_size - size,
+						real_size);
+			if (status != NOERR)
+				return status;
+
+			size += *real_size;							/* for the end up data fork */
+			
+			status = binhex_encode_next(
+						p_bh_encode_obj,
+						NULL,
+						0,
+						outbuff   + size,
+						buff_size - size,
+						real_size);						/* for the end up encoding*/
+		}
+		else
+		{
+			status = binhex_encode_next(
+						p_bh_encode_obj, 
+						p_bh_encode_obj->c,		
+						3 - p_bh_encode_obj->state86,	/* in_size */
+						outbuff   + size, 
+						buff_size - size,
+						real_size);
+		}
+		size += *real_size;	
+	}
+	*real_size = size;
+	
+	return status;
+}
+
+int binhex_encode_end (
+	binhex_encode_object *p_bh_encode_obj, 
+	XP_Bool is_aborting)
+{
+	return NOERR;
+}
+
+
+/*
+**	The decode's.
+*/
+static char binhex_decode[256] = 
+{
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1,
+	13, 14, 15, 16, 17, 18, 19, -1, 20, 21, -1, -1, -1, -1, -1, -1,
+	22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, -1,
+	37, 38, 39, 40, 41, 42, 43, -1, 44, 45, 46, 47, -1, -1, -1, -1,
+	48, 49, 50, 51, 52, 53, 54, -1, 55, 56, 57, 58, 59, 60, -1, -1,
+	61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+#define BHEXVAL(c) (binhex_decode[(unsigned char) c])
+
+/*
+**	the decode for bin hex format.
+*/
+int binhex_decode_init (
+	binhex_decode_object *p_bh_decode_obj,
+	MWContext  *context)
+{
+	XP_MEMSET(p_bh_decode_obj, 0, sizeof(binhex_decode_object));
+	
+	p_bh_decode_obj->octetin 	= 26;
+	p_bh_decode_obj->donepos 	= 3;
+	p_bh_decode_obj->context	= context;
+
+	return NOERR;
+}
+
+static void
+simple_copy(MWContext* context, char* newFile, void* closure)
+{
+	XP_STRCPY((char *)closure, newFile);
+}
+
+PRIVATE void binhex_process(
+	binhex_decode_object *p_bh_decode_obj)
+{
+	int32  	status;
+	uint16 	tmpcrc, cval;
+	unsigned char  ctmp, c = p_bh_decode_obj->rlebuf;
+	
+	/* do CRC */
+	ctmp = p_bh_decode_obj->inCRC ? c : 0;
+	cval = p_bh_decode_obj->CRC   & 0xf000;
+	tmpcrc = ((uint16) (p_bh_decode_obj->CRC << 4) | 
+						 (ctmp >> 4))
+					 ^ (cval | (cval >> 7) | 
+					 	(cval >> 12));
+	cval = tmpcrc & 0xf000;
+	p_bh_decode_obj->CRC = ((uint16) (tmpcrc << 4) | 
+							(ctmp & 0x0f))
+						 ^ (cval | (cval >> 7) | 
+						 	(cval >> 12));
+
+	/* handle state */
+	switch (p_bh_decode_obj->state) 
+	{
+		case BINHEX_STATE_START:
+			p_bh_decode_obj->state 		= BINHEX_STATE_FNAME;
+			p_bh_decode_obj->count 		= 1;
+#ifndef XP_MAC
+			p_bh_decode_obj->name = XP_ALLOC(64);
+#endif
+			*(p_bh_decode_obj->name) = (c & 63);
+			break;
+			
+		case BINHEX_STATE_FNAME:
+			p_bh_decode_obj->name[p_bh_decode_obj->count] = c;
+			
+			if (p_bh_decode_obj->count++ > *(p_bh_decode_obj->name)) 
+			{
+#if 0			
+				char* p;
+				/* convert it to the c-string too. 		*/
+				c = *(p_bh_decode_obj->name);
+				p = p_bh_decode_obj->name;
+			
+				while (c--)
+				{
+					*p = *(p+1); p++;
+				}
+					
+				*p = '\0';
+#endif				
+				p_bh_decode_obj->state = BINHEX_STATE_HEADER;
+				p_bh_decode_obj->count = 0;
+			}
+			break;
+			
+		case BINHEX_STATE_HEADER:
+			((char *)&p_bh_decode_obj->head)[p_bh_decode_obj->count] = c;
+			if (++p_bh_decode_obj->count == 18) 
+			{
+#ifndef XP_MAC
+				if (sizeof(binhex_header) != 18)	/* fix the alignment problem in some OS */
+				{
+					char *p = (char *)&p_bh_decode_obj->head;
+					p += 19;
+					for (c = 0; c < 8; c++)
+					{
+						*p = *(p-2);	p--;
+					}
+ 				}
+#endif
+				p_bh_decode_obj->state = BINHEX_STATE_HCRC;
+				p_bh_decode_obj->inCRC = 1;
+				p_bh_decode_obj->count = 0;
+			}
+			break;
+			
+		case BINHEX_STATE_DFORK:
+		case BINHEX_STATE_RFORK:
+			p_bh_decode_obj->outbuff[p_bh_decode_obj->pos_outbuff++] = c;
+			if (-- p_bh_decode_obj->count == 0) 
+			{
+#ifdef XP_MAC	
+				long howMuch = p_bh_decode_obj->pos_outbuff;
+				status = FSWrite(p_bh_decode_obj->fileId, 
+								&howMuch,
+								p_bh_decode_obj->outbuff);								
+				FSClose(p_bh_decode_obj->fileId);
+#else				
+								/* only output data fork in the non-mac system.			*/
+				if (p_bh_decode_obj->state == BINHEX_STATE_DFORK)
+				{
+					status = XP_FileWrite(p_bh_decode_obj->outbuff,
+								p_bh_decode_obj->pos_outbuff,
+								p_bh_decode_obj->fileId)
+									== p_bh_decode_obj->pos_outbuff ? NOERR : errFileWrite;
+								
+					XP_FileClose(p_bh_decode_obj->fileId);
+				}
+				else
+				{
+					status = NOERR;				/* do nothing for resource fork.	*/
+				}
+#endif
+				p_bh_decode_obj->pos_outbuff = 0;
+				
+				if (status != NOERR)
+					p_bh_decode_obj->state = status;
+				else
+				{
+					p_bh_decode_obj->state ++;
+					p_bh_decode_obj->fileId = 0;
+				}
+				p_bh_decode_obj->inCRC = 1;
+			}
+			else if (p_bh_decode_obj->pos_outbuff >= MAX_BUFF_SIZE)
+			{				
+#ifdef XP_MAC	
+				long howMuch = p_bh_decode_obj->pos_outbuff;
+				status = FSWrite(p_bh_decode_obj->fileId, 
+								&howMuch,
+								p_bh_decode_obj->outbuff);
+#else
+				if (p_bh_decode_obj->state == BINHEX_STATE_DFORK)
+				{
+					status = XP_FileWrite(p_bh_decode_obj->outbuff,
+								p_bh_decode_obj->pos_outbuff,
+								p_bh_decode_obj->fileId) 
+									== p_bh_decode_obj->pos_outbuff ? NOERR : errFileWrite; 
+				}
+				else
+				{
+					status = NOERR;			/* don't care about the resource fork. */
+				}
+#endif							
+				if (status != NOERR)
+					p_bh_decode_obj->state = status;
+					
+				p_bh_decode_obj->pos_outbuff = 0;
+			}
+			break;
+			
+		case BINHEX_STATE_HCRC:
+		case BINHEX_STATE_DCRC:
+		case BINHEX_STATE_RCRC:
+			if (!p_bh_decode_obj->count++) 
+			{
+				p_bh_decode_obj->fileCRC = (unsigned short) c << 8;
+			} 
+			else 
+			{
+				if ((p_bh_decode_obj->fileCRC | c) != p_bh_decode_obj->CRC) 
+				{
+					if (p_bh_decode_obj->state > BINHEX_STATE_HCRC) 
+					{
+#ifdef XP_MAC
+						HDelete(p_bh_decode_obj->vRefNum, 
+								p_bh_decode_obj->parID,
+								(unsigned char*)p_bh_decode_obj->name);
+#else
+						XP_FileRemove(p_bh_decode_obj->name, xpURL);
+#endif
+					}
+					p_bh_decode_obj->state = errDecoding;
+					break;
+				}
+				
+				/*
+				** passed the CRC check!!!
+				*/
+				p_bh_decode_obj->CRC = 0;
+				if (++ p_bh_decode_obj->state == BINHEX_STATE_FINISH) 
+				{
+#ifdef XP_MAC
+					FInfo 	finfo;
+
+					/* set back the file information.before we declare done ! */
+					finfo.fdType 	= p_bh_decode_obj->head.type;
+					finfo.fdCreator = p_bh_decode_obj->head.creator;
+					finfo.fdFlags 	= p_bh_decode_obj->head.flags & 0xf800;
+					
+					HSetFInfo(p_bh_decode_obj->vRefNum, 
+								p_bh_decode_obj->parID, 
+								(unsigned char *)p_bh_decode_obj->name, 
+								&finfo);
+#endif
+					/* 	now We are done with everything.	*/		
+					p_bh_decode_obj->state++;
+					break;
+				}
+				
+				if (p_bh_decode_obj->state == BINHEX_STATE_DFORK) 
+				{
+#ifdef XP_MAC
+					StandardFileReply	reply;
+					if( !p_bh_decode_obj->mSpec )
+					{	
+						StandardPutFile("\pSave decoded file as:", 
+									(unsigned char *)p_bh_decode_obj->name, 
+									&reply);
+									
+						if (!reply.sfGood) 
+						{
+							p_bh_decode_obj->state = errUsrCancel;
+							break;
+						}
+					}
+					else
+					{
+						reply.sfFile.vRefNum = p_bh_decode_obj->mSpec->vRefNum;
+						reply.sfFile.parID = p_bh_decode_obj->mSpec->parID;
+						XP_MEMCPY(&reply.sfFile.name, p_bh_decode_obj->mSpec->name , 63 );		
+					}					
+					
+					XP_MEMCPY(p_bh_decode_obj->name, 
+							reply.sfFile.name, 
+							*(reply.sfFile.name)+1);	/* save the new file name.	*/
+						
+					p_bh_decode_obj->vRefNum = reply.sfFile.vRefNum;
+					p_bh_decode_obj->parID   = reply.sfFile.parID;
+						
+					HDelete(reply.sfFile.vRefNum,
+									reply.sfFile.parID, 
+									reply.sfFile.name);
+					
+					status = HCreate(p_bh_decode_obj->vRefNum, 
+									 p_bh_decode_obj->parID, 
+									 reply.sfFile.name,
+									 p_bh_decode_obj->head.creator, 
+									 p_bh_decode_obj->head.type);
+#else	/* non-mac OS case */
+					char* filename;
+					
+					filename = XP_ALLOC(1024);
+					if (filename == NULL ||
+						FE_PromptForFileName(p_bh_decode_obj->context, 
+										XP_GetString(MK_MSG_SAVE_DECODED_AS),
+										0,
+										FALSE,
+										FALSE,
+										simple_copy,
+										filename) == -1)
+					{
+						FREEIF(filename);
+						p_bh_decode_obj->state = errUsrCancel;
+						break;
+					}
+
+					FREEIF(p_bh_decode_obj->name);
+					p_bh_decode_obj->name = XP_STRDUP(filename);
+					p_bh_decode_obj->fileId 
+						= XP_FileOpen(filename, 
+									xpURL, 
+									XP_FILE_TRUNCATE_BIN);
+					if (p_bh_decode_obj->fileId == NULL)
+						status = errFileOpen;
+					else
+						status = NOERR;
+
+					XP_FREE(filename);
+					
+#endif
+					if (status != NOERR)
+						p_bh_decode_obj->state = status;
+						
+					p_bh_decode_obj->count 
+						= ntohl(p_bh_decode_obj->head.dlen);
+				}
+				else
+				{
+					p_bh_decode_obj->count 
+						= ntohl(p_bh_decode_obj->head.rlen);	/* it should in host byte order */
+				}
+				
+				if (p_bh_decode_obj->count) 
+				{
+					p_bh_decode_obj->inCRC = 0;
+#ifdef XP_MAC
+					if (p_bh_decode_obj->state == BINHEX_STATE_DFORK)
+						status = HOpen(p_bh_decode_obj->vRefNum,
+									   p_bh_decode_obj->parID,
+									   (unsigned char*)p_bh_decode_obj->name,
+									   fsWrPerm,
+									   &(p_bh_decode_obj->fileId));
+					else
+						status = HOpenRF(p_bh_decode_obj->vRefNum,
+									   p_bh_decode_obj->parID,
+									   (unsigned char*)p_bh_decode_obj->name,
+									   fsWrPerm,
+									   &(p_bh_decode_obj->fileId));
+					if (status != NOERR) 
+					{
+						p_bh_decode_obj->state = errFileOpen;
+						HDelete(p_bh_decode_obj->vRefNum,
+										p_bh_decode_obj->parID, 
+										(unsigned char*)p_bh_decode_obj->name);
+						break;
+					}
+#else
+					/* for None Mac OS -- nothing is required, file already open.	*/
+					
+#endif							
+				} 
+				else 
+				{
+					/* nothing inside, so skip to the next state. */
+					p_bh_decode_obj->state ++;
+				}
+			}
+			break;
+	}
+	
+	return;
+}
+
+static int get_next_char(binhex_decode_object *p_bh_decode_obj)
+{
+	char c = 0;
+	
+	while (p_bh_decode_obj->pos_inbuff < p_bh_decode_obj->s_inbuff)
+	{
+		c = p_bh_decode_obj->inbuff[p_bh_decode_obj->pos_inbuff++];
+		if (c != LF && c != CR)
+			break;
+	}
+	return (c == LF || c == CR) ? 0 : (int) c;
+}
+
+int binhex_decode_next (
+	binhex_decode_object *p_bh_decode_obj, 
+	const char *in_buff, 
+	int32 	buff_size)
+{
+	int	found_start;
+	int octetpos, c = 0;
+	uint32 		val;
+	
+	/*
+	**	reset the buff first. 
+	*/
+	p_bh_decode_obj->inbuff 	= (char*)in_buff;
+	p_bh_decode_obj->s_inbuff 	= buff_size;
+	p_bh_decode_obj->pos_inbuff	= 0;
+	
+	/*
+	**	if it is the first time, seek to the right start place. 
+	*/
+	if (p_bh_decode_obj->state == BINHEX_STATE_START)
+	{
+		 found_start = FALSE;
+		/*
+		**	go through the line, until we get a ':'
+		*/
+		while (p_bh_decode_obj->pos_inbuff < p_bh_decode_obj->s_inbuff)
+		{
+			c = p_bh_decode_obj->inbuff[p_bh_decode_obj->pos_inbuff++];
+			while (c == CR || c == LF)
+			{
+				if (p_bh_decode_obj->pos_inbuff >= p_bh_decode_obj->s_inbuff)
+					break;
+																
+				c = p_bh_decode_obj->inbuff[p_bh_decode_obj->pos_inbuff++];
+				if (c == ':')
+				{
+					found_start = TRUE;
+					break;
+				}
+			}
+			if (found_start)	break;		/* we got the start point.				*/
+		}
+		
+		if (p_bh_decode_obj->pos_inbuff >= p_bh_decode_obj->s_inbuff)
+			return NOERR;			/* we meet buff end before we get the 	*/
+									/* start point, wait till next fills.	*/
+		
+		if (c != ':')
+			return errDecoding;		/* can't find the start character.	*/
+	}
+	
+	/*
+	**	run - through the in-stream now.
+	*/
+	while (p_bh_decode_obj->state >= 0 && 
+		   p_bh_decode_obj->state < BINHEX_STATE_DONE) 
+	{
+		/* fill in octetbuf */
+		do 
+		{
+			if (p_bh_decode_obj->pos_inbuff >= p_bh_decode_obj->s_inbuff)
+				return NOERR;			/* end of buff, go on for the nxet calls. */
+					
+			c = get_next_char(p_bh_decode_obj);
+			if (c == 0)
+				return NOERR;
+				 
+			if ((val = BHEXVAL(c)) == -1) 
+			{
+				/*
+				** we incount an invalid character.
+				*/
+				if (c) 
+				{
+					/*
+					** rolling back.
+					*/
+					p_bh_decode_obj->donepos --;
+					if (p_bh_decode_obj->octetin >= 14)		p_bh_decode_obj->donepos--;
+					if (p_bh_decode_obj->octetin >= 20) 	p_bh_decode_obj->donepos--;
+				}
+				break;
+			}
+			p_bh_decode_obj->octetbuf.val |= val << p_bh_decode_obj->octetin;
+		} 
+		while ((p_bh_decode_obj->octetin -= 6) > 2);
+			
+		/* handle decoded characters -- run length encoding (rle) detection */
+
+#ifndef XP_MAC		
+		p_bh_decode_obj->octetbuf.val 
+			= ntohl(p_bh_decode_obj->octetbuf.val);
+#endif
+
+		for (octetpos = 0; octetpos < p_bh_decode_obj->donepos; ++octetpos) 
+		{
+			c = p_bh_decode_obj->octetbuf.c[octetpos];
+			
+			if (c == 0x90 && !p_bh_decode_obj->marker++) 
+				continue;
+						
+			if (p_bh_decode_obj->marker) 
+			{
+				if (c == 0) 
+				{
+					p_bh_decode_obj->rlebuf = 0x90;
+					binhex_process(p_bh_decode_obj);
+				} 
+				else 
+				{
+					while (--c > 0)				/* we are in the run lenght mode */ 
+					{
+						binhex_process(p_bh_decode_obj);
+					}
+				}
+				p_bh_decode_obj->marker = 0;
+			} 
+			else 
+			{
+				p_bh_decode_obj->rlebuf = (unsigned char) c;
+				binhex_process(p_bh_decode_obj);
+			}
+			
+			
+			if (p_bh_decode_obj->state >= BINHEX_STATE_FINISH) 
+				break;
+		}
+		
+		/* prepare for next 3 characters.	*/
+		if (p_bh_decode_obj->donepos < 3 && p_bh_decode_obj->state < BINHEX_STATE_FINISH) 
+			p_bh_decode_obj->state = errDecoding;
+					
+		p_bh_decode_obj->octetin 		= 26;
+		p_bh_decode_obj->octetbuf.val 	= 0;
+	}
+	
+	/* 
+	**	Error clean-ups 
+	*/
+	if (p_bh_decode_obj->state < 0 && p_bh_decode_obj->fileId) 
+	{
+#ifdef XP_MAC
+		FSClose(p_bh_decode_obj->fileId);
+		p_bh_decode_obj->fileId = 0;
+		HDelete(p_bh_decode_obj->vRefNum, 
+				p_bh_decode_obj->parID, 
+				(unsigned char*)p_bh_decode_obj->name);
+#else
+		XP_FileClose(p_bh_decode_obj->fileId);
+		p_bh_decode_obj->fileId = 0;
+		XP_FileRemove(p_bh_decode_obj->name, xpURL);
+#endif
+	}
+	
+	
+	return 	p_bh_decode_obj->state < 0  				  ? (p_bh_decode_obj->state) : 
+			p_bh_decode_obj->state >= BINHEX_STATE_FINISH ? errDone : NOERR;
+}
+
+int binhex_decode_end (
+	binhex_decode_object *p_bh_decode_obj, 
+	XP_Bool 	is_aborting)
+{
+#ifdef XP_MAC
+	if (p_bh_decode_obj->fileId)
+	{
+		FSClose(p_bh_decode_obj->fileId);
+		p_bh_decode_obj->fileId = 0;
+		
+		if (is_aborting)
+		{
+			HDelete(p_bh_decode_obj->vRefNum, 
+					p_bh_decode_obj->parID, 
+					(unsigned char*)p_bh_decode_obj->name);
+		}
+	}
+	
+#else
+
+	if (p_bh_decode_obj->fileId)
+	{
+		XP_FileClose(p_bh_decode_obj->fileId);
+		p_bh_decode_obj->fileId = NULL;
+		
+		if (is_aborting)
+			XP_FileRemove(p_bh_decode_obj->name, xpURL);		
+	}
+	FREEIF(p_bh_decode_obj->name);
+#endif
+
+	return NOERR;
+}
+
+ 
diff --git a/mozilla/lib/mailto/m_binhex.h b/mozilla/lib/mailto/m_binhex.h
new file mode 100644
index 00000000000..7f55e76d036
--- /dev/null
+++ b/mozilla/lib/mailto/m_binhex.h
@@ -0,0 +1,184 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+*	The head file for Bin Hex 4.0 encode/decode 
+* 	-------------------------------------------
+*	
+*		10sep95	mym	created
+*/
+
+#ifndef	binhex_h
+#define	binhex_h
+
+#ifdef XP_MAC
+#if PRAGMA_ALIGN_SUPPORTED
+#pragma options align=mac68k
+#endif
+#endif /* XP_MAC */
+
+#define BINHEX_STATE_START  	0
+#define BINHEX_STATE_FNAME  	1
+#define BINHEX_STATE_HEADER 	2
+#define BINHEX_STATE_HCRC   	3
+#define BINHEX_STATE_DFORK  	4
+#define BINHEX_STATE_DCRC   	5
+#define BINHEX_STATE_RFORK  	6
+#define BINHEX_STATE_RCRC   	7
+#define BINHEX_STATE_FINISH   	8
+#define BINHEX_STATE_DONE  		9
+/* #define BINHEX_STATE_ERROR		10 */
+
+/*
+**	The Definitions for the binhex encoder
+*/
+typedef struct _binhex_header
+{
+	uint32	type, creator;
+	uint16  flags;
+	int32	dlen, rlen ;
+
+} binhex_header;
+
+typedef	struct _binhex_encode_object
+{
+	int		state;				/*	progress state.				*/
+	
+	int 	state86;			/*	binhex encode state.		*/
+	unsigned long CRC;			/*  accumulated CRC				*/
+	int		line_length;		/*	the line length count 		*/
+	char	saved_bits;
+	
+	int		s_inbuff;			/*	the inbuff size				*/
+	int		pos_inbuff;			/*  the inbuff position			*/
+	char*	inbuff;				/*	the inbuff pool				*/
+	
+	int		s_outbuff;			/*	the outbuff size			*/
+	int		pos_outbuff;		/*	the outbuff position		*/
+	char*	outbuff;			/*	the outbuf pool				*/
+	
+	int		s_overflow;			/*	the real size of overflow	*/
+	char	overflow[32];		/*	a small overflow buffer		*/
+	
+	char	c[2];
+	char	newline[4];			/*	the new line char seq.		*/
+
+	/* -- for last fix up. -- */
+
+	char 			name[64];
+	binhex_header	head;
+	
+} binhex_encode_object;
+
+/*
+**	The defination for the binhex decoder.
+**	NOTE:	This define is for Mac only.
+*/
+
+typedef union 
+{
+	unsigned char c[4];
+	uint32 		  val;
+
+} longbuf;
+
+#define MAX_BUFF_SIZE			256
+
+typedef struct _binhex_decode_object
+{
+	int	    state;			/* current state 						*/
+	uint16  CRC;			/* cumulative CRC 						*/
+	uint16  fileCRC;		/* CRC value from file 					*/
+
+	longbuf octetbuf;		/* buffer for decoded 6-bit values 		*/
+	int16 	octetin;		/* current input position in octetbuf 	*/
+	int16 	donepos;		/* ending position in octetbuf 			*/
+	int16 	inCRC;			/* flag set when reading a CRC 			*/
+
+	int32 	count;			/* generic counter 						*/
+	int16 	marker;			/* flag indicating maker 				*/
+	unsigned char rlebuf;	/* buffer for last run length encoding value */
+
+	binhex_header head;		/* buffer for header 					*/
+
+#ifdef XP_MAC
+	FSSpec*  mSpec;
+	char 	name[64];		/* fsspec for the output file 		*/
+	int16	vRefNum;
+	int32	parID ;
+	int16	fileId;			/* the refnum of the output file 		*/
+#else
+	char	*name;			/* file name for the output file in non-mac OS */
+	XP_File	fileId;			/* the file if for the outpur file. non-mac OS */
+#endif
+
+	MWContext* context; 	/* context for call back function.		*/
+	
+	int32	s_inbuff;		/* the valid size of the inbuff			*/
+	int32	pos_inbuff;		/* the index of the inbuff.				*/
+	char*	inbuff;			/* the inbuff pointer.					*/
+	int32	pos_outbuff;	/* the position of the out buff.		*/		
+	char	outbuff[MAX_BUFF_SIZE];
+	
+} binhex_decode_object;
+
+XP_BEGIN_PROTOS
+
+/*
+**  The binhex file encode prototypes. 
+*/
+int binhex_encode_init(binhex_encode_object *p_bh_encode_obj);
+
+int binhex_encode_next(binhex_encode_object *p_bh_encode_obj, 
+					char	*in_buff,
+					int32	in_size,
+					char 	*out_buff, 
+					int32	buff_size,
+					int32	*real_size);
+					
+int binhex_encode_end (binhex_encode_object *p_bh_encode_obj, 
+					XP_Bool is_aborting);
+					
+int binhex_reencode_head(
+					binhex_encode_object *p_bh_encode_obj,
+					char* 	outbuff,
+					int32	buff_size,
+					int32*  real_size);
+
+
+/*
+**	The binhex stream decode prototypes. 
+*/
+
+int binhex_decode_init(binhex_decode_object *p_bh_decode_env, 		
+					MWContext  *context);
+					
+int binhex_decode_next(binhex_decode_object *p_bh_decode_env, 
+					const char 	*in_buff, 
+					int32 		buff_size); 
+int binhex_decode_end (binhex_decode_object *p_bh_decode_env, 
+					XP_Bool 	is_aborting);
+
+XP_END_PROTOS
+
+#ifdef XP_MAC
+#if PRAGMA_ALIGN_SUPPORTED
+#pragma options align=reset
+#endif
+#endif /* XP_MAC */
+
+#endif /* binhex_h */
diff --git a/mozilla/lib/mailto/mhtmlstm.cpp b/mozilla/lib/mailto/mhtmlstm.cpp
new file mode 100644
index 00000000000..fbe1c0a602b
--- /dev/null
+++ b/mozilla/lib/mailto/mhtmlstm.cpp
@@ -0,0 +1,885 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*   mhtmlstm.c --- generation of MIME HTML.
+ */
+
+//#ifdef MSG_SEND_MULTIPART_RELATED
+
+#include "msg.h"
+#include "net.h"
+#include "structs.h"
+#include "xp_core.h"
+#include "mhtmlstm.h"
+#include "xp_mem.h"
+#include "xp_str.h"
+#include "xp_mcom.h"
+#include "xp_file.h"
+#include "prprf.h"
+#include "xpassert.h"
+#include "msgsend.h"
+#include "msgsendp.h"
+#include "mimeenc.h"
+#include "libi18n.h"
+
+extern "C" {
+	extern int MK_UNABLE_TO_OPEN_FILE;
+}
+
+
+
+/* Defined in libnet/mkcache.c */
+extern "C" int NET_FindURLInCache(URL_Struct * URL_s, MWContext *ctxt);
+
+/* Defined in layout/editor.cpp */
+extern "C" XP_Bool EDT_IsSameURL(char *url1,char *url2,char *base1,char *base2);
+
+/*
+----------------------------------------------------------------------
+MSG_MimeRelatedFileInfo
+----------------------------------------------------------------------
+*/
+
+
+/*
+----------------------------------------------------------------------
+MSG_MimeRelatedStreamOut
+----------------------------------------------------------------------
+*/
+
+class MSG_MimeRelatedStreamOut : public IStreamOut
+{
+public:
+	MSG_MimeRelatedStreamOut(XP_File file);
+	~MSG_MimeRelatedStreamOut(void);
+
+    virtual void Write( char *pBuffer, int32 iCount );
+	//static int WriteMimeData( const char *pBuffer, int32 iCount, void *closure);
+
+    virtual EOutStreamStatus Status();
+
+	virtual intn Close(void);
+
+	XP_File m_file;
+	XP_Bool m_hasWritten;
+	//MimeEncoderData *m_encoder;
+	EOutStreamStatus m_status;
+};
+
+
+
+MSG_MimeRelatedStreamOut::MSG_MimeRelatedStreamOut(XP_File file)
+	: m_file(file), m_hasWritten(FALSE), m_status(EOS_NoError)
+{
+}
+
+MSG_MimeRelatedStreamOut::~MSG_MimeRelatedStreamOut(void)
+{
+	Close();
+}
+
+void
+MSG_MimeRelatedStreamOut::Write(char *pBuffer, int32 iCount)
+{
+//	if (!m_encoder)
+//		(void) WriteMimeData(pBuffer, iCount, this);
+//	else
+//		(void) MimeEncoderWrite(m_encoder, pBuffer, iCount);
+
+	if (m_status != EOS_NoError)
+		return;
+
+	// For now, pass through the information.
+	XP_ASSERT(m_file);
+	int numBytes = 0;
+	if (m_file)
+	{
+		numBytes = XP_FileWrite(pBuffer, iCount, m_file);
+		if (numBytes != iCount)
+		{
+			TRACEMSG(("MSG_MimeRelatedStreamOut::Write(): error: %d written != %ld to write",numBytes, (long)iCount));
+			if (m_hasWritten)
+				m_status = EOS_DeviceFull; // wrote in the past, so this means the disk is full
+			else
+				m_status = EOS_FileError; // couldn't even write once, so assume it's some other problem
+		}
+	}
+
+	if (!m_hasWritten) m_hasWritten = TRUE;
+}
+
+//int
+//MSG_MimeRelatedStreamOut::WriteMimeData(const char *pBuffer, int32 iCount, void *closure)
+//{
+//}
+
+IStreamOut::EOutStreamStatus
+MSG_MimeRelatedStreamOut::Status(void)
+{
+	return m_status;
+}
+
+intn
+MSG_MimeRelatedStreamOut::Close(void)
+{
+	if (m_file)
+	{
+		XP_FileClose(m_file);
+		m_file = 0;
+	}
+	return 0;
+}
+
+/*
+----------------------------------------------------------------------
+MSG_MimeRelatedSubpart
+----------------------------------------------------------------------
+*/
+
+char *
+MSG_MimeRelatedSubpart::GenerateCIDHeader(void)
+{
+	char *header;
+
+	// If we have a Content-ID, generate that.
+	header = (m_pContentID ? 
+		PR_smprintf("Content-ID: <%s>", m_pContentID) : 0);
+	// If we have no Content-ID but an original URL, send that.
+	if (!header && m_pOriginalURL)
+		header = PR_smprintf("Content-Location: %s", m_pOriginalURL);
+	// If none of the above and we have a local URL, use that instead.
+	if (!header && m_pLocalURL)
+		header = PR_smprintf("Content-Location: %s", m_pLocalURL);
+	if (!header)
+		header = XP_STRDUP("");
+
+	return header;
+}
+
+char *
+MSG_MimeRelatedSubpart::GenerateEncodingHeader(void)
+{
+	char *header = NULL;
+
+	if (m_pEncoding)
+		header = PR_smprintf("Content-Transfer-Encoding: %s", m_pEncoding);
+	else
+		header = XP_STRDUP("");	
+
+	return header;
+}
+
+char *
+MSG_MimeRelatedSubpart::GetContentID(XP_Bool bAttachMIMEPrefix)
+{
+	char *result = NULL;
+
+	if (m_pContentID)
+	{
+		result = PR_smprintf("%s%s", (bAttachMIMEPrefix ? "cid:" : ""),
+							 m_pContentID);
+	}
+
+	return result;
+}
+
+
+int
+MSG_MimeRelatedSubpart::GetStreamOut(IStreamOut **pReturn)
+{
+	int result = 0;
+
+	if (!m_pStreamOut)
+	{
+		if (m_filename)
+		{
+			XP_File file = XP_FileOpen(m_filename, xpFileToPost, XP_FILE_WRITE_BIN);
+			if (file)
+			{
+				m_pStreamOut = new MSG_MimeRelatedStreamOut(file);
+			}
+		}
+	}
+	if (!m_pStreamOut) 
+		result = MK_UNABLE_TO_OPEN_FILE; /* -1; rb */
+	*pReturn = (IStreamOut *) m_pStreamOut;
+
+	return result;
+}
+
+int
+MSG_MimeRelatedSubpart::CloseStreamOut(void)
+{
+	int result = 0;
+
+	if (m_pStreamOut)
+	{
+		delete m_pStreamOut; // this will close the stream
+		m_pStreamOut = NULL;
+	}
+
+	return result;
+}
+
+MSG_MimeRelatedSubpart::MSG_MimeRelatedSubpart(MSG_MimeRelatedSaver *parent,
+											   char *pContentID,
+											   char *pOriginal, char *pLocal,
+											   char *pMime, int16 part_csid, char *pFilename)
+	: MSG_SendPart(NULL, part_csid), m_pOriginalURL(NULL), 
+	  m_pLocalURL(NULL), m_pParentFS(parent),
+	  m_pContentID(NULL), m_pContentName(NULL), m_rootPart(FALSE)
+{
+	m_filetype = xpFileToPost;
+	
+	if (pOriginal)
+		m_pOriginalURL = XP_STRDUP(pOriginal);
+	if (pLocal)
+		m_pLocalURL = XP_STRDUP(pLocal);
+	if (pMime)
+		m_type = XP_STRDUP(pMime);
+	if (pContentID)
+		m_pContentID = XP_STRDUP(pContentID);
+
+	if ((!m_pOriginalURL) && (!m_type))
+	{
+		// Assume we're saving an untitled HTML document (the root part) if
+		// we're given neither the name nor the type.
+		m_type = XP_STRDUP(TEXT_HTML);
+	}
+
+	if (pFilename)
+	{
+		CopyString(&m_filename, pFilename);
+		m_rootPart = TRUE;
+	}
+	else
+	{
+		// Generate a temp name for a file to which to write.
+		char *tmp = WH_TempName(xpFileToPost, "nsmail");
+		if (tmp)
+		{
+			CopyString(&m_filename, tmp);
+			XP_FREE(tmp);
+		}
+	}
+
+	// If we have a filename, create the file now so that
+	// the Mac doesn't generate the same file name twice.
+	if (m_filename)
+	{
+		XP_File fp = XP_FileOpen(m_filename, xpFileToPost, XP_FILE_WRITE_BIN);
+		if (fp)
+			XP_FileClose(fp);
+	}
+
+	//XP_ASSERT(m_type != NULL);
+	XP_ASSERT(m_filename != NULL);
+	//XP_ASSERT(m_pContentID != NULL);
+}
+
+MSG_MimeRelatedSubpart::~MSG_MimeRelatedSubpart(void)
+{
+	// Close any streams we may have had open.
+	if (m_pStreamOut)
+		delete m_pStreamOut;
+
+	// Delete the file we represent.
+	if (m_filename)
+	{
+		XP_FileRemove(m_filename, xpFileToPost);
+	}
+
+	XP_FREEIF(m_pOriginalURL);
+	XP_FREEIF(m_pLocalURL);
+	XP_FREEIF(m_pContentID);
+	XP_FREEIF(m_pEncoding);
+	XP_FREEIF(m_pContentName);
+
+	m_pOriginalURL = m_pLocalURL = NULL;
+}
+
+int
+MSG_MimeRelatedSubpart::WriteEncodedMessageBody(const char *buf, int32 size, 
+												void *pPart)
+{
+	MSG_MimeRelatedSubpart *subpart = (MSG_MimeRelatedSubpart *) pPart;
+	int returnVal = 0;
+
+	XP_ASSERT(subpart->m_state != NULL);
+	if (subpart->m_state)
+		returnVal = mime_write_message_body(subpart->m_state, (char *) buf, size);
+
+	return returnVal;
+}
+
+void
+MSG_MimeRelatedSubpart::CopyURLInfo(const URL_Struct *pURL)
+{
+	char *suffix = NULL;
+	if (pURL != NULL)
+	{
+		// Get the MIME type if we have it.
+		if (pURL->content_type && *(pURL->content_type))
+			SetType(pURL->content_type);
+
+		// Look for a content name in this order:
+		// 1. If we have a content name, use that as is.
+		// 2. If we have a content type, find an extension 
+		//    corresponding to the content type, and attach it to 
+		//    the temp filename.
+		// 3. If we have neither a content name nor a content type,
+		//    duplicate the temp filename as is. (Yuck.)
+		if (pURL->content_name && *(pURL->content_name))
+			m_pContentName = XP_STRDUP(pURL->content_name);
+
+		else if (pURL->content_type && (suffix = NET_cinfo_find_ext(pURL->content_type)) != NULL)
+		{
+			// We found an extension locally, add it to the temp name.
+			char *end = XP_STRRCHR(m_filename, '.');
+
+			if (end)
+				*end = '\0';
+
+			m_pContentName = PR_smprintf("%s.%s", m_filename, suffix);
+
+			if (end)
+				*end = '.';
+		}
+	}
+
+	if (!m_pContentName)
+		m_pContentName = XP_STRDUP(m_filename);
+}
+
+int
+MSG_MimeRelatedSubpart::Write(void)
+{
+	// If we weren't given the mime type by the editor,
+	// then attempt to deduce it from what information we can get.
+	
+	if ((m_pOriginalURL) && (!m_type))
+	{
+		// We weren't explicitly given the MIME type, so
+		// we ask the cache if it knows anything about this URL.
+ 		URL_Struct testUrl;
+		XP_MEMSET(&testUrl, 0, sizeof(URL_Struct));
+
+ 		testUrl.address = m_pOriginalURL;
+ 		int findResult = NET_FindURLInCache(&testUrl, 
+ 											m_pParentFS->GetContext());
+ 		if ((findResult != 0) && (testUrl.content_type))
+ 		{
+ 			// Got a MIME type from the cache.
+ 			m_type = XP_STRDUP(testUrl.content_type);
+ 		}
+	}
+
+	if ((m_pOriginalURL) && (!m_type))
+	{
+		// Either we didn't find the URL in the cache, or
+		// we have it but don't know its MIME type.
+		// So, we trot out our last resort: attempt to grok
+		// the MIME type based on the filename. (Mr. Yuk says: "Yuk.")
+		
+		NET_cinfo *pMimeInfo = NET_cinfo_find_type(m_pOriginalURL);
+		if ((pMimeInfo) && (pMimeInfo->type))
+		{
+			// Got a MIME type based on the filename.
+			m_type = XP_STRDUP(pMimeInfo->type);
+		}
+	}
+
+	if (!m_type)
+	{
+		// No matter what we've done, we will never figure out the type. 
+		// So, we punt and call it an application/octet-stream.
+		m_type = XP_STRDUP(APPLICATION_OCTET_STREAM);
+	}
+
+	// Determine what the encoding of this data should be depending
+	// on the MIME type. This is fairly braindead: base64 encode anything
+	// that isn't text.
+	if (m_type && (!m_rootPart))
+	{
+		// Uuencode only if we have to, otherwise use base64
+		if (m_pParentFS->m_pPane->
+			GetCompBoolHeader(MSG_UUENCODE_BINARY_BOOL_HEADER_MASK))
+		{
+			m_pEncoding = XP_STRDUP(ENCODING_UUENCODE);			
+			SetEncoderData(MimeUUEncoderInit(m_pContentName ? m_pContentName : "",
+#ifdef XP_OS2
+											 (int (_Optlink*) (const char*,int32,void*))
+#endif
+											 WriteEncodedMessageBody, 
+											 this));
+		}
+		else
+		{
+			m_pEncoding = XP_STRDUP(ENCODING_BASE64);
+			SetEncoderData(MimeB64EncoderInit(
+#ifdef XP_OS2
+								(int (_Optlink*) (const char*,int32,void*))
+#endif
+								 WriteEncodedMessageBody,
+								 this));
+		}
+	}
+
+	// Horrible hack: if we got a local filename then we're the root lump,
+	// hence we don't generate a content ID header in that case
+	// (but we do in all other cases where we have a content ID)
+	char *cidHeader = NULL;
+	if ((!m_rootPart) && (m_pContentID))
+	{
+		cidHeader = GenerateCIDHeader();
+		if (cidHeader)
+		{
+			AppendOtherHeaders(cidHeader);
+			AppendOtherHeaders(CRLF);
+			XP_FREE(cidHeader);
+		}
+	}
+
+	if (m_pEncoding)
+	{
+		char *encHeader = GenerateEncodingHeader();
+		if (encHeader)
+		{
+			AppendOtherHeaders(encHeader);
+			AppendOtherHeaders(CRLF);
+			XP_FREE(encHeader);
+		}
+	}
+	
+	if ((!m_rootPart) && (m_pOriginalURL))
+	{
+		char *fileHeader = PR_smprintf("Content-Disposition: inline; filename=\"%s\"",
+										m_pContentName ? m_pContentName : "");
+		if (fileHeader)
+		{
+			AppendOtherHeaders(fileHeader);
+			AppendOtherHeaders(CRLF);
+			XP_FREE(fileHeader);
+		}
+	}
+
+	return MSG_SendPart::Write();
+}
+
+/*
+----------------------------------------------------------------------
+MSG_MimeRelatedParentPart
+----------------------------------------------------------------------
+*/
+
+MSG_MimeRelatedParentPart::MSG_MimeRelatedParentPart(int16 part_csid)
+: MSG_SendPart(NULL, part_csid)
+{
+}
+
+MSG_MimeRelatedParentPart::~MSG_MimeRelatedParentPart(void)
+{
+}
+
+/*
+----------------------------------------------------------------------
+MSG_MimeRelatedSaver
+----------------------------------------------------------------------
+*/
+
+extern char * msg_generate_message_id(void);
+
+// Constructor
+MSG_MimeRelatedSaver::MSG_MimeRelatedSaver(MSG_CompositionPane *pane, 
+										   MWContext *context, 
+										   MSG_CompositionFields *fields,
+										   XP_Bool digest_p, 
+										   MSG_Deliver_Mode deliver_mode,
+										   const char *body, 
+										   uint32 body_length,
+										   MSG_AttachedFile *attachedFiles,
+										   DeliveryDoneCallback cb,
+										   char **ppOriginalRootURL)
+	: m_pContext(context), m_pBaseURL(NULL), m_pPane(pane),
+	  m_pFields(fields), m_digest(digest_p), m_deliverMode(deliver_mode),
+	  m_pBody(body), m_bodyLength(body_length), 
+	  m_pAttachedFiles(attachedFiles), m_cbDeliveryDone(cb), m_pSourceBaseURL(NULL)
+
+{
+	// Generate the message ID.
+	m_pMessageID = msg_generate_message_id();
+	if (m_pMessageID)
+	{
+		// Massage the message ID so that it can be used for generating
+		// part IDs. For now, just remove the angle brackets.
+		m_pMessageID[strlen(m_pMessageID)-1] = '\0'; // shorten the end by 1
+		char *temp = XP_STRDUP(&(m_pMessageID[1])); // and strip off the leading '<'
+		if (temp)
+		{
+			XP_FREE(m_pMessageID);
+			m_pMessageID = temp;
+		}
+	}
+	XP_ASSERT(m_pMessageID);
+
+	// Create the part object that we represent.
+	m_pPart = new MSG_MimeRelatedParentPart(INTL_DefaultWinCharSetID(context));
+	XP_ASSERT(m_pPart);
+
+	if ((ppOriginalRootURL != NULL) && *(ppOriginalRootURL))
+	{
+		// Have a valid string of some sort, wait to be added.
+	}
+	else if (ppOriginalRootURL != NULL)
+	{
+		// ### mwelch This is a hack, required because EDT_SaveFileTo
+		//            requires a source URL string, even if the document
+		//            is currently untitled. The hack consists of adding
+		//            the return parameter in the constructor, and passing
+		//            back an improvised source URL if we were not given one.
+		//
+		// Autogenerate the title and pass it back.
+		m_rootFilename = WH_TempName(xpFileToPost,"nsmail");
+		XP_ASSERT(m_rootFilename);
+		char * temp = WH_FileName(m_rootFilename, xpFileToPost);
+		*ppOriginalRootURL = XP_PlatformFileToURL(temp);
+		if (temp)
+			XP_FREE( temp );
+	}
+
+	// Set our type to be multipart/related.
+	m_pPart->SetType(MULTIPART_RELATED);
+}
+
+// Destructor
+MSG_MimeRelatedSaver::~MSG_MimeRelatedSaver(void)
+{
+  XP_FREEIF(m_pSourceBaseURL);
+  if (m_rootFilename) 
+  {
+	  XP_FileRemove(m_rootFilename, xpFileToPost);
+	  XP_FREEIF(m_rootFilename);
+  }
+  XP_FREEIF(m_pMessageID);
+}
+
+intn MSG_MimeRelatedSaver::GetType()
+{
+  return ITapeFileSystem::MailSend;
+}
+
+MSG_MimeRelatedSubpart *
+MSG_MimeRelatedSaver::GetSubpart(intn iFileIndex)
+{
+	XP_ASSERT(m_pPart != NULL);
+
+	MSG_MimeRelatedSubpart *part = 
+		(MSG_MimeRelatedSubpart *) m_pPart->GetChild(iFileIndex);
+
+	return part;
+}
+
+// This function is called before anything else.
+// Tell the file system the base URL it is going to see.
+void
+MSG_MimeRelatedSaver::SetSourceBaseURL(char *pURL)
+{
+  XP_FREEIF(m_pSourceBaseURL);
+	m_pSourceBaseURL = XP_STRDUP(pURL);
+
+#if 0
+	MSG_MimeRelatedSubpart *part = NULL;
+	// Remember the URL for later.
+	m_pBaseURL = pURL;
+
+	// Add this URL as the first in the list.
+	if (m_pPart->GetNumChildren() == 0)
+	{
+		AddFile(pURL);
+	}
+	else
+	{
+		part = GetSubpart(0);
+		if (part)
+		{
+			XP_FREEIF(part->m_pOriginalURL);
+			part->m_pOriginalURL = (pURL == NULL) ? NULL : XP_STRDUP(pURL);
+		}
+	}
+
+	// Fix the local URL/filename reference if we haven't already opened the file.
+	if (!part) 
+		part = GetSubpart(0);
+	if (part && (part->m_pStreamOut == NULL))
+	{
+		XP_FREEIF(part->m_pLocalURL);
+		part->m_pLocalURL = PR_smprintf("file:%s",part->GetFilename());
+		XP_ASSERT(part->m_pLocalURL);
+
+		part->SetOtherHeaders(""); // no headers for the lead part
+	}
+#endif
+}
+
+char* 
+MSG_MimeRelatedSaver::GetSourceURL(intn iFileIndex)
+{
+	char *result = NULL;
+
+	MSG_MimeRelatedSubpart *part = GetSubpart(iFileIndex);
+	if (part->m_pOriginalURL) {
+    // Try to make absolute relative to value set in MSG_MimeRelatedSaver::SetSourceBaseURL().
+    if (m_pSourceBaseURL) {
+      result = NET_MakeAbsoluteURL(m_pSourceBaseURL,part->m_pOriginalURL);
+    }
+    else {
+  		result = XP_STRDUP(part->m_pOriginalURL);
+    }
+  }
+
+	return result;
+}
+
+// Add a name to the file system.
+// Returns the index of the file added (0 based). 
+intn
+MSG_MimeRelatedSaver::AddFile(char * pURL, char * pMimeType, int16 part_csid)
+{
+	intn returnValue = 0;
+	MSG_MimeRelatedSubpart *newPart = NULL;
+	int i;
+
+	// See if a part with this url already exists.
+	for(i=0;(i<m_pPart->GetNumChildren()) && (!newPart);i++)
+	{
+		newPart = GetSubpart(i);
+    // Use EDT_IsSameURL to deal with case insensitivity on MAC and Win16
+		if (!newPart || 
+        !EDT_IsSameURL(newPart->m_pOriginalURL, pURL,m_pSourceBaseURL,m_pSourceBaseURL)) {
+			newPart = NULL; // not this one, try the next one
+    }
+    else {
+      // found it.
+      returnValue = i;
+    }
+	}
+	
+	if (newPart == NULL)
+	{
+		// Generate a Content ID. This will look a lot like our message ID,
+		// except that we will add the part number.
+		XP_ASSERT(m_pMessageID != NULL);
+		char *newPartID = PR_smprintf("part%ld.%s", (long) m_pPart->GetNumChildren(), 
+									  m_pMessageID);
+		XP_ASSERT(newPartID != NULL);
+
+		char *newLocalURL = PR_smprintf("cid:%s",newPartID);
+		XP_ASSERT(newLocalURL != NULL);
+
+		returnValue = m_pPart->GetNumChildren();
+
+		if (m_pPart->GetNumChildren() == 0)
+			// This is the root file in the file system.
+			newPart = new MSG_MimeRelatedSubpart(this, newPartID, pURL, 
+												 pURL, TEXT_HTML, part_csid, 
+												 m_rootFilename);
+		else
+			newPart = new MSG_MimeRelatedSubpart(this, newPartID, pURL, 
+												 newLocalURL, pMimeType, part_csid	);
+
+		if (newPart)
+			m_pPart->AddChild(newPart);
+		else
+			returnValue = (intn) ITapeFileSystem::Error; // an error since 0 is the base URL (??)
+
+		XP_FREEIF(newPartID);
+		XP_FREEIF(newLocalURL);
+	}
+
+	return returnValue;
+}
+
+intn
+MSG_MimeRelatedSaver::GetNumFiles(void)
+{ 
+	return m_pPart->GetNumChildren(); 
+}
+
+char *
+MSG_MimeRelatedSaver::GetDestAbsURL()
+{
+  // No meaningful destination URL for sending mail.
+  return NULL;
+}
+
+// Get the name of the relative url to place in the file.
+char *
+MSG_MimeRelatedSaver::GetDestURL(intn iFileIndex)
+{
+	char *result = NULL;
+
+	MSG_MimeRelatedSubpart *thePart = GetSubpart(iFileIndex);
+	if (thePart != NULL)
+	{
+		result = XP_STRDUP(thePart->m_pLocalURL);
+	}
+
+	return result;
+}
+
+char *
+MSG_MimeRelatedSaver::GetDestPathURL(void)
+{
+	//return XP_STRDUP(""); // no path prefix for content IDs
+    return NULL;
+}
+
+// Return the name to display when saving the file.
+char *
+MSG_MimeRelatedSaver::GetHumanName(intn iFileIndex)
+{
+	char *result = NULL;
+
+	MSG_MimeRelatedSubpart *thePart = GetSubpart(iFileIndex);
+	if (thePart != NULL)
+	{
+		result = thePart->m_pOriginalURL;
+		char *end = XP_STRRCHR(result, '/');
+		if (end)
+			result = XP_STRDUP(++end);
+		else
+			result = XP_STRDUP(result);
+	}
+	return result;
+}
+
+// Open the output stream.
+IStreamOut *
+MSG_MimeRelatedSaver::OpenStream(intn iFileIndex)
+{
+	intn theError = 0;
+	IStreamOut *pStream = NULL; // in case we fail
+
+	// Create a stream object that can be written to.
+	MSG_MimeRelatedSubpart *thePart = GetSubpart(iFileIndex);
+	if (thePart)
+	{
+		theError = (intn) thePart->GetStreamOut(&pStream);
+	}
+	return pStream;
+}
+
+void 
+MSG_MimeRelatedSaver::CopyURLInfo(intn iFileIndex, const URL_Struct *pURL)
+{
+	MSG_MimeRelatedSubpart *thePart = GetSubpart(iFileIndex);
+	if (thePart != NULL)
+		thePart->CopyURLInfo(pURL);
+}
+
+// Close the output stream.
+// Called on completion. bSuccess is TRUE if completed successfully, 
+// FALSE if it failed.
+void
+MSG_MimeRelatedSaver::Complete(Bool bSuccess, 
+                                                       EDT_ITapeFileSystemComplete *pfComplete, void *pArg )
+{
+ 	m_pEditorCompletionFunc = pfComplete;
+	m_pEditorCompletionArg = pArg;
+
+	// Call StartMessageDelivery (and should) if we
+	// were told to at creation time.
+	if (bSuccess)
+	{
+		// If we only generated a single HTML part, treat that as 
+		// the root part.
+		if (m_pPart->GetNumChildren() == 1)
+		{
+			MSG_SendPart *tempPart = m_pPart->DetachChild(0);
+			delete m_pPart;
+			m_pPart = tempPart;
+		}
+
+		msg_StartMessageDeliveryWithAttachments(m_pPane, this,
+												m_pFields,
+												m_digest, FALSE, 
+												m_deliverMode,
+												TEXT_HTML,
+												m_pBody, m_bodyLength,
+												m_pAttachedFiles,
+												m_pPart,
+#ifdef XP_OS2
+												(void (_Optlink*) (MWContext*,void*,int,const char*))
+#endif
+												MSG_MimeRelatedSaver::UrlExit);
+	}
+	else
+	{
+		// delete the contained part since we failed
+		delete m_pPart;
+		m_pPart = NULL;
+
+    // Call our UrlExit routine to perform cleanup.
+    UrlExit(m_pPane->GetContext(), this, MK_INTERRUPTED, NULL);
+	}
+}
+
+void
+MSG_MimeRelatedSaver::UrlExit(MWContext *context, void *fe_data, int status,
+							  const char *error_message)
+{
+  MSG_MimeRelatedSaver *saver = (MSG_MimeRelatedSaver *) fe_data;
+  XP_ASSERT(saver != NULL);
+  if (saver)
+	{
+	  if (saver->m_pEditorCompletionFunc)
+		{
+		  (*(saver->m_pEditorCompletionFunc))((status == 0), 
+											  saver->m_pEditorCompletionArg);
+		}
+	  if (saver->m_cbDeliveryDone)
+		{
+		  (*(saver->m_cbDeliveryDone))(context,saver->m_pPane,
+									   status,error_message);
+		}
+	}
+  delete saver; // the part within stays around, we don't
+}
+
+void 
+MSG_MimeRelatedSaver::CloseStream( intn iFileIndex )
+{
+	// Get the piece whose stream we will close.
+	MSG_MimeRelatedSubpart *thePart = GetSubpart(iFileIndex);
+	if (thePart)
+	{
+		thePart->CloseStreamOut();
+	}
+}
+
+XP_Bool
+MSG_MimeRelatedSaver::FileExists( intn /*iFileIndex*/ )
+{
+	return FALSE;
+}
+
+XP_Bool 
+MSG_MimeRelatedSaver::IsLocalPersistentFile(intn /*iFileIndex*/) {
+    return FALSE;
+}
+
+//#endif
diff --git a/mozilla/lib/mailto/mhtmlstm.h b/mozilla/lib/mailto/mhtmlstm.h
new file mode 100644
index 00000000000..6634156f2e7
--- /dev/null
+++ b/mozilla/lib/mailto/mhtmlstm.h
@@ -0,0 +1,225 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+   mhtmlstm.h --- generation of MIME HTML from the editor.
+ */
+
+#ifndef LIBMSG_MHTMLSTM_H
+#define LIBMSG_MHTMLSTM_H
+
+// Comment out the next line if you want to turn off the sending of multipart/related info.
+#define MSG_SEND_MULTIPART_RELATED
+
+//#ifdef MSG_SEND_MULTIPART_RELATED
+
+#include "msg.h"
+#include "itapefs.h"
+#include "ptrarray.h"
+#include "xp_file.h"
+#include "ntypes.h"
+#include "msgcpane.h"
+#include "msgsendp.h"
+#include "itapefs.h"
+
+class MSG_MimeRelatedStreamIn;
+class MSG_MimeRelatedStreamOut;
+class MSG_MimeRelatedSubpart;
+class MSG_MimeRelatedSaver;
+class MSG_SendMimeDeliveryState;
+
+typedef void (*DeliveryDoneCallback) (MWContext *context,
+									  void *fe_data,
+									  int status,
+									  const char *error_message);
+
+// A record which represents a part of this multipart.
+// Encapsulates the stuff necessary to convert MIME part data
+// into message text.
+class MSG_MimeRelatedSubpart : public MSG_SendPart
+{
+public:
+	char *m_pOriginalURL;          // Original URL for this lump
+	char *m_pLocalURL;             // Local relative URL for this lump
+	MSG_MimeRelatedSaver *m_pParentFS; // The parent FS that includes us
+	char *m_pContentID;            // Content ID of this lump
+	char *m_pEncoding;             // Content transfer encoding
+	char *m_pContentName;		   // Content name (as conveyed by CopyURLInfo)
+	MSG_MimeRelatedStreamOut *m_pStreamOut; // Current output (to file) stream
+	XP_Bool m_rootPart;				// Are we the first part of the multipart?
+
+	MSG_MimeRelatedSubpart(MSG_MimeRelatedSaver *parent,
+						   char *pContentID,
+						   char *pOriginal,
+						   char *pLocal,
+						   char *pMime,
+						   int16 part_csid,
+						   char *pRootFileName = NULL);
+
+	~MSG_MimeRelatedSubpart(void);
+
+	char                   *GetContentID(XP_Bool bAddMIMEPrefix);
+	int                    GetStreamOut(IStreamOut **pReturn);
+	int                    CloseStreamOut(void);
+	int                    Write(void);
+
+	// Copy information out of the URL used to fetch its data
+	void					CopyURLInfo(const URL_Struct *pURL);
+
+	// Function used by the mime encoder when writing to message file
+	static int WriteEncodedMessageBody(const char *buf, int32 size, void *pPart);
+
+	// Generate any additional header strings for this part
+	// (such as the "Content-ID:" string)
+	char *                 GenerateCIDHeader(void);
+	char *				   GenerateEncodingHeader(void);
+};
+
+class MSG_MimeRelatedSaver;
+
+class MSG_MimeRelatedParentPart : public MSG_SendPart
+{
+public:
+	MSG_MimeRelatedParentPart(int16 part_csid);
+	virtual ~MSG_MimeRelatedParentPart();
+
+	//virtual int Write();
+
+    //virtual int SetFile(const char* filename, XP_FileType filetype);
+    //virtual int SetBuffer(const char* buffer);
+    //virtual int SetOtherHeaders(const char* other);
+	//virtual int AppendOtherHeaders(const char* moreother);
+    //virtual int AddChild(MSG_SendPart* child);
+};
+
+class MSG_MimeRelatedSaver : public ITapeFileSystem
+{
+public:
+	MWContext *    m_pContext; // Context
+	char *         m_pBaseURL; // Base URL of this lump
+	char *         m_pMessageID; // Message ID that we will use to generate
+                               // unique names for each content ID
+	char *         m_rootFilename; // Filename for root object (created at const. time)
+  char *         m_pSourceBaseURL; // Only used to return absolute URLs for GetSourceURL()
+	
+	MSG_SendPart *m_pPart;
+
+	// All these are parameters to be passed to StartMessageDelivery
+	MSG_CompositionPane *m_pPane;
+	MSG_CompositionFields *m_pFields;
+	XP_Bool        m_digest;
+	MSG_Deliver_Mode m_deliverMode;
+	const char     *m_pBody;
+	uint32         m_bodyLength;
+	MSG_AttachedFile *m_pAttachedFiles;
+	DeliveryDoneCallback m_cbDeliveryDone;
+    void           (*m_pEditorCompletionFunc)(XP_Bool success, void *data);
+    void           *m_pEditorCompletionArg;
+
+	void ClearAllParts(void);
+
+public:
+    MSG_MimeRelatedSaver(MSG_CompositionPane *pane, MWContext *context, 
+						 MSG_CompositionFields *fields,
+						 XP_Bool digest_p, MSG_Deliver_Mode deliver_mode,
+						 const char *body, uint32 body_length,
+						 MSG_AttachedFile *attachedFiles,
+						 DeliveryDoneCallback cb,
+						 char **ppOriginalRootURL);
+	virtual ~MSG_MimeRelatedSaver();
+
+
+  virtual intn GetType();
+
+    // This function is called before anything else.  It tells the file
+    //  system the base url it is going to see.
+    virtual void SetSourceBaseURL( char* pURL );
+
+	virtual char* GetSourceURL(intn iFileIndex);
+
+    // DESCRIPTION:
+    //
+    // Add a name to the file system.  It is up to the file system to localize
+    //  the name.  For example, I could add 'http://home.netscape.com/'
+    //  and the file system might decide that it should be called 'index.html'
+    //  if the file system were DOS, the url might be converted to INDEX.HTML
+    //
+    // RETURNS: index of the file (0 based)
+    //   
+    virtual intn AddFile( char* pURL, char *pMimeType, int16 iDocCharSetID );
+
+	// Count the number of files we know about.
+	virtual intn GetNumFiles(void);
+
+  virtual char* GetDestAbsURL();
+
+    // Gets the name of the RELATIVE url to place in the file.  String is 
+    //  allocated with XP_STRDUP();
+    //  
+    virtual char* GetDestURL( intn iFileIndex );
+
+    // String is allocated with XP_STRDUP().
+    virtual char* GetDestPathURL();
+
+    //
+    // Returns the name to display when saving the file, can be the same as 
+    //  GetURLName. String is allocated with XP_STRDUP();
+    //
+    virtual char* GetHumanName( intn iFileIndex );
+
+    virtual XP_Bool IsLocalPersistentFile(intn iFileIndex);
+
+    // Does the file referenced by iFileIndex already exist?
+    // For the MHTML version, this will always return FALSE.
+    virtual XP_Bool FileExists(intn iFileIndex);
+
+    //
+    // Opens the output stream. Returns a stream that can be written to.  All
+    //  'AddFile's occur before the first OpenStream.
+    //
+    virtual IStreamOut * OpenStream( intn iFileIndex );
+
+    virtual void CloseStream( intn iFileIndex );
+
+	// ### mwelch Added so that multipart/related message saver can properly construct
+	//            messages using quoted/forwarded part data.
+	// Tell the tape file system the mime type of a particular part.
+	// (Calling this overrides any previously determined mime type for this part.)
+	virtual void CopyURLInfo(intn iFileIndex, const URL_Struct *pURL);
+
+    //
+    // Called on completion, TRUE if completed successfully, FALSE if it failed.
+    //  
+    virtual void Complete( Bool bSuccess, EDT_ITapeFileSystemComplete *pfComplete, void *pArg );
+	// Has this file system received a true multipart or just some HTML?
+	char *GetMimeType(void);
+
+	MWContext *GetContext(void) const { return m_pContext; }
+
+	char *GetMessageID(void) const { return m_pMessageID; }
+
+	MSG_MimeRelatedSubpart *GetSubpart( intn iFileIndex );
+
+  // Used when the mail system is done sending the message.
+  // Causes the editor to clean up from the save.
+  static void UrlExit(MWContext *context, void *fe_data, int status, 
+					  const char *error_message);
+};
+
+//#endif
+
+#endif
diff --git a/mozilla/lib/mailto/msg.h b/mozilla/lib/mailto/msg.h
new file mode 100644
index 00000000000..7330853390b
--- /dev/null
+++ b/mozilla/lib/mailto/msg.h
@@ -0,0 +1,318 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+   msg.h --- internal defs for the msg library
+ */
+#ifndef _MSG_H_
+#define _MSG_H_
+
+#include "xp.h"
+#include "msgcom.h"
+#include "msgnet.h"
+#include "msgutils.h"
+#include "xpgetstr.h"
+
+#ifdef XP_CPLUSPLUS
+class MessageDBView;
+class MSG_SendPart;
+#endif
+
+#define MANGLE_INTERNAL_ENVELOPE_LINES /* We always need to do this, for now */
+#undef FIXED_SEPARATORS				   /* this doesn't work yet */
+#define EMIT_CONTENT_LENGTH			   /* Experimental; and anyway, we only
+										  emit it, we don't parse it, so this
+										  is only the first step. */
+
+/* This string gets appended to the beginning of an attachment field
+   during a forward quoted operation */
+
+#define MSG_FORWARD_COOKIE  "$forward_quoted$"
+
+
+/* The PRINTF macro is for debugging messages of unusual events (summary */
+/* files out of date or invalid or the like.  It's so that as I use the mail */
+/* to actually read my e-mail, I can look at the shell output whenever */
+/* something unusual happens so I can get some clues as to what's going on. */
+/* Please don't remove any PRINTF calls you see, and be sparing of adding */
+/* any additional ones.  Thanks.  - Terry */
+
+#ifdef DEBUG
+#define PRINTF(msg) XP_Trace msg
+#else
+#define PRINTF(msg)
+#endif
+
+#ifdef FREEIF
+#undef FREEIF
+#endif
+#define FREEIF(obj) do { if (obj) { XP_FREE (obj); obj = 0; }} while (0)
+
+/* The Netscape-specific header fields that we use for storing our
+   various bits of state in mail folders.
+ */
+#define X_MOZILLA_STATUS           "X-Mozilla-Status"
+#define X_MOZILLA_STATUS_FORMAT    X_MOZILLA_STATUS ": %04.4x"
+#define X_MOZILLA_STATUS_LEN      /*1234567890123456*/      16
+
+#define X_MOZILLA_STATUS2		   "X-Mozilla-Status2"
+#define X_MOZILLA_STATUS2_FORMAT   X_MOZILLA_STATUS2 ": %08.8x"
+#define X_MOZILLA_STATUS2_LEN	  /*12345678901234567*/		17
+
+#define X_MOZILLA_DRAFT_INFO	   "X-Mozilla-Draft-Info"
+#define X_MOZILLA_DRAFT_INFO_LEN  /*12345678901234567890*/  20
+
+#define X_MOZILLA_NEWSHOST         "X-Mozilla-News-Host"
+#define X_MOZILLA_NEWSHOST_LEN    /*1234567890123456789*/   19
+
+#define X_UIDL                     "X-UIDL"
+#define X_UIDL_LEN                /*123456*/                 6
+
+#define CONTENT_LENGTH             "Content-Length"
+#define CONTENT_LENGTH_LEN        /*12345678901234*/        14
+
+/* Provide a common means of detecting empty lines in a message. i.e. to detect the end of headers among other things...*/
+#define EMPTY_MESSAGE_LINE(buf) (buf[0] == CR || buf[0] == LF || buf[0] == '\0')
+
+typedef int32 MsgChangeCookie;	/* used to unregister change notification */
+
+/* The three ways the list of newsgroups can be pruned.
+ */
+typedef enum
+{
+  MSG_ShowAll,
+  MSG_ShowSubscribed,
+  MSG_ShowSubscribedWithArticles
+} MSG_NEWSGROUP_DISPLAY_STYLE;
+
+/* The three ways to deliver a message.
+ */
+typedef enum
+{
+  MSG_DeliverNow,
+  MSG_QueueForLater,
+  MSG_SaveAsDraft,
+  MSG_SaveAsTemplate
+} MSG_Deliver_Mode;
+
+
+/* A little enum for things we'd like to learn lazily.
+ * e.g. displaying recipients for this pane? Yes we are,
+ *      no we're not, haven't figured it out yet
+ */
+typedef enum
+{
+	msg_No,
+	msg_Yes,
+	msg_DontKnow
+} msg_YesNoDontKnow;
+
+/* The MSG_REPLY_TYPE shares the same space as MSG_CommandType, to avoid
+   possible weird errors, but is restricted to the `composition' commands
+   (MSG_ReplyToSender through MSG_ForwardMessage.)
+ */
+typedef MSG_CommandType MSG_REPLY_TYPE;
+
+/* The list of all message flags to not write to disk. */
+#define MSG_FLAG_RUNTIME_ONLY   (MSG_FLAG_ELIDED)
+
+
+/* ===========================================================================
+   Structures.
+   ===========================================================================
+ */
+
+/* Used for the various things that parse RFC822 headers...
+ */
+typedef struct message_header
+{
+  const char *value; /* The contents of a header (after ": ") */
+  int32 length;      /* The length of the data (it is not NULL-terminated.) */
+} message_header;
+
+
+
+/* Argument to msg_NewsgroupNameMapper() */
+typedef int (*msg_SubscribedGroupNameMapper) (MWContext *context,
+                                              const char *name,
+                                              void *closure);
+
+XP_BEGIN_PROTOS
+
+/* we'll need this for localized folder names */
+
+extern int MK_MSG_INBOX_L10N_NAME;
+extern int MK_MSG_OUTBOX_L10N_NAME; /* win16 variations are in allxpstr.h */
+extern int MK_MSG_OUTBOX_L10N_NAME_OLD;
+extern int MK_MSG_TRASH_L10N_NAME;
+extern int MK_MSG_DRAFTS_L10N_NAME;
+extern int MK_MSG_SENT_L10N_NAME;
+extern int MK_MSG_TEMPLATES_L10N_NAME;
+
+#define INBOX_FOLDER_NAME	MSG_GetSpecialFolderName(MK_MSG_INBOX_L10N_NAME)
+#define QUEUE_FOLDER_NAME	MSG_GetSpecialFolderName(MK_MSG_OUTBOX_L10N_NAME)
+#define QUEUE_FOLDER_NAME_OLD	MSG_GetSpecialFolderName(MK_MSG_OUTBOX_L10N_NAME_OLD)
+#define TRASH_FOLDER_NAME	MSG_GetSpecialFolderName(MK_MSG_TRASH_L10N_NAME)
+#define DRAFTS_FOLDER_NAME  MSG_GetSpecialFolderName(MK_MSG_DRAFTS_L10N_NAME)
+#define SENT_FOLDER_NAME	MSG_GetSpecialFolderName(MK_MSG_SENT_L10N_NAME)
+#define TEMPLATES_FOLDER_NAME	MSG_GetSpecialFolderName(MK_MSG_TEMPLATES_L10N_NAME)
+#ifdef XP_OS2
+#define INBOX_FOLDER_PRETTY_NAME       MSG_GetSpecialFolderPrettyName(MK_MSG_INBOX_L10N_NAME)
+#define QUEUE_FOLDER_PRETTY_NAME       MSG_GetSpecialFolderPrettyName(MK_MSG_OUTBOX_L10N_NAME)
+#define QUEUE_FOLDER_PRETTY_NAME_OLD   MSG_GetSpecialFolderPrettyName(MK_MSG_OUTBOX_L10N_NAME_OLD)
+#define TRASH_FOLDER_PRETTY_NAME       MSG_GetSpecialFolderPrettyName(MK_MSG_TRASH_L10N_NAME)
+#define DRAFTS_FOLDER_PRETTY_NAME	   MSG_GetSpecialFolderPrettyName(MK_MSG_DRAFTS_L10N_NAME)
+#define SENT_FOLDER_PRETTY_NAME		   MSG_GetSpecialFolderPrettyName(MK_MSG_SENT_L10N_NAME)
+#define TEMPLATES_FOLDER_PRETTY_NAME   MSG_GetSpecialFolderPrettyName(MK_MSG_TEMPLATES_L10N_NAME)
+#endif
+
+
+int ConvertMsgErrToMKErr(uint32 err); /* this routine might live - the rest are
+										probably already dead */
+
+
+/* ===========================================================================
+   Redisplay-related stuff
+   ===========================================================================
+ */
+
+/* Clear out the message display (make Layout be displaying no document.) */
+extern void msg_ClearMessageArea (MWContext *context);
+
+
+/* Returns a line suitable for using as the envelope line in a BSD
+   mail folder. The returned string is stored in a static, and so
+   should be used before msg_GetDummyEnvelope is called again. */
+extern char * msg_GetDummyEnvelope(void);
+
+/* Returns TRUE if the buffer looks like a valid envelope.
+   This test is somewhat more restrictive than XP_STRNCMP(buf, "From ", 5).
+ */
+extern XP_Bool msg_IsEnvelopeLine(const char *buf, int32 buf_size);
+
+
+/* ===========================================================================
+   Utilities specific to mail folders and their Folders and ThreadEntries.
+   ===========================================================================
+ */
+
+/* returns the name of a magic folder - returns a new string. */
+extern char *msg_MagicFolderName(MSG_Prefs* prefs, uint32 flag, int *pStatus);
+
+
+/* Get the current fcc folder name, so we can sort them up at the top of the
+   other folder lists with the other magic folders. */
+const char* msg_GetDefaultFcc(XP_Bool news_p);
+
+
+/* Reads the first few bytes of the file and returns FALSE if it doesn't
+   seem to be a mail folder.  (Empty and nonexistent files return TRUE.)
+   If it doesn't seem to be one, the user is asked whether it should be
+   written to anyway, and their answer is returned.
+ */
+extern XP_Bool msg_ConfirmMailFile (MWContext *context, const char *file_name);
+
+/* ===========================================================================
+   The content-type converters for the MIME types.  These are provided by
+   compose.c, but are registered by netlib rather than msglib, for some
+   destined-to-be-mysterious reason.
+   ===========================================================================
+ */
+extern NET_StreamClass *MIME_MessageConverter (int format_out, void *closure,
+                                               URL_Struct *url,
+                                               MWContext *context);
+
+extern NET_StreamClass *MIME_RichtextConverter (int format_out, void *data_obj,
+                                                URL_Struct *url,
+                                                MWContext *context);
+
+extern NET_StreamClass *MIME_EnrichedTextConverter (int format_out,
+                                                    void *data_obj,
+                                                    URL_Struct *url,
+                                                    MWContext *context);
+
+extern NET_StreamClass *MIME_ToDraftConverter (int format_out, void *closure,
+                                               URL_Struct *url,
+                                               MWContext *context);
+
+extern NET_StreamClass *MIME_VCardConverter (int format_out, void *data_obj,
+                                                URL_Struct *url,
+                                                MWContext *context);
+
+extern NET_StreamClass *MIME_JulianConverter (int format_out, void *data_obj,
+                                              URL_Struct *url,
+                                              MWContext *context);
+
+
+/* This nastiness is how msg_SaveSelectedNewsMessages() works. */
+extern NET_StreamClass *msg_MakeAppendToFolderStream (int format_out,
+                                                       void *closure,
+                                                       URL_Struct *url,
+                                                       MWContext *);
+
+/* This probably should be in mime.h, except that mime.h should mostly be
+   private to libmsg.  So it's here. */
+extern void
+msg_StartMessageDeliveryWithAttachments (MSG_Pane *pane,
+										 void      *fe_data,
+										 MSG_CompositionFields *fields,
+										 XP_Bool digest_p,
+										 XP_Bool dont_deliver_p,
+										 MSG_Deliver_Mode deliver_mode,
+										 const char *attachment1_type,
+										 const char *attachment1_body,
+										 uint32 attachment1_body_length,
+										 const struct MSG_AttachedFile *attachments,
+										 void *mimeRelatedPart,
+										 void (*message_delivery_done_callback)
+										 (MWContext *context, 
+										  void *fe_data,
+										  int status,
+										  const char *error_message));
+
+extern int
+msg_DownloadAttachments (MSG_Pane *pane,
+						 void *fe_data,
+						 const struct MSG_AttachmentData *attachments,
+						 void (*attachments_done_callback)
+						      (MWContext *context, 
+							   void *fe_data,
+							   int status, const char *error_message,
+							   struct MSG_AttachedFile *attachments));
+
+
+extern 
+int msg_DoFCC (MSG_Pane *pane,
+			   const char *input_file,  XP_FileType input_file_type,
+			   const char *output_file, XP_FileType output_file_type,
+			   const char *bcc_header_value,
+			   const char *fcc_header_value);
+
+extern char* msg_generate_message_id (void);
+
+#ifdef XP_UNIX
+extern int msg_DeliverMessageExternally(MWContext *, const char *msg_file);
+#endif /* XP_UNIX */
+
+
+XP_END_PROTOS
+
+
+
+
+
+#endif /* !_MSG_H_ */
diff --git a/mozilla/lib/mailto/msgbg.cpp b/mozilla/lib/mailto/msgbg.cpp
new file mode 100644
index 00000000000..81c6d5a2702
--- /dev/null
+++ b/mozilla/lib/mailto/msgbg.cpp
@@ -0,0 +1,133 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "msg.h"
+#include "msgbg.h"
+#include "msgpane.h"
+#include "msgurlq.h"
+
+extern "C" {
+	extern int MK_OUT_OF_MEMORY;
+}
+
+msg_Background::msg_Background() 
+{
+}
+
+
+msg_Background::~msg_Background()
+{
+	if (m_pane) Interrupt();
+}
+
+
+int
+msg_Background::Begin(MSG_Pane* pane)
+{
+	XP_ASSERT(!m_pane);
+	if (m_pane) return -1;
+	char* url = XP_STRDUP("mailbox:?background");
+	if (!url) return MK_OUT_OF_MEMORY;
+	m_urlstruct = NET_CreateURLStruct(url, NET_NORMAL_RELOAD);
+	if (!m_urlstruct) {
+		XP_FREE(url);
+		return MK_OUT_OF_MEMORY;
+	}
+	XP_FREE(url);
+	m_urlstruct->internal_url = TRUE;
+	m_pane = pane;
+	msg_InterruptContext(pane->GetContext(), TRUE);
+	XP_ASSERT(pane->GetCurrentBackgroundJob() == NULL);
+	pane->SetCurrentBackgroundJob(this);
+	MSG_UrlQueue::AddUrlToPane(m_urlstruct, msg_Background::PreExit_s, pane);
+	return 0;
+}
+
+
+
+void
+msg_Background::Interrupt()
+{
+	XP_ASSERT(m_pane);
+	if (m_pane) {
+		msg_InterruptContext(m_pane->GetContext(), FALSE);
+		XP_ASSERT(m_pane == NULL);
+	}
+}
+
+
+msg_Background*
+msg_Background::FindBGObj(URL_Struct* urlstruct)
+{
+	XP_ASSERT(urlstruct && urlstruct->msg_pane);
+	if (!urlstruct || !urlstruct->msg_pane) return NULL;
+	msg_Background* result = urlstruct->msg_pane->GetCurrentBackgroundJob();
+	// OK, I'm truly evil, but I'm using this as an empty url that goes through
+	// netlib once. so result will be null...
+	XP_ASSERT(!result || result->m_pane == urlstruct->msg_pane);
+	return result;
+}
+
+
+int
+msg_Background::ProcessBackground(URL_Struct* urlstruct)
+{
+	msg_Background* obj = FindBGObj(urlstruct);
+	if (obj) {
+		return obj->DoSomeWork();
+	}
+	return MK_CONNECTED;
+}
+
+
+
+void
+msg_Background::PreExit_s(URL_Struct* urlstruct, int status,
+						  MWContext* context)
+{
+	msg_Background* obj = FindBGObj(urlstruct);
+	if (obj) {
+		obj->PreExit(urlstruct, status, context);
+	}
+}
+
+void
+msg_Background::PreExit(URL_Struct* /*urlstruct*/, int status,
+						MWContext*)
+{
+	XP_Bool deleteself = AllDone(status);
+	XP_ASSERT(m_pane);
+	if (m_pane) {
+		m_pane->SetCurrentBackgroundJob(NULL);
+		m_pane = NULL;
+	}
+	if (deleteself) delete this;
+}
+
+
+XP_Bool
+msg_Background::AllDone(int /*status*/)
+{
+	return FALSE;
+}
+
+XP_Bool
+msg_Background::IsRunning()
+{
+	return m_pane != NULL;
+}
diff --git a/mozilla/lib/mailto/msgbg.h b/mozilla/lib/mailto/msgbg.h
new file mode 100644
index 00000000000..2a9bfba0014
--- /dev/null
+++ b/mozilla/lib/mailto/msgbg.h
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgBg_H_
+#define _MsgBg_H_
+
+#include "msgzap.h"
+
+class MSG_Pane;
+
+class msg_Background : public MSG_ZapIt {
+public:
+    msg_Background();
+    virtual ~msg_Background();
+
+    /* Begin() kicks things off.  Sometime after making this call, calls will
+       be made to DoSomeWork().  This will interrupt any current background
+       operation or URL running on the given MSG_Pane. */
+    virtual int Begin(MSG_Pane* pane);
+
+
+    /* Interrupt() interrupts the running background operation.  Just does an
+       InterruptContext on the pane's context. */
+    virtual void Interrupt();
+
+    /* Whether we are currently doing our background operation. */
+    virtual XP_Bool IsRunning();
+
+
+	// This routine is called from netlib (via msgglue) to cause us to actually
+	// do something.
+	static int ProcessBackground(URL_Struct* urlstruct);
+
+protected:
+
+	static msg_Background* FindBGObj(URL_Struct* urlstruct);
+
+    static void PreExit_s(URL_Struct* urlstruct, int status,
+						  MWContext* context);
+    virtual void PreExit(URL_Struct* urlstruct, int status,
+						 MWContext* context);
+
+
+
+    /* The below are the only routines typically redefined by subclasses. */
+
+
+    /* DoSomeWork() keeps getting called.  If it returns
+       MK_WAITING_FOR_CONNECTION, that means it hasn't finished its stuff.  If
+       it returns MK_CONNECTED, that means it has successfully finished.  If it
+       returns a negative value, that means we failed and it's an error
+       condition. */
+    virtual int DoSomeWork() = 0;
+
+
+    /* AllDone() gets called when things are finished.  If the given status is
+       negative, then we were interrupted or had an error.  This is a good
+       place to kick off another background operation.  If it returns TRUE,
+	   then this background object will be destroyed. */
+    virtual XP_Bool AllDone(int status);
+
+	MSG_Pane* m_pane;
+	URL_Struct* m_urlstruct;
+
+};
+
+
+#endif /* _MsgBg_H_ */
diff --git a/mozilla/lib/mailto/msgcflds.cpp b/mozilla/lib/mailto/msgcflds.cpp
new file mode 100644
index 00000000000..51b14ebfdb4
--- /dev/null
+++ b/mozilla/lib/mailto/msgcflds.cpp
@@ -0,0 +1,382 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "rosetta.h"
+#include "msg.h"
+#include "errcode.h"
+
+#include "msgcflds.h"
+#include "prefapi.h"
+#include "ptrarray.h"
+
+extern "C" {
+    extern int MK_OUT_OF_MEMORY;
+}
+
+MSG_CompositionFields::MSG_CompositionFields()
+{
+	XP_Bool bReturnReceiptOn = FALSE;
+
+	PREF_GetBoolPref("mail.request.return_receipt_on", &bReturnReceiptOn);
+	PREF_GetIntPref("mail.request.return_receipt", &m_receiptType);
+	SetReturnReceipt (bReturnReceiptOn);
+}
+
+
+MSG_CompositionFields::MSG_CompositionFields(MSG_CompositionFields* c)
+{
+	int i;
+	for (i=0 ; i<sizeof(m_headers) / sizeof(char*) ; i++) {
+		if (c->m_headers[i]) {
+			m_headers[i] = XP_STRDUP(c->m_headers[i]);
+		}
+	}
+    if (c->m_body) {
+		m_body = XP_STRDUP(c->m_body);
+    }
+	for (i=0 ; i<c->m_numforward ; i++) {
+		AddForwardURL(c->m_forwardurl[i]);
+	}
+    for (i=0; i<sizeof(m_boolHeaders)/sizeof(XP_Bool) ; i++) {
+        m_boolHeaders[i] = c->m_boolHeaders[i];
+    }
+	m_receiptType = c->m_receiptType;
+}
+
+
+
+MSG_CompositionFields::~MSG_CompositionFields()
+{
+	int i;
+	for (i=0 ; i<sizeof(m_headers) / sizeof(char*) ; i++) {
+		FREEIF(m_headers[i]);
+    }
+    FREEIF(m_body);
+	for (i=0 ; i<m_numforward ; i++) {
+		delete [] m_forwardurl[i];
+	}
+	delete [] m_forwardurl;
+}
+
+
+int MSG_CompositionFields::SetNewsUrlHeader (const char *hostPort, XP_Bool xxx, const char *group)
+{
+	// Here's where we allow URLs in the newsgroups: header
+
+	int status = -1; 
+	if (hostPort && group) // must have a group
+	{
+		char *newsPostUrl = PR_smprintf ("%s://%s/", HG71654 "news", hostPort);
+		if (newsPostUrl)
+		{
+			SetHeader (MSG_NEWSPOSTURL_HEADER_MASK, newsPostUrl);
+			XP_FREE(newsPostUrl);
+			status = 0; // we succeeded, no need to keep looking at this header
+		}
+		else
+			status = MK_OUT_OF_MEMORY;
+	}
+
+	return status;
+}
+
+
+int MSG_CompositionFields::ParseNewsgroupsForUrls (const char *value)
+{
+	int status = 0;
+
+#ifdef MOZ_MAIL_NEWS
+	// Here we pull apart the comma-separated header value and look for news
+	// URLs. We'll use the URL to set the newspost URL to determine the host
+	msg_StringArray values (TRUE /*owns memory for strings*/);
+	values.ImportTokenList (value);
+	for (int i = 0; i < values.GetSize(); i++)
+	{
+		const char *singleValue = values.GetAt(i);
+		if (NEWS_TYPE_URL == NET_URL_Type (singleValue))
+		{
+			char *hostPort, *group, *id, *data;
+			XP_Bool xxx;
+			if (0 == NET_parse_news_url (value, &hostPort, &xxx, &group, &id, &data))
+			{
+				status = SetNewsUrlHeader (hostPort, xxx, group);
+				if (status == 0)
+				{
+					values.RemoveAt(i); // Remove the URL spec for this group
+					values.Add (group); // Add in the plain old group name
+				}
+				FREEIF (hostPort);
+				FREEIF (group);
+				FREEIF (id);
+				FREEIF (data);
+			}
+		}
+	}
+	char *newValue = values.ExportTokenList ();
+	if (newValue)
+	{
+		status = SetHeader (MSG_NEWSGROUPS_HEADER_MASK, newValue);
+		XP_FREE(newValue);
+	}
+#endif /* MOZ_MAIL_NEWS */
+	return status;
+}
+
+
+int
+MSG_CompositionFields::SetHeader(MSG_HEADER_SET header, const char* value)
+{
+    int status = 0;
+
+	// Since colon is not a legal character in a newsgroup name under son-of-1036
+	// we're assuming that such a header contains a URL, and we should parse it out
+	// to infer the news server.
+	if (value && MSG_NEWSGROUPS_HEADER_MASK == header && XP_STRCHR(value, ':'))
+		return ParseNewsgroupsForUrls (value);
+
+	int i = DecodeHeader(header);
+	if (i >= 0) 
+	{
+		char* old = m_headers[i]; // Done with careful paranoia, in case the
+								  // value given is the old value (or worse,
+								  // a substring of the old value, as does
+								  // happen here and there.)
+		if (value != old) 
+		{
+			if (value) 
+			{
+				m_headers[i] = XP_STRDUP(value);
+				if (!m_headers[i]) 
+				   status = MK_OUT_OF_MEMORY;
+			} 
+			else 
+				m_headers[i] = NULL;
+			FREEIF(old);
+		}
+	}
+
+	return status;
+}
+
+extern "C"const char* MSG_GetCompFieldsHeader(MSG_CompositionFields *fields,
+										   MSG_HEADER_SET header)
+{
+	return fields->GetHeader(header);
+}
+
+const char*
+MSG_CompositionFields::GetHeader(MSG_HEADER_SET header)
+{
+    int i = DecodeHeader(header);
+    if (i >= 0) {
+		return m_headers[i] ? m_headers[i] : "";
+    }
+    return NULL;
+}
+
+
+int 
+MSG_CompositionFields::SetBoolHeader(MSG_BOOL_HEADER_SET header, XP_Bool bValue)
+{
+	int status = 0;
+	XP_ASSERT ((int) header >= (int) MSG_RETURN_RECEIPT_BOOL_HEADER_MASK &&
+			   (int) header < (int) MSG_LAST_BOOL_HEADER_MASK);
+
+	if ( (int) header < (int) MSG_RETURN_RECEIPT_BOOL_HEADER_MASK ||
+		 (int) header >= (int) MSG_LAST_BOOL_HEADER_MASK )
+		 return -1;
+
+	m_boolHeaders[header] = bValue;
+	return status;
+}
+
+
+XP_Bool
+MSG_CompositionFields::GetBoolHeader(MSG_BOOL_HEADER_SET header)
+{
+	XP_ASSERT ((int) header >= (int) MSG_RETURN_RECEIPT_BOOL_HEADER_MASK &&
+			   (int) header < (int) MSG_LAST_BOOL_HEADER_MASK);
+
+	if ( (int) header < (int) MSG_RETURN_RECEIPT_BOOL_HEADER_MASK ||
+		 (int) header >= (int) MSG_LAST_BOOL_HEADER_MASK )
+		 return FALSE;
+
+	return m_boolHeaders[header];
+}
+
+
+int
+MSG_CompositionFields::SetBody(const char* value)
+{
+    FREEIF(m_body);
+    if (value) {
+		m_body = XP_STRDUP(value);
+		if (!m_body) return MK_OUT_OF_MEMORY;
+    }
+    return 0;
+}
+
+
+const char* 
+MSG_CompositionFields::GetBody()
+{
+    return m_body ? m_body : "";
+}
+
+
+int
+MSG_CompositionFields::AppendBody(const char* value)
+{
+    if (!value || !*value) return 0;
+    if (!m_body) {
+		return SetBody(value);
+    } else {
+		char* tmp = (char*) XP_ALLOC(XP_STRLEN(m_body) + XP_STRLEN(value) + 1);
+		if (tmp) {
+			XP_STRCPY(tmp, m_body);
+			XP_STRCAT(tmp, value);
+			XP_FREE(m_body);
+			m_body = tmp;
+		} else {
+			return MK_OUT_OF_MEMORY;
+		}
+    }
+    return 0;
+}
+
+    
+int
+MSG_CompositionFields::DecodeHeader(MSG_HEADER_SET header)
+{
+    int result;
+    switch(header) {
+    case MSG_FROM_HEADER_MASK:
+		result = 0;
+		break;
+    case MSG_REPLY_TO_HEADER_MASK:
+		result = 1;
+		break;
+    case MSG_TO_HEADER_MASK:
+		result = 2;
+		break;
+    case MSG_CC_HEADER_MASK:
+		result = 3;
+		break;
+    case MSG_BCC_HEADER_MASK:
+		result = 4;
+		break;
+    case MSG_FCC_HEADER_MASK:
+		result = 5;
+		break;
+    case MSG_NEWSGROUPS_HEADER_MASK:
+		result = 6;
+		break;
+    case MSG_FOLLOWUP_TO_HEADER_MASK:
+		result = 7;
+		break;
+    case MSG_SUBJECT_HEADER_MASK:
+		result = 8;
+		break;
+    case MSG_ATTACHMENTS_HEADER_MASK:
+		result = 9;
+		break;
+    case MSG_ORGANIZATION_HEADER_MASK:
+		result = 10;
+		break;
+    case MSG_REFERENCES_HEADER_MASK:
+		result = 11;
+		break;
+    case MSG_OTHERRANDOMHEADERS_HEADER_MASK:
+		result = 12;
+		break;
+    case MSG_NEWSPOSTURL_HEADER_MASK:
+		result = 13;
+		break;
+    case MSG_PRIORITY_HEADER_MASK:
+		result = 14;
+		break;
+	case MSG_NEWS_FCC_HEADER_MASK:
+		result = 15;
+		break;
+	case MSG_MESSAGE_ENCODING_HEADER_MASK:
+		result = 16;
+		break;
+	case MSG_CHARACTER_SET_HEADER_MASK:
+		result = 17;
+		break;
+	case MSG_MESSAGE_ID_HEADER_MASK:
+		result = 18;
+		break;
+	case MSG_NEWS_BCC_HEADER_MASK:
+		result = 19;
+		break;
+	case MSG_HTML_PART_HEADER_MASK:
+		result = 20;
+		break;
+    case MSG_DEFAULTBODY_HEADER_MASK:
+		result = 21;
+		break;
+	case MSG_X_TEMPLATE_HEADER_MASK:
+		result = 22;
+		break;
+    default:
+		XP_ASSERT(0);
+		result = -1;
+		break;
+    }
+    XP_ASSERT(result < sizeof(m_headers) / sizeof(char*));
+    return result;
+}
+
+int
+MSG_CompositionFields::AddForwardURL(const char* url)
+{
+	XP_ASSERT(url && *url);
+	if (!url || !*url) return -1;
+	if (m_numforward >= m_maxforward) {
+		m_maxforward += 10;
+		char** tmp = new char* [m_maxforward];
+		if (!tmp) return MK_OUT_OF_MEMORY;
+		for (int32 i=0 ; i<m_numforward ; i++) {
+			tmp[i] = m_forwardurl[i];
+		}
+		delete [] m_forwardurl;
+		m_forwardurl = tmp;
+	}
+	m_forwardurl[m_numforward] = new char[XP_STRLEN(url) + 1];
+	if (!m_forwardurl[m_numforward]) return MK_OUT_OF_MEMORY;
+	XP_STRCPY(m_forwardurl[m_numforward], url);
+	m_numforward++;
+	return 0;
+}
+
+int32
+MSG_CompositionFields::GetNumForwardURL()
+{
+	return m_numforward;
+}
+
+const char*
+MSG_CompositionFields::GetForwardURL(int32 which)
+{
+	XP_ASSERT(which >= 0 && which < m_numforward);
+	if (which >= 0 && which < m_numforward) {
+		return m_forwardurl[which];
+	}
+	return NULL;
+}
diff --git a/mozilla/lib/mailto/msgcflds.h b/mozilla/lib/mailto/msgcflds.h
new file mode 100644
index 00000000000..2161ba6ae24
--- /dev/null
+++ b/mozilla/lib/mailto/msgcflds.h
@@ -0,0 +1,288 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgCFlds_H_
+#define _MsgCFlds_H_
+
+#include "rosetta.h"
+#include "msgzap.h"
+
+
+// Note that all the "Get" methods never return NULL (except in case of serious
+// error, like an illegal parameter); rather, they return "" if things were set
+// to NULL.  This makes it real handy for the callers.
+
+class MSG_CompositionFields : public MSG_ZapIt {
+public:
+	MSG_CompositionFields();
+	MSG_CompositionFields(MSG_CompositionFields*); // Makes a copy.
+	virtual ~MSG_CompositionFields();
+
+	int SetHeader(MSG_HEADER_SET header, const char* value);
+	const char* GetHeader(MSG_HEADER_SET header);
+
+	int SetBoolHeader(MSG_BOOL_HEADER_SET header, XP_Bool bValue);
+	XP_Bool GetBoolHeader(MSG_BOOL_HEADER_SET header);
+
+	int SetBody(const char*);
+	const char* GetBody();
+
+	int AppendBody(const char*);
+
+	// When forwarding a bunch of messages, we can have a bunch of
+	// "forward url's" instead of an attachment.
+
+	int AddForwardURL(const char*);
+
+	int32 GetNumForwardURL();
+	const char* GetForwardURL(int32 which);
+
+	int32 GetReturnReceiptType() { return m_receiptType; };
+	void SetReturnReceiptType(int32 type) {m_receiptType = type;};
+
+
+	// Convenience routines...
+
+	int SetFrom(const char* value) {
+		return SetHeader(MSG_FROM_HEADER_MASK, value);
+	}
+	const char* GetFrom() {
+		return GetHeader(MSG_FROM_HEADER_MASK);
+	}
+
+	int SetReplyTo(const char* value) {
+		return SetHeader(MSG_REPLY_TO_HEADER_MASK, value);
+	}
+	const char* GetReplyTo() {
+		return GetHeader(MSG_REPLY_TO_HEADER_MASK);
+	}
+
+	int SetTo(const char* value) {
+		return SetHeader(MSG_TO_HEADER_MASK, value);
+	}
+	const char* GetTo() {
+		return GetHeader(MSG_TO_HEADER_MASK);
+	}
+
+	int SetCc(const char* value) {
+		return SetHeader(MSG_CC_HEADER_MASK, value);
+	}
+	const char* GetCc() {
+		return GetHeader(MSG_CC_HEADER_MASK);
+	}
+
+	int SetBcc(const char* value) {
+		return SetHeader(MSG_BCC_HEADER_MASK, value);
+	}
+	const char* GetBcc() {
+		return GetHeader(MSG_BCC_HEADER_MASK);
+	}
+
+	int SetFcc(const char* value) {
+		return SetHeader(MSG_FCC_HEADER_MASK, value);
+	}
+	const char* GetFcc() {
+		return GetHeader(MSG_FCC_HEADER_MASK);
+	}
+
+	int SetNewsFcc(const char* value) {
+		return SetHeader(MSG_NEWS_FCC_HEADER_MASK, value);
+	}
+	const char* GetNewsFcc() {
+		return GetHeader(MSG_NEWS_FCC_HEADER_MASK);
+	}
+	int SetNewsBcc(const char* value) {
+		return SetHeader(MSG_NEWS_BCC_HEADER_MASK, value);
+	}
+	const char* GetNewsBcc() {
+		return GetHeader(MSG_NEWS_BCC_HEADER_MASK);
+	}
+
+	int SetNewsgroups(const char* value) {
+		return SetHeader(MSG_NEWSGROUPS_HEADER_MASK, value);
+	}
+	const char* GetNewsgroups() {
+		return GetHeader(MSG_NEWSGROUPS_HEADER_MASK);
+	}
+
+	int SetFollowupTo(const char* value) {
+		return SetHeader(MSG_FOLLOWUP_TO_HEADER_MASK, value);
+	}
+	const char* GetFollowupTo() {
+		return GetHeader(MSG_FOLLOWUP_TO_HEADER_MASK);
+	}
+
+	int SetSubject(const char* value) {
+		return SetHeader(MSG_SUBJECT_HEADER_MASK, value);
+	}
+	const char* GetSubject() {
+		return GetHeader(MSG_SUBJECT_HEADER_MASK);
+	}
+
+	int SetAttachments(const char* value) {
+		return SetHeader(MSG_ATTACHMENTS_HEADER_MASK, value);
+	}
+	const char* GetAttachments() {
+		return GetHeader(MSG_ATTACHMENTS_HEADER_MASK);
+	}
+
+	int SetOrganization(const char* value) {
+		return SetHeader(MSG_ORGANIZATION_HEADER_MASK, value);
+	}
+	const char* GetOrganization() {
+		return GetHeader(MSG_ORGANIZATION_HEADER_MASK);
+	}
+
+	int SetReferences(const char* value) {
+		return SetHeader(MSG_REFERENCES_HEADER_MASK, value);
+	}
+	const char* GetReferences() {
+		return GetHeader(MSG_REFERENCES_HEADER_MASK);
+	}
+
+	int SetOtherRandomHeaders(const char* value) {
+		return SetHeader(MSG_OTHERRANDOMHEADERS_HEADER_MASK, value);
+	}
+	const char* GetOtherRandomHeaders() {
+		return GetHeader(MSG_OTHERRANDOMHEADERS_HEADER_MASK);
+	}
+
+	int SetNewspostUrl(const char* value) {
+		return SetHeader(MSG_NEWSPOSTURL_HEADER_MASK, value);
+	}
+	const char* GetNewspostUrl() {
+		return GetHeader(MSG_NEWSPOSTURL_HEADER_MASK);
+	}
+
+	int SetDefaultBody(const char* value) {
+		return SetHeader(MSG_DEFAULTBODY_HEADER_MASK, value);
+	}
+	const char* GetDefaultBody() {
+		return GetHeader(MSG_DEFAULTBODY_HEADER_MASK);
+	}
+
+    int SetPriority(const char* value) {
+	    return SetHeader(MSG_PRIORITY_HEADER_MASK, value);
+    }
+
+    const char* GetPriority() {
+	    return GetHeader(MSG_PRIORITY_HEADER_MASK);
+    }
+
+	int SetMessageEncoding(const char*  value) {
+		return SetHeader(MSG_MESSAGE_ENCODING_HEADER_MASK, value);
+	}
+
+	const char* GetMessageEncoding() {
+		return GetHeader(MSG_MESSAGE_ENCODING_HEADER_MASK);
+	}
+
+	int SetCharacterSet(const char*  value) {
+		return SetHeader (MSG_CHARACTER_SET_HEADER_MASK, value);
+	}
+
+	const char* GetCharacterSet() {
+		return GetHeader(MSG_CHARACTER_SET_HEADER_MASK);
+	}
+
+	int SetMessageId(const char* value) {
+		return SetHeader (MSG_MESSAGE_ID_HEADER_MASK, value);
+	}
+
+	const char* GetMessageId() {
+		return GetHeader(MSG_MESSAGE_ID_HEADER_MASK);
+	}
+
+	int SetHTMLPart(const char* value) {
+		return SetHeader(MSG_HTML_PART_HEADER_MASK, value);
+	}
+
+	const char* GetHTMLPart() {
+		return GetHeader(MSG_HTML_PART_HEADER_MASK);
+	}
+
+	int SetTemplateName(const char* value) {
+		return SetHeader(MSG_X_TEMPLATE_HEADER_MASK, value);
+	}
+
+	const char* GetTemplateName() {
+		return GetHeader(MSG_X_TEMPLATE_HEADER_MASK);
+	}
+
+	// Bool headers
+
+	int SetReturnReceipt(XP_Bool value) {
+		return SetBoolHeader(MSG_RETURN_RECEIPT_BOOL_HEADER_MASK, value);
+	}
+
+	XP_Bool GetReturnReceipt() {
+		return GetBoolHeader(MSG_RETURN_RECEIPT_BOOL_HEADER_MASK);
+	}
+
+HG87266
+
+	int SetSigned(XP_Bool value) {
+		return SetBoolHeader(MSG_SIGNED_BOOL_HEADER_MASK, value);
+	}
+
+	XP_Bool GetSigned() {
+		return GetBoolHeader(MSG_SIGNED_BOOL_HEADER_MASK);
+	}
+
+	int SetAttachVCard(XP_Bool value) {
+		return SetBoolHeader(MSG_ATTACH_VCARD_BOOL_HEADER_MASK, value);
+	}
+
+	XP_Bool GetAttachVCard() {
+		return GetBoolHeader(MSG_ATTACH_VCARD_BOOL_HEADER_MASK);
+	}
+
+
+	void SetOwner(MSG_Pane *pane) {
+		m_owner = pane;
+	}
+
+	MSG_Pane * GetOwner() { return m_owner; }
+
+
+	void SetForcePlainText(XP_Bool value) {m_force_plain_text = value;}
+	XP_Bool GetForcePlainText() {return m_force_plain_text;}
+	void SetUseMultipartAlternative(XP_Bool value) {m_multipart_alt = value;}
+	XP_Bool GetUseMultipartAlternative() {return m_multipart_alt;}
+
+protected:
+	int DecodeHeader(MSG_HEADER_SET header);
+
+	// These methods allow news URLs in the newsgroups header
+	int SetNewsUrlHeader (const char *hostPort, XP_Bool xxx, const char *group);
+	int ParseNewsgroupsForUrls (const char *value);
+
+	MSG_Pane *m_owner;
+	char* m_headers[32];
+	char* m_body;
+	char** m_forwardurl;
+	int32 m_numforward;
+	int32 m_maxforward;
+	XP_Bool m_boolHeaders[MSG_LAST_BOOL_HEADER_MASK];
+	XP_Bool m_force_plain_text;
+	XP_Bool m_multipart_alt;
+	int32 m_receiptType; /* 0:None 1:DSN 2:MDN 3:BOTH */
+};
+
+
+#endif /* _MsgCFlds_H_ */
diff --git a/mozilla/lib/mailto/msgcpane.cpp b/mozilla/lib/mailto/msgcpane.cpp
new file mode 100644
index 00000000000..b98802d6f42
--- /dev/null
+++ b/mozilla/lib/mailto/msgcpane.cpp
@@ -0,0 +1,3312 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "rosetta.h"
+#include "msg.h"
+#include "errcode.h"
+#include "error.h"
+
+#include "mime.h"
+#include "shist.h"
+#include "xlate.h"
+#include "libi18n.h"
+#include "xpgetstr.h"
+
+#include "msgcpane.h"
+#include "msgprefs.h"
+#include "msgcflds.h"
+#include "dirprefs.h"
+#include "msgurlq.h"
+
+#include "edt.h" // to invoke save on the html compose pane
+#include "mhtmlstm.h"
+
+#include "prefapi.h"
+#include "htmldlgs.h"
+#include "xp_qsort.h"
+#include "intl_csi.h"
+
+extern "C"
+{
+extern int MK_MSG_MSG_COMPOSITION;
+
+extern int MK_COMMUNICATIONS_ERROR;
+extern int MK_OUT_OF_MEMORY;
+
+extern int MK_MSG_EMPTY_MESSAGE;
+extern int MK_MSG_DOUBLE_INCLUDE;
+
+extern int MK_MSG_WHY_QUEUE_SPECIAL;
+extern int MK_MSG_WHY_QUEUE_SPECIAL_OLD;
+extern int MK_MSG_NOT_AS_SENT_FOLDER;
+
+extern int MK_MSG_MISSING_SUBJECT;
+
+HG65256
+
+extern int MK_MSG_SEND;
+extern int MK_MSG_SEND_LATER;
+extern int MK_MSG_ATTACH_ETC;
+extern int MK_MSG_QUOTE_MESSAGE;
+extern int MK_MSG_FROM;
+extern int MK_MSG_REPLY_TO;
+extern int MK_MSG_MAIL_TO;
+extern int MK_MSG_MAIL_CC;
+extern int MK_MSG_MAIL_BCC;
+extern int MK_MSG_FILE_CC;
+extern int MK_MSG_POST_TO;
+extern int MK_MSG_FOLLOWUPS_TO;
+extern int MK_MSG_SUBJECT;
+extern int MK_MSG_ATTACHMENT;
+extern int MK_MSG_ATTACH_AS_TEXT;
+extern int MK_MSG_SAVE_DRAFT;
+extern int MK_ADDR_BOOK_CARD;
+
+extern int MK_MSG_ASK_HTML_MAIL;
+extern int MK_MSG_ASK_HTML_MAIL_TITLE;
+extern int MK_MSG_HTML_RECIPIENTS;
+extern int MK_MSG_HTML_RECIPIENTS_TITLE;
+extern int MK_MSG_EVERYONE;
+
+extern int MK_MSG_ENTER_NAME_FOR_TEMPLATE;
+
+#include "xp_help.h"
+}
+
+
+
+HG33234
+
+#define ALL_HEADERS (MSG_FROM_HEADER_MASK |			\
+					 MSG_REPLY_TO_HEADER_MASK |		\
+					 MSG_TO_HEADER_MASK |			\
+					 MSG_CC_HEADER_MASK |			\
+					 MSG_BCC_HEADER_MASK |			\
+					 MSG_FCC_HEADER_MASK |			\
+					 MSG_NEWSGROUPS_HEADER_MASK |	\
+					 MSG_FOLLOWUP_TO_HEADER_MASK |	\
+					 MSG_SUBJECT_HEADER_MASK |		\
+					 MSG_ATTACHMENTS_HEADER_MASK)
+
+
+enum RecipientType {
+	Address = 1, Domain = 2, Newsgroup = 3, GroupHierarchy = 4
+};
+
+class RecipientEntry : public MSG_ZapIt {
+public:
+	RecipientEntry(const char* name, const char* description,
+				   RecipientType type, XP_Bool htmlok);
+	~RecipientEntry();
+
+	char* GetName() {return m_name;}
+	char* GetDescription() {return m_description;}
+	RecipientType GetType() {return m_type;}
+	XP_Bool GetHTMLOk() {return m_htmlok;}
+	XP_Bool GetNewHTMLOk() {return m_newhtmlok;}
+	void SetNewOK(XP_Bool value);
+	XP_Bool GetTouched() {return m_touched;}
+
+protected:
+	char* m_name;
+	char* m_description;
+	RecipientType m_type;
+	XP_Bool m_htmlok;
+	XP_Bool m_newhtmlok;
+	XP_Bool m_touched;
+};
+
+
+RecipientEntry::RecipientEntry(const char* name, const char* description,
+							   RecipientType type, XP_Bool htmlok)
+{
+	m_name = XP_STRDUP(name);
+	m_description = XP_STRDUP(description);
+	if (!m_description) {
+		FREEIF(m_name);			// Checking for name being NULL is the hack
+								// used to see if we're out of memory.
+	}
+	m_type = type;
+	m_htmlok = htmlok;
+}
+
+RecipientEntry::~RecipientEntry()
+{
+	FREEIF(m_name);
+	FREEIF(m_description);
+}
+
+void
+RecipientEntry::SetNewOK(XP_Bool value)
+{
+	XP_ASSERT(!m_touched);
+	m_touched = TRUE;
+	m_newhtmlok = value;
+}
+
+
+
+class MSG_HTMLRecipients : public MSG_ZapIt {
+public:
+	MSG_HTMLRecipients();
+	~MSG_HTMLRecipients();
+
+	int AddOne(const char* name, const char* description,
+			   RecipientType type, XP_Bool htmlok);
+	MSG_RecipientList* GetList(XP_Bool htmlok);
+
+	int SetNewList(int32* notoklist, int32* oklist);
+
+	char** GetChangedList(RecipientType type, XP_Bool htmlok);
+	void FreeChangedList(char** list);
+	int GetNum() {return m_num;}
+
+protected:
+	RecipientEntry** m_list;
+	int32 m_num;
+	int32 m_max;
+	MSG_RecipientList* m_generatedList[2];
+};
+
+MSG_HTMLRecipients::MSG_HTMLRecipients() {
+}
+
+MSG_HTMLRecipients::~MSG_HTMLRecipients() {
+	delete m_generatedList[0];
+	delete m_generatedList[1];
+	for (int32 i=0 ; i<m_num ; i++) {
+		delete m_list[i];
+	}
+	delete [] m_list;
+}
+
+int
+MSG_HTMLRecipients::AddOne(const char* name, const char* description,
+						   RecipientType type, XP_Bool htmlok)
+{
+	int32 i;
+	for (i=0 ; i<m_num ; i++) {
+		if (m_list[i]->GetType() == type &&
+			XP_STRCMP(m_list[i]->GetName(), name) == 0) return 0;
+	}
+	if (m_num >= m_max) {
+		RecipientEntry** tmp = new RecipientEntry* [m_max + 10];
+		if (!tmp) return MK_OUT_OF_MEMORY;
+		m_max += 10;
+		for (i=0 ; i<m_num ; i++) {
+			tmp[i] = m_list[i];
+		}
+		delete [] m_list;
+		m_list = tmp;
+	}
+	m_list[m_num] = new RecipientEntry(name, description, type, htmlok);
+	if (!m_list[m_num]) return MK_OUT_OF_MEMORY;
+	if (!m_list[m_num]->GetName()) {
+		delete m_list[m_num];
+		return MK_OUT_OF_MEMORY;
+	}
+	m_num++;
+	return 0;
+}
+
+
+MSG_RecipientList*
+MSG_HTMLRecipients::GetList(XP_Bool htmlok)
+{
+	int32 i, j;
+	if (m_generatedList[0] == NULL) {
+		// Sort the entries in the list.  Within a given type, we want to
+		// keep things in the order they were generated, but they need to
+		// be grouped by type.  So, it's bubble-sort time.  Whee...
+		for (i=1 ; i<m_num ; i++) {
+			for (j = i;
+				 j > 0 && m_list[j]->GetType() < m_list[j-1]->GetType();
+				 j--) {
+				RecipientEntry* tmp = m_list[j];
+				m_list[j] = m_list[j-1];
+				m_list[j-1] = tmp;
+			}
+		}
+		
+		m_generatedList[0] = new MSG_RecipientList [m_num + 1];
+		if (!m_generatedList[0]) return NULL;
+		m_generatedList[1] = new MSG_RecipientList [m_num + 1];
+		if (!m_generatedList[1]) {
+			delete [] m_generatedList[0];
+			return NULL;
+		}
+		int32 cur[2];
+		cur[0] = cur[1] = 0;
+		for (i=0 ; i<m_num ; i++) {
+			int w = int(m_list[i]->GetHTMLOk());
+			m_generatedList[w][cur[w]].name = m_list[i]->GetDescription();
+			m_generatedList[w][cur[w]].value = i;
+			(cur[w])++;
+		}
+		for (i=0 ; i<2 ; i++) {
+			m_generatedList[i][cur[i]].name = NULL;
+			m_generatedList[i][cur[i]].value = -1;
+		}
+	}
+	return m_generatedList[int(htmlok)];
+}
+
+
+int
+MSG_HTMLRecipients::SetNewList(int32* notoklist, int32* oklist)
+{
+	int32 i;
+#ifdef DEBUG
+	for (i=0 ; i<m_num ; i++) {
+		XP_ASSERT(!m_list[i]->GetTouched());
+	}
+#endif
+	for (int w=0 ; w<2 ; w++) {
+		XP_Bool ok = (w == 1);
+		int32* list = ok ? oklist : notoklist;
+		XP_ASSERT(list);
+		if (!list) continue;
+		for ( ; *list >= 0 ; list++) {
+			XP_ASSERT(*list < m_num);
+			if (*list >= m_num) break;
+			m_list[*list]->SetNewOK(ok);
+		}
+	}
+	int status = 0;
+	for (i=0 ; i<m_num ; i++) {
+		XP_ASSERT(m_list[i]->GetTouched());
+		if (!m_list[i]->GetTouched()) {
+			status = -1;
+		}
+	}
+	return status;
+}
+
+
+char**
+MSG_HTMLRecipients::GetChangedList(RecipientType type, XP_Bool htmlok)
+{
+	char** result = new char * [m_num + 1];
+	if (!result) return NULL;
+	char** tmp = result;
+	for (int32 i=0 ; i<m_num ; i++) {
+		if (m_list[i]->GetType() == type &&
+			  m_list[i]->GetNewHTMLOk() == htmlok &&
+			  m_list[i]->GetHTMLOk() != htmlok) {
+			*tmp = m_list[i]->GetName();
+			tmp++;
+		}
+	}
+	*tmp = NULL;
+	return result;
+}
+
+
+void
+MSG_HTMLRecipients::FreeChangedList(char** list)
+{
+	delete [] list;
+}
+
+
+static void msg_free_attachment_list(struct MSG_AttachmentData *list);
+
+static void
+msg_delete_attached_files(struct MSG_AttachedFile *attachments)
+{
+	struct MSG_AttachedFile *tmp;
+	if (!attachments) return;
+	for (tmp = attachments; tmp->orig_url; tmp++) {
+		FREEIF(tmp->orig_url);
+		FREEIF(tmp->type);
+		FREEIF(tmp->real_name);
+		FREEIF(tmp->encoding);
+		FREEIF(tmp->description);
+		FREEIF(tmp->x_mac_type);
+		FREEIF(tmp->x_mac_creator);
+		if (tmp->file_name) {
+			XP_FileRemove(tmp->file_name, xpFileToPost);
+			XP_FREE(tmp->file_name);
+		}
+	}
+	XP_FREEIF(attachments);
+}
+
+
+MSG_CompositionPane::MSG_CompositionPane(MWContext* context,
+										 MWContext* old_context,
+										 MSG_Prefs* prefs,
+										 MSG_CompositionFields* fields,
+										 MSG_Master* master)
+: MSG_Pane(context, master) 
+{
+	m_prefs = prefs;
+	m_htmlaction = MSG_HTMLAskUser;
+	Initialize(old_context, fields);
+}
+
+
+MSG_CompositionPane::MSG_CompositionPane(MWContext* context,
+										 MSG_Prefs* prefs,
+										 MSG_Master* master)
+: MSG_Pane(context, master)
+{
+	m_prefs = prefs;
+}
+
+int
+MSG_CompositionPane::Initialize(MWContext* old_context,
+								MSG_CompositionFields* fields)
+{
+	m_print = new PrintSetup;
+	HG22658
+								// ###tw   Should do something if this failed!
+
+	InitializeHeaders(old_context, fields);
+	m_visible_headers = GetInterestingHeaders();
+	m_deliver_mode = MSG_DeliverNow;
+	m_haveAttachedVcard = FALSE;
+
+	m_fields->SetForcePlainText(FALSE);	// Coming into us, this field meant
+										// "bring up the editor in plaintext
+										// mode".  Well, that's already been
+										// done at this point.  Now, we want
+										// it to mean "convert this message
+										// to plaintext on send".  Which we
+										// do only if DetermineHTMLAction()
+										// tells us to.
+
+	return 0;
+}
+
+
+
+MSG_CompositionPane::~MSG_CompositionPane() {
+	// Don't interrupt if there's nothing to interrupt because we might lose
+	// mocha messages.
+	if (NET_AreThereActiveConnectionsForWindow(m_context))
+		msg_InterruptContext (m_context, FALSE);
+	if (m_textContext != NULL) {
+		msg_InterruptContext(m_textContext, TRUE);
+	}
+
+	msg_delete_attached_files (m_attachedFiles);
+
+	FREEIF(m_defaultUrl);
+	FREEIF(m_attachmentString);
+
+	msg_free_attachment_list(m_attachData);
+
+	delete m_print;
+	m_print = NULL;
+
+	HG28266
+
+	if (m_context) FE_DestroyMailCompositionContext(m_context);
+	m_context = NULL;
+
+	delete m_fields;
+	m_fields = NULL;
+	delete m_initfields;
+	m_initfields = NULL;
+	delete m_htmlrecip;
+	m_htmlrecip = NULL;
+
+	FREEIF(m_quotedText);
+	FREEIF(m_messageId);
+}
+
+
+MSG_PaneType
+MSG_CompositionPane::GetPaneType() {
+	return MSG_COMPOSITIONPANE;
+}
+
+
+void MSG_CompositionPane::NotifyPrefsChange(NotifyCode) {
+	// ###tw  Write me!
+}
+
+
+HG02070
+
+
+char*
+MSG_CompositionPane::FigureBcc(XP_Bool newsBcc)
+{
+	char* result = NULL;
+	FREEIF(result);
+	const char* tmp =
+		GetPrefs()->GetDefaultHeaderContents(
+			newsBcc ? MSG_NEWS_BCC_HEADER_MASK : MSG_BCC_HEADER_MASK);
+	if (!GetPrefs()->GetDefaultBccSelf(newsBcc)) {
+		result = XP_STRDUP(tmp ? tmp : "");
+	} else if (!tmp || !*tmp) {
+		result = XP_STRDUP(FE_UsersMailAddress());
+	} else {
+		result = PR_smprintf("%s, %s", FE_UsersMailAddress(), tmp);
+	}
+	return result;
+}
+
+
+MsgERR
+MSG_CompositionPane::GetCommandStatus(MSG_CommandType command,
+										 const MSG_ViewIndex* indices,
+										 int32 numindices,
+						   XP_Bool *selectable_pP,
+						   MSG_COMMAND_CHECK_STATE *selected_pP,
+						   const char **display_stringP,
+						   XP_Bool *plural_pP)
+{
+	const char *display_string = 0;
+	XP_Bool plural_p = FALSE;
+	// N.B. default is TRUE, so you don't need to set it in each case
+	XP_Bool selectable_p = TRUE;	
+	XP_Bool selected_p = FALSE;
+	XP_Bool selected_used_p = FALSE;
+
+	switch (command)
+	{
+	case MSG_AttachAsText:
+		// the WinFE uses this for lots of update, so pretend we handle it.
+		display_string = XP_GetString(MK_MSG_ATTACH_AS_TEXT);
+		break;
+	case MSG_SendMessage:
+		display_string = XP_GetString(MK_MSG_SEND);
+        if (m_attachmentInProgress)
+            selectable_p = FALSE;
+		break;
+	case MSG_SendMessageLater:
+		display_string = XP_GetString(MK_MSG_SEND_LATER);
+        if (m_attachmentInProgress)
+            selectable_p = FALSE;
+		break;
+	case MSG_SaveDraft:
+	case MSG_SaveDraftThenClose:
+	case MSG_SaveTemplate:
+	    display_string = XP_GetString(MK_MSG_SAVE_DRAFT);
+        if (m_attachmentInProgress)
+            selectable_p = FALSE;
+		break;
+	case MSG_Attach:
+		display_string = XP_GetString(MK_MSG_ATTACH_ETC);
+		break;
+
+	case MSG_ShowFrom:
+		display_string = XP_GetString(MK_MSG_FROM);
+		selected_p = ShowingCompositionHeader(MSG_FROM_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowReplyTo:
+		display_string = XP_GetString(MK_MSG_REPLY_TO);
+		selected_p = ShowingCompositionHeader(MSG_REPLY_TO_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowTo:
+		display_string = XP_GetString(MK_MSG_MAIL_TO);
+		selected_p = ShowingCompositionHeader(MSG_TO_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowCC:
+		display_string = XP_GetString(MK_MSG_MAIL_CC);
+		selected_p = ShowingCompositionHeader(MSG_CC_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowBCC:
+		display_string = XP_GetString(MK_MSG_MAIL_BCC);
+		selected_p = ShowingCompositionHeader(MSG_BCC_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowFCC:
+		display_string = XP_GetString(MK_MSG_FILE_CC);
+		selected_p = ShowingCompositionHeader(MSG_FCC_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowPostTo:
+		display_string = XP_GetString(MK_MSG_POST_TO);
+		selected_p = ShowingCompositionHeader(MSG_NEWSGROUPS_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowFollowupTo:
+		display_string = XP_GetString(MK_MSG_FOLLOWUPS_TO);
+		selected_p = ShowingCompositionHeader(MSG_FOLLOWUP_TO_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowSubject:
+		display_string = XP_GetString(MK_MSG_SUBJECT);
+		selected_p = ShowingCompositionHeader(MSG_SUBJECT_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	case MSG_ShowAttachments:
+		display_string = XP_GetString(MK_MSG_ATTACHMENT);
+		selected_p = ShowingCompositionHeader(MSG_ATTACHMENTS_HEADER_MASK);
+		selected_used_p = TRUE;
+		break;
+	default:
+		selectable_p = FALSE;
+		return MSG_Pane::GetCommandStatus(command, indices, numindices,
+			selectable_pP, selected_pP, display_stringP, plural_pP);
+	}
+	if (selectable_pP)
+		*selectable_pP = selectable_p;
+	if (selected_pP)
+	{
+		if (selected_used_p)
+		{
+			if (selected_p)
+				*selected_pP = MSG_Checked;
+			else
+				*selected_pP = MSG_Unchecked;
+		}
+		else
+		{
+			*selected_pP = MSG_NotUsed;
+		}
+	}
+	if (display_stringP)
+		*display_stringP = display_string;
+	if (plural_pP)
+		*plural_pP = plural_p;
+
+	return 0;
+}
+
+					 
+MsgERR
+MSG_CompositionPane::DoCommand(MSG_CommandType command, MSG_ViewIndex* indices,
+							   int32 numindices)
+{
+	MsgERR status = 0;
+	InterruptContext(FALSE);
+	switch (command) {
+	case MSG_SendMessage:
+		status = SendMessageNow();	/* ###tw Error-return-type mismatch! */
+		break;
+	case MSG_SendMessageLater:
+		status = QueueMessageForLater();/* ###tw Error-return-type mismatch! */
+		break;
+    case MSG_SaveDraft:
+	case MSG_SaveDraftThenClose:
+		if (command == MSG_SaveDraftThenClose)
+			m_closeAfterSave = TRUE;
+		status = SaveMessageAsDraft(); /* ### Error-return-type mismatch! */
+		break;
+	case MSG_SaveTemplate:
+		status = SaveMessageAsTemplate();
+		break;
+	case MSG_ShowPostTo:		// how to do this?
+		ToggleCompositionHeader(MSG_NEWSGROUPS_HEADER_MASK);
+		break;
+	HG82762
+	case MSG_ShowFrom:
+		ToggleCompositionHeader(MSG_FROM_HEADER_MASK);
+		break;
+	case MSG_ShowReplyTo:
+		ToggleCompositionHeader(MSG_REPLY_TO_HEADER_MASK);
+		break;
+	case MSG_ShowTo:
+		ToggleCompositionHeader(MSG_TO_HEADER_MASK);
+		break;
+	case MSG_ShowCC:
+		ToggleCompositionHeader(MSG_CC_HEADER_MASK);
+		break;
+	case MSG_ShowBCC:
+		ToggleCompositionHeader(MSG_BCC_HEADER_MASK);
+		break;
+	case MSG_ShowFCC:
+		ToggleCompositionHeader(MSG_FCC_HEADER_MASK);
+		break;
+	case MSG_ShowFollowupTo:
+		ToggleCompositionHeader(MSG_FOLLOWUP_TO_HEADER_MASK);
+		break;
+	case MSG_ShowSubject:
+		ToggleCompositionHeader(MSG_SUBJECT_HEADER_MASK);
+		break;
+	case MSG_ShowAttachments:
+		ToggleCompositionHeader(MSG_ATTACHMENTS_HEADER_MASK);
+		break;
+	default:
+		status = MSG_Pane::DoCommand(command, indices, numindices);
+		break;
+	}
+	return status;
+}
+
+extern "C" void FE_MsgShowHeaders(MSG_Pane *pPane, MSG_HEADER_SET mhsHeaders);
+
+void MSG_CompositionPane::ToggleCompositionHeader(uint32 header)
+{
+  if (m_visible_headers & header) {
+	m_visible_headers &= ~header;
+  } else {
+	m_visible_headers |= header;
+  }
+  FE_MsgShowHeaders(this, m_visible_headers);
+}
+
+XP_Bool 
+MSG_CompositionPane::ShowingAllCompositionHeaders()
+{
+  return m_visible_headers == ALL_HEADERS;
+}
+
+XP_Bool 
+MSG_CompositionPane::ShowingCompositionHeader(uint32 mask)
+{
+  return (m_visible_headers & mask) == mask;
+}
+
+
+int
+MSG_CompositionPane::SetCallbacks(MSG_CompositionPaneCallbacks* callbacks,
+								  void* closure)
+{
+	m_callbacks = *callbacks;
+	m_callbackclosure = closure;
+	return 0;
+}
+
+
+void
+MSG_CompositionPane::InitializeHeaders(MWContext* old_context,
+									   MSG_CompositionFields* fields)
+{
+	XP_ASSERT(m_fields == NULL);
+	XP_ASSERT(m_initfields == NULL);
+
+	const char *real_addr = FE_UsersMailAddress ();
+	char *real_return_address;
+	const char* sig;
+	XP_Bool forward_quoted;
+	forward_quoted = FALSE;
+
+	m_fields = new MSG_CompositionFields(fields);
+								// ###tw  Should check for failure!
+
+	/* hack for forward quoted.  Checks the attachment field for a cookie
+	   string indicating that this is a forward quoted operation.  If a cookie
+	   is found, the attachment string is slid back down over the cookie.  This
+	   will put the original string back in tact. */
+
+	const char* attachment = m_fields->GetAttachments();
+
+	if (attachment) {
+		if (!XP_STRNCMP(attachment, MSG_FORWARD_COOKIE,
+						strlen(MSG_FORWARD_COOKIE))) {
+			attachment += XP_STRLEN(MSG_FORWARD_COOKIE);
+			forward_quoted = TRUE;      /* set forward with quote flag */
+			m_fields->SetAttachments(attachment);
+			attachment = m_fields->GetAttachments();
+		}
+	}
+
+	m_status = -1;
+
+	if (MISC_ValidateReturnAddress(old_context, real_addr) < 0) {
+		return;
+	}
+
+	real_return_address = MIME_MakeFromField();
+
+	XP_ASSERT (m_context->type == MWContextMessageComposition);
+	XP_ASSERT (XP_FindContextOfType(0, MWContextMessageComposition));
+	XP_ASSERT (!m_context->msg_cframe);
+
+	int32 count = m_fields->GetNumForwardURL();
+	if (count > 0) {
+		// if forwarding one or more messages
+		XP_ASSERT(*attachment == '\0');
+		MSG_AttachmentData *alist = (struct MSG_AttachmentData *)
+			XP_ALLOC((count + 1) * sizeof(MSG_AttachmentData));
+		if (alist) {
+			XP_MEMSET(alist, 0, (count + 1) * sizeof(*alist));
+			for (count--; count >= 0; count--) {
+				alist[count].url = (char*) m_fields->GetForwardURL(count);
+				alist[count].real_name = (char*) m_fields->GetForwardURL(count);
+			}
+			SetAttachmentList(alist);
+			XP_FREE(alist);
+		}
+	} else if (*attachment) {
+		// forwarding a single url
+		// typically a web page
+		MSG_AttachmentData *alist;
+		count = 1;
+		alist = (struct MSG_AttachmentData *)
+			XP_ALLOC((count + 1) * sizeof(MSG_AttachmentData));
+		if (alist) {
+			XP_MEMSET(alist, 0, (count + 1) * sizeof(*alist));
+			alist[0].url = (char *)attachment;
+			alist[0].real_name = XP_STRDUP ((char *)attachment);
+			SetAttachmentList(alist);
+		}
+	}	// else if (*attachment)
+
+	if (*attachment) {
+		if (*attachment != '(') {
+			m_defaultUrl = XP_STRDUP(attachment);
+		}
+	}
+	else if (old_context) {
+		History_entry *h = SHIST_GetCurrent(&old_context->hist);
+		if (h && h->address) {
+			m_defaultUrl = XP_STRDUP(h->address);
+		}
+	}
+
+	if (!*m_fields->GetFrom()) {
+		m_fields->SetFrom(real_return_address);
+	}
+
+	/* Guess what kind of reply this is based on the headers we passed in.
+	 */
+
+	const char* newsgroups = m_fields->GetNewsgroups();
+	const char* to = m_fields->GetTo();
+	const char* cc = m_fields->GetCc();
+	const char* references = m_fields->GetReferences();
+
+	if (count > 0 || *attachment) {
+		/* if an attachment exists and the forward_quoted flag is set, this
+		   is a forward quoted operation. */
+		if (forward_quoted) {
+			m_replyType = MSG_ForwardMessageQuoted;
+			/* clear out the attachment list for forward quoted messages. */
+			SetAttachmentList(NULL);
+			m_pendingAttachmentsCount = 0;
+		} else {
+			m_replyType = MSG_ForwardMessageAttachment;
+		}
+	} else if (*references && *newsgroups && (*to || *cc)) {
+		m_replyType = MSG_PostAndMailReply;
+	} else if (*references && *newsgroups) {
+		m_replyType = MSG_PostReply;
+	} else if (*references && *cc) {
+		m_replyType = MSG_ReplyToAll;
+	} else if (*references && *to) {
+		m_replyType = MSG_ReplyToSender;
+	} else if (*newsgroups) {
+		m_replyType = MSG_PostNew;
+	} else {
+		m_replyType = MSG_MailNew;
+	}
+
+
+HG00729
+
+
+	if (!*m_fields->GetOrganization()) {
+		m_fields->SetOrganization(FE_UsersOrganization());
+	}
+
+	if (!*m_fields->GetReplyTo()) {
+		m_fields->
+			SetReplyTo(GetPrefs()->
+					   GetDefaultHeaderContents(MSG_REPLY_TO_HEADER_MASK));
+	}
+	if (!*m_fields->GetFcc()) 
+	{
+		XP_Bool useDefaultFcc = TRUE;
+		/*int prefError =*/ PREF_GetBoolPref(*newsgroups ? "news.use_fcc" : "mail.use_fcc",
+											&useDefaultFcc);
+		if (useDefaultFcc)
+		{
+			m_fields->SetFcc(GetPrefs()->
+				GetDefaultHeaderContents(*newsgroups ? 
+					 MSG_NEWS_FCC_HEADER_MASK : MSG_FCC_HEADER_MASK));
+		}
+	}
+	if (!*m_fields->GetBcc()) {
+		char* bcc = FigureBcc(*newsgroups);
+		m_fields->SetBcc(bcc);
+		FREEIF(bcc);
+	}
+
+	{
+	  const char *body = m_fields->GetDefaultBody();
+	  if (body && *body)
+		{
+		  m_fields->AppendBody(body);
+		  m_fields->AppendBody(LINEBREAK);
+		  /* m_bodyEdited = TRUE; */
+		}
+	}
+
+	HG93653
+	sig = FE_UsersSignature ();
+	if (sig && *sig) {
+	    m_fields->AppendBody(LINEBREAK);
+		/* If the sig doesn't begin with "--" followed by whitespace or a
+		   newline, insert "-- \n" (the pseudo-standard sig delimiter.) */
+		if (sig[0] != '-' || sig[1] != '-' ||
+			(sig[2] != ' ' && sig[2] != CR && sig[2] != LF)) {
+			m_fields->AppendBody("-- " LINEBREAK);
+		}
+		m_fields->AppendBody(sig);
+	}
+
+	FREEIF (real_return_address);
+
+
+	FE_SetDocTitle(m_context, (char*) GetWindowTitle());
+
+
+	m_initfields = new MSG_CompositionFields(m_fields);
+								// ###tw  Should check for failure!
+
+}
+
+
+XP_Bool MSG_CompositionPane::ShouldAutoQuote() {
+      if (m_haveQuoted) return FALSE;
+	if (m_replyType == MSG_ForwardMessageQuoted ||
+		    GetPrefs()->GetAutoQuoteReply()) {
+		switch (m_replyType) {
+		case MSG_ForwardMessageQuoted:
+		case MSG_PostAndMailReply:
+		case MSG_PostReply:
+		case MSG_ReplyToAll:
+		case MSG_ReplyToSender:
+			return TRUE;
+
+        default:
+            break;
+		}
+	}
+	return FALSE;
+}
+
+
+
+
+const char* MSG_CompositionPane::GetDefaultURL() {
+  return m_defaultUrl;
+}
+
+
+
+MSG_CompositionFields*
+MSG_CompositionPane::GetInitialFields()
+{
+	return m_initfields;
+}
+
+
+
+
+#define ALL_HEADERS (MSG_FROM_HEADER_MASK |			\
+					 MSG_REPLY_TO_HEADER_MASK |		\
+					 MSG_TO_HEADER_MASK |			\
+					 MSG_CC_HEADER_MASK |			\
+					 MSG_BCC_HEADER_MASK |			\
+					 MSG_FCC_HEADER_MASK |			\
+					 MSG_NEWSGROUPS_HEADER_MASK |	\
+					 MSG_FOLLOWUP_TO_HEADER_MASK |	\
+					 MSG_SUBJECT_HEADER_MASK |		\
+					 MSG_ATTACHMENTS_HEADER_MASK)
+
+
+MSG_HEADER_SET MSG_CompositionPane::GetInterestingHeaders()
+{
+	MSG_HEADER_SET desired_mask = 0;
+	/* The FE has requested the list of "interesting" header fields.
+	   The logic here is a bit complicated, in the interest of DWIMity.
+	   */
+
+	/* Cc, Subject, and Attachments are always interesting.
+	 */
+	desired_mask |= (MSG_CC_HEADER_MASK |
+					 MSG_SUBJECT_HEADER_MASK /* |
+					 MSG_ATTACHMENTS_HEADER_MASK */);
+
+	/* To is interesting if:
+	   - it is non-empty, or
+	   - this composition window was brought up with a "mail sending"
+	   command (Mail New, Reply-*, Forward, or Post and Mail).
+	   */
+	if (*m_fields->GetTo() ||
+		m_replyType == MSG_MailNew ||
+		m_replyType == MSG_ReplyToSender ||
+		m_replyType == MSG_ReplyToAll ||
+		m_replyType == MSG_PostAndMailReply ||
+		m_replyType == MSG_ForwardMessageAttachment ||
+		m_replyType == MSG_ForwardMessageQuoted)
+		desired_mask |= MSG_TO_HEADER_MASK;
+
+	/* CC is interesting if:
+	   - it is non-empty, or
+	   - this composition window was brought up as a reply to another
+	   mail message.  (Should mail-and-post do this too?)
+	   */
+	if ((*m_fields->GetCc()) ||
+		m_replyType == MSG_ReplyToSender ||
+		m_replyType == MSG_ReplyToAll)
+		desired_mask |= MSG_CC_HEADER_MASK;
+
+	/* Reply-To and BCC are interesting if:
+	   - they are non-empty, AND
+	   - they are different from the default value
+	   (meaning the user has edited them this session.)
+	   */
+	const char* reply_to = m_fields->GetReplyTo();
+	const char* default_reply_to =
+		GetPrefs()->GetDefaultHeaderContents(MSG_REPLY_TO_HEADER_MASK);
+	if (reply_to && *reply_to &&
+		((default_reply_to && *default_reply_to)
+		 ? !!XP_STRCMP (reply_to, default_reply_to) : TRUE))
+		desired_mask |= MSG_REPLY_TO_HEADER_MASK;
+
+	/* (see above.) */
+	const char* bcc = m_fields->GetBcc();
+	const char* default_bcc =
+		GetPrefs()->GetDefaultHeaderContents(MSG_BCC_HEADER_MASK);
+	if (bcc && *bcc &&
+		((default_bcc && *default_bcc)
+		 ? !!XP_STRCMP (bcc, default_bcc) : TRUE))
+		desired_mask |= MSG_BCC_HEADER_MASK;
+
+	/* FCC is never interesting.
+	 */
+
+	/* Newsgroups is interesting if:
+	   - it is non-empty, or
+	   - this composition window was brought up with a "news posting"
+	   command (Post New, Post Reply, or Post and Mail).
+	   */
+
+	const char* newsgroups = m_fields->GetNewsgroups();
+	if ((newsgroups && *newsgroups) ||
+		m_replyType == MSG_PostNew ||
+		m_replyType == MSG_PostReply ||
+		m_replyType == MSG_PostAndMailReply)
+		desired_mask |= MSG_NEWSGROUPS_HEADER_MASK;
+
+	/* Followup-To is interesting if:
+	   - it is non-empty, AND
+	   - it differs from the Newsgroups field.
+	   */
+	const char* followup_to = m_fields->GetFollowupTo();
+	if (followup_to && *followup_to &&
+		(newsgroups ? XP_STRCMP (followup_to, newsgroups) : TRUE))
+		desired_mask |= MSG_FOLLOWUP_TO_HEADER_MASK;
+
+	return desired_mask;
+}
+
+
+void
+MSG_CompositionPane::GetUrlDone_S(PrintSetup* pptr)
+{
+  ((MSG_CompositionPane*) (pptr->carg))->GetUrlDone(pptr);
+}
+
+
+#define QUOTE_BUFFER_SIZE		10240
+
+void
+MSG_CompositionPane::GetUrlDone(PrintSetup* /*pptr*/)
+{
+	XP_File file;
+	FREEIF(m_quoteUrl);
+	m_textContext = NULL;  /* since this is called as a result of
+							  TXFE_AllConnectionsComplete, we know this context
+							  is going away by natural means */
+	int bufSize = QUOTE_BUFFER_SIZE;
+
+	XP_FileClose(m_print->out);
+
+	XP_StatStruct stat;
+	char* curquote = NULL;
+	int32 replyOnTop = 0, replyWithExtraLines = 0;
+
+	PREF_GetIntPref("mailnews.reply_on_top", &replyOnTop);
+	PREF_GetIntPref("mailnews.reply_with_extra_lines", &replyWithExtraLines);
+
+	int32 extra = (m_markup ? 0 : 
+	               (replyWithExtraLines ? LINEBREAK_LEN * replyWithExtraLines
+					: 0));
+
+	if (XP_Stat(m_print->filename, &stat, xpTemporary) == 0) {
+		m_quotedText = (char*) XP_ALLOC(stat.st_size + 1 + extra);
+		
+		/* Insert two line break at the begining of the quoted text */
+		if (!m_quotedText) return;
+
+		curquote = m_quotedText;
+
+		if (!m_markup && extra && replyOnTop == 1) {
+		  for (; replyWithExtraLines > 0; replyWithExtraLines--) {
+			XP_STRCPY(curquote, LINEBREAK);
+			curquote += LINEBREAK_LEN;
+			if (m_quotefunc)
+				(*m_quotefunc)(m_quoteclosure, LINEBREAK);
+		  }
+		}
+	}
+
+	/* Open hateful temporary file as input  */
+	file = XP_FileOpen (m_print->filename, xpTemporary, XP_FILE_READ);
+	if (file) {
+		char* buf = NULL;
+		while (!buf && (bufSize >= 512))
+		{
+			buf = (char*)XP_ALLOC(bufSize + 1);
+			if (!buf)
+				bufSize /= 2;
+		}
+		if (buf) {
+			int32 bufferLen;
+			CCCDataObject conv;
+			int doConv;
+			INTL_CharSetInfo c = LO_GetDocumentCharacterSetInfo(m_context);
+			int16 win_csid = INTL_GetCSIWinCSID(c);
+
+			/*
+			 * We aren't actually converting character encodings here.
+			 * (Note that both the "from" and "to" are the win_csid.)
+			 * This makes it call a special routine that makes sure we
+			 * deal with whole multibyte characters instead of partial
+			 * ones that happen to lie on the boundary of the buffer. -- erik
+			 */
+			conv = INTL_CreateCharCodeConverter();
+			if (conv) {
+				doConv = INTL_GetCharCodeConverter(win_csid, win_csid, conv);
+			} else {
+				doConv = 0;
+			}
+
+			while (0 < (bufferLen = XP_FileRead(buf, bufSize, file))) {
+				char *newBuf;
+				buf[bufferLen] = '\0';
+				if (doConv) {
+					newBuf = (char *)
+						INTL_CallCharCodeConverter(conv,
+												   (unsigned char *) buf,
+												   bufferLen);
+					if (!newBuf) {
+						newBuf = buf;
+					}
+				} else {
+					newBuf = buf;
+				}
+				if (m_quotefunc) {
+					(*m_quotefunc)(m_quoteclosure, newBuf);
+				}
+
+				if (m_quotedText && curquote) {
+					XP_ASSERT(curquote + bufferLen <= m_quotedText + stat.st_size + extra);
+					if (curquote + bufferLen <= m_quotedText + stat.st_size + extra) {
+						XP_STRCPY(curquote, newBuf);
+						curquote += bufferLen;
+					}
+				}
+
+				if (newBuf != buf) {
+					XP_FREE(newBuf);
+				}
+			}
+
+			if (!m_markup && extra && replyOnTop == 0) {
+			  for (; replyWithExtraLines > 1; replyWithExtraLines--) {
+				XP_STRCPY(curquote, LINEBREAK);
+				curquote += LINEBREAK_LEN;
+				if (m_quotefunc)
+					(*m_quotefunc)(m_quoteclosure, LINEBREAK);
+			  }
+			}
+
+			XP_FREE(buf);
+			if (conv) {
+				INTL_DestroyCharCodeConverter(conv);
+			}
+		}
+		XP_FileClose(file);
+	}
+	if (curquote) *curquote = '\0';
+	m_cited = TRUE;
+	XP_FileRemove(m_print->filename, xpTemporary);
+	FREEIF(m_print->filename);
+	if (m_exitQuoting) {
+		(*m_exitQuoting)(m_dummyUrl, 0, m_context);
+		m_exitQuoting = NULL;
+		m_dummyUrl = NULL;
+
+		/* hack that manages to get the cursor back to normal. */
+		NET_SilentInterruptWindow(m_context);
+	}
+	if (m_quotefunc) {
+		(*m_quotefunc)(m_quoteclosure, NULL);
+		m_quotefunc = NULL;
+	}
+
+
+	/* Re-enable the UI. */
+	FE_UpdateCompToolbar (this);
+}
+
+  
+
+class QuotePlainIntoHTML : public MSG_ZapIt {
+public:
+	QuotePlainIntoHTML(MWContext* context);
+	~QuotePlainIntoHTML();
+
+	int DoQuote(const char* data);
+	static int32 QuoteLine_s(char* line, uint32 line_length, void* closure);
+	int32 QuoteLine(char* line, uint32 line_length);
+protected:
+	MWContext* m_context;
+	char* m_buffer;
+	uint32 m_size;
+	uint32 m_fp;
+	XP_Bool m_insertedpre;
+	char* m_outbuf;
+	int32 m_outbufsize;
+	int m_maxLineWidth;
+	int32 m_replyOnTop;
+	int32 m_replyWithExtraLines;
+};
+
+
+static int
+MyQuoteFunc(void* closure, const char* data)
+{
+	return ((QuotePlainIntoHTML*) closure)->DoQuote(data);
+}
+
+
+
+
+
+QuotePlainIntoHTML::QuotePlainIntoHTML(MWContext* context)
+{
+	m_context = context;
+	if (EDT_PasteQuoteBegin(m_context, TRUE) != EDT_COP_OK) {
+		m_context = NULL;
+	}
+	PREF_GetIntPref("mailnews.reply_on_top", &m_replyOnTop);
+	PREF_GetIntPref("mailnews.reply_with_extra_lines", &m_replyWithExtraLines);
+}
+
+QuotePlainIntoHTML::~QuotePlainIntoHTML()
+{
+	FREEIF(m_buffer);
+	delete [] m_outbuf;
+}
+
+
+
+
+int
+QuotePlainIntoHTML::DoQuote(const char* data)
+{
+	if (data) {
+		if (!m_context) return 0;
+		return msg_LineBuffer(data, XP_STRLEN(data), &m_buffer, &m_size, &m_fp, FALSE, 
+#ifdef XP_OS2
+					(int32 (_Optlink*) (char*,uint32,void*))
+#endif
+					QuoteLine_s, this);
+
+	} else {
+		if (m_context) {
+			if (m_fp > 0) {
+				QuoteLine(m_buffer, m_fp);
+			}
+			if (m_insertedpre) {
+				EDT_PasteQuote(m_context, "</PRE></BLOCKQUOTE>");
+			}
+			if ( 0 == m_replyOnTop && m_replyWithExtraLines)
+			  for (;m_replyWithExtraLines > 0; m_replyWithExtraLines--)
+					EDT_PasteQuote(m_context, "<BR>");
+			EDT_PasteQuoteEnd(m_context);
+
+			MSG_CompositionPane *cpane = (MSG_CompositionPane *)
+				MSG_FindPane(m_context, MSG_COMPOSITIONPANE);
+			if (cpane)
+				cpane->SetLineWidth(m_maxLineWidth);
+		}
+		delete this;
+		return 0;
+	}
+}
+
+
+int32
+QuotePlainIntoHTML::QuoteLine_s(char* line, uint32 length, void* closure)
+{
+	return ((QuotePlainIntoHTML*)closure)->QuoteLine(line, length);
+}
+
+int32
+QuotePlainIntoHTML::QuoteLine(char* line, uint32 length)
+{
+	if (length > m_maxLineWidth)
+		m_maxLineWidth = length;
+
+	if (length >= 2 && line[0] == '>' && line[1] == ' ') {
+		line += 2;
+		length -= 2;
+		if (!m_insertedpre) {
+			EDT_PasteQuote(m_context, "<BLOCKQUOTE TYPE=CITE><PRE NSCISAW>");
+			m_insertedpre = TRUE;
+		}
+	}
+	else if (!m_insertedpre) {
+		if (1 == m_replyOnTop && m_replyWithExtraLines)
+		  for (; m_replyWithExtraLines > 0; m_replyWithExtraLines--)
+				EDT_PasteQuote(m_context, "<BR>");
+	}
+		
+	int l = length * 2 + 50;
+	if (l > m_outbufsize) {
+		if (l < 512) l = 512;
+		m_outbufsize = l;
+		delete [] m_outbuf;
+		m_outbuf = new char [m_outbufsize];
+	}
+	if (m_outbuf) {
+		*m_outbuf = '\0';
+		NET_ScanForURLs(NULL, line, length, m_outbuf, m_outbufsize, TRUE);
+		EDT_PasteQuote(m_context, m_outbuf);
+	}
+	return 0;
+}
+
+
+void
+MSG_CompositionPane::QuoteHTMLDone_S(URL_Struct* url, int /*status*/, MWContext* /*context*/)
+{
+      MSG_CompositionPane *pane = (MSG_CompositionPane *) url->fe_data;
+      if (pane) {
+          FREEIF(pane->m_quoteUrl);
+		  pane->m_quotefunc = NULL;
+		  if (pane->m_quoteclosure) {
+			  delete pane->m_quoteclosure;
+			  pane->m_quoteclosure = NULL;
+		  }
+	  }
+      NET_FreeURLStruct(url);
+}
+
+
+
+MsgERR MSG_CompositionPane::QuoteMessage(int (*func)(void* closure,
+													 const char* data),
+										 void* closure)
+{
+	MsgERR status = 0;
+	char* ptr;
+	 m_haveQuoted = TRUE;
+	if (!m_defaultUrl) return 0; /* Nothing to quote. */
+	if (m_quoteUrl) return 0;	/* Currently already quoting! */
+
+	XP_ASSERT(m_quotefunc == NULL);
+
+	if (m_markup) {
+		func = MyQuoteFunc;
+		closure = new QuotePlainIntoHTML(GetContext());
+		if (!closure) return MK_OUT_OF_MEMORY;
+	}
+
+	const char* htmlpart = m_fields->GetHTMLPart();
+	XP_Bool quotehtml = (m_markup && htmlpart != NULL && *htmlpart != '\0');
+
+	if (m_quotedText) {
+		if (func) {
+#ifdef	EXTRA_QUOTE_BEGIN
+			if (m_markup) {
+				if (EDT_PasteQuoteBegin(GetContext(),
+										TRUE) != EDT_COP_OK) {
+					return eUNKNOWN;
+				}
+			}
+#endif
+			(*func)(closure, m_quotedText);
+			(*func)(closure, NULL);
+		}
+		return 0;
+	}
+
+
+	m_quotefunc = func;
+	m_quoteclosure = closure;
+  
+
+	m_quoteUrl = XP_STRDUP(m_defaultUrl);
+	if (!m_quoteUrl) return eOUT_OF_MEMORY;
+
+	/* remove any position information from the url
+	 */
+	ptr = XP_STRCHR(m_quoteUrl, '#');
+	if (ptr) *ptr = '\0';
+
+	if (quotehtml) {
+		URL_Struct* url = NET_CreateURLStruct(m_quoteUrl, NET_DONT_RELOAD);
+		if (!url) return MK_OUT_OF_MEMORY;
+
+		// This is a hack, really should be url->msg_pane, but this prevents mail
+		// quoting from working at all.  We just need SOME sort of way to give
+		// the msg_page to the completion function.
+		url->fe_data = (void *)this;
+
+		// Set this because when quoting messages that might have been
+		// downloaded through IMAP MIME Parts on Demand (with some parts left out)
+		// we think it is OK to only quote the inline parts that have been
+		// downloaded.
+		// (That is, we don't think it's necessary to re-download the entire message
+		// from the server.  We might be wrong about this, but so far haven't seen
+		// any examples to the contrary.)
+		url->allow_content_change = TRUE;
+		MSG_UrlQueue::AddUrlToPane (url, QuoteHTMLDone_S, this, TRUE, FO_QUOTE_HTML_MESSAGE);
+		return 0;
+	}
+		
+
+	XL_InitializeTextSetup(m_print);
+	m_print->out = NULL;
+	m_print->prefix = "> ";
+	if (m_markup) {
+		if (htmlpart && *htmlpart) {
+			// Quoting html into html
+			// We are kind of doomed on this case when force sending plain text
+			// if there are hard line breaks.
+			m_print->width = 999;
+		}
+		else {
+			// Quoting plain text into html; there are hard line breaks
+			// We should not reformat the line when force sending plain text
+			// message
+			// This is done via recording the max line width when we quote each plain
+			// text line and then use the max line width if it is greater than default
+			// wraplinewidth. This prevent from reformatting the qutoed line in an 
+			// unwanted fashion.
+			m_print->width = 998;
+		}
+
+		// m_print->width = 999;	// Cheap hack.  The EDT_PasteQuote routine
+								// generates HTML that is better at wrapping
+								// than the TextFE is, so try and let it do the
+								// wrapping instead.
+	}
+	else {
+		if (htmlpart && *htmlpart) {
+			// We are quoting html message into plain text message
+			// Use wrapline width from preference
+			int32 width = 72;
+			PREF_GetIntPref("mailnews.wraplength", &width);
+			if (width == 0) width = 72;
+			else if (width < 10) width = 10;
+			else if (width > 30000) width = 30000;
+			m_print->width = width - 2;
+		}
+		else {
+			// We are quoting plain text message.to plain text
+			// We shouldn't reformat the original message since everyline already
+			// has hard line break <CR><LF> we simply set the m_print->width to 999.
+			m_print->width = 997;
+		}
+		// m_print->width = 70; // The default window is 72 wide; subtract 2 for "> ".
+	}
+	m_print->carg = this;
+	m_print->url = NET_CreateURLStruct(m_defaultUrl, NET_DONT_RELOAD);
+	if (!m_print->url) {
+		status = eOUT_OF_MEMORY;
+		goto FAIL;
+	}
+	HG98265
+	m_print->url->position_tag = 0;
+	m_print->completion = MSG_CompositionPane::GetUrlDone_S;
+	m_print->filename = WH_TempName(xpTemporary, "ns");
+	if (!m_print->filename) {
+		status = eOUT_OF_MEMORY;
+		goto FAIL;
+	}
+	m_print->out = XP_FileOpen(m_print->filename, xpTemporary, XP_FILE_WRITE);
+	if (!m_print->out) {
+		status = 9999;				/* ###tw   Need the right error code! */
+		goto FAIL;
+	}
+	m_print->cx = m_context;
+	m_exitQuoting = NULL;
+	m_dummyUrl = NET_CreateURLStruct("about:", NET_DONT_RELOAD);
+	m_dummyUrl->internal_url = TRUE;
+	if (m_dummyUrl) {
+		FE_SetWindowLoading(m_context, m_dummyUrl, &m_exitQuoting);
+		XP_ASSERT(m_exitQuoting != NULL);
+	}
+
+	/* Start the URL loading... (msg_get_url_done gets called later.) */
+
+
+	m_textContext = (MWContext*) XL_TranslateText(m_context, m_print->url,
+												  m_print);
+	// ###tw  I'm not at all sure this cast is the
+	// right thing to do here...
+
+	return 0;
+FAIL:
+	FREEIF(m_print->filename);
+	FREEIF(m_quoteUrl);
+	if (m_print->out) {
+		XP_FileClose(m_print->out);
+		m_print->out = NULL;
+	}
+	if (m_print->url) {
+		NET_FreeURLStruct(m_print->url);
+		m_print->url = NULL;
+	}
+	return status;
+}
+
+
+int
+MSG_CompositionPane::PastePlaintextQuotation(const char* str)
+{
+	if (str && *str) {
+		if (EDT_PasteQuoteBegin(m_context, TRUE) != EDT_COP_OK) {
+			return -1;
+		}
+		EDT_PasteQuote(m_context, "<BLOCKQUOTE TYPE=CITE><PRE>");
+		EDT_PasteQuote(m_context, (char*) str);
+		EDT_PasteQuote(m_context, "</PRE></BLOCKQUOTE>");
+		EDT_PasteQuoteEnd(m_context);
+	}
+	return 0;
+}
+
+
+
+int 
+MSG_CompositionPane::SetAttachmentList(struct MSG_AttachmentData* list)
+{
+	int count = 0;
+	MSG_AttachmentData *tmp;
+	MSG_AttachmentData *tmp2;
+	int status = 0;
+
+	ClearCompositionMessageID();	/* Since the attachment list has changed,
+									   the message has changed, so make sure
+									   we're using a fresh message-id when we
+									   try to send it. */
+
+	msg_free_attachment_list(m_attachData);
+	m_attachData = NULL;
+
+	for (tmp = list; tmp && tmp->url; tmp++) count++;
+
+	if (count > 0) {
+		m_attachData = (MSG_AttachmentData*)
+			XP_ALLOC((count + 1) * sizeof(MSG_AttachmentData));
+		if (!m_attachData) {
+			FE_Alert(m_context, XP_GetString(MK_OUT_OF_MEMORY));
+			return MK_OUT_OF_MEMORY;
+		}
+
+		XP_MEMSET(m_attachData, 0, (count + 1) * sizeof(MSG_AttachmentData));
+	}
+
+	if (count > 0) {
+		for (tmp = list, tmp2 = m_attachData; tmp->url; tmp++, tmp2++) {
+			tmp2->url = XP_STRDUP(tmp->url);
+			if (tmp->desired_type) {
+				tmp2->desired_type = XP_STRDUP(tmp->desired_type);
+			}
+			if (tmp->real_type) {
+				tmp2->real_type = XP_STRDUP(tmp->real_type);
+			}
+			if (tmp->real_encoding) {
+				tmp2->real_encoding = XP_STRDUP(tmp->real_encoding);
+			}
+			if (tmp->real_name) {
+				tmp2->real_name = XP_STRDUP(tmp->real_name);
+			}
+			if (tmp->description) {
+				tmp2->description = XP_STRDUP(tmp->description);
+			}
+			if (tmp->x_mac_type) {
+				tmp2->x_mac_type = XP_STRDUP(tmp->x_mac_type);
+			}
+			if (tmp->x_mac_creator) {
+				tmp2->x_mac_creator = XP_STRDUP(tmp->x_mac_creator);
+			}
+		}
+	}
+	status = DownloadAttachments();
+	return status;
+}
+
+
+const struct MSG_AttachmentData *
+MSG_CompositionPane::GetAttachmentList()
+{
+  if (m_attachData && m_attachData[0].url != NULL) return m_attachData;
+  return NULL;
+}
+
+
+static void
+msg_free_attachment_list(struct MSG_AttachmentData *list)
+{
+	MSG_AttachmentData* tmp;
+	if (!list) return;
+	for (tmp = list ; tmp->url ; tmp++) {
+		XP_FREE((char*) tmp->url);
+		if (tmp->desired_type) XP_FREE((char*) tmp->desired_type);
+		if (tmp->real_type) XP_FREE((char*) tmp->real_type);
+		if (tmp->real_encoding) XP_FREE((char*) tmp->real_encoding);
+		if (tmp->real_name) XP_FREE((char*) tmp->real_name);
+		if (tmp->description) XP_FREE((char*) tmp->description);
+		if (tmp->x_mac_type) XP_FREE((char*) tmp->x_mac_type);
+		if (tmp->x_mac_creator) XP_FREE((char*) tmp->x_mac_creator);
+	}
+	XP_FREEIF(list);
+}
+
+
+
+/* Whether the given saved-attachment-file thing is a match for the given
+   URL (in source and type-conversion.)
+ */
+static XP_Bool
+msg_attachments_match (MSG_AttachmentData *attachment,
+					   MSG_AttachedFile *file)
+{
+	const char *dt;
+	XP_ASSERT(attachment && file);
+	if (!attachment || !file) return FALSE;
+	XP_ASSERT(attachment->url && file->orig_url);
+	if (!attachment->url || !file->orig_url) return FALSE;
+
+	XP_ASSERT(file->type);
+	if (!file->type) return FALSE;
+	XP_ASSERT(file->file_name);
+	if (XP_STRCMP(attachment->url, file->orig_url)) return FALSE;
+
+	/* If the attachment has a conversion type specified (and it's not the
+	   "no conversion" type) then this is only a match if the saved document
+	   ended up with that type as well.
+	   */
+	dt = ((attachment->desired_type && *attachment->desired_type)
+		  ? attachment->desired_type
+		  : 0);
+	if (dt && !strcasecomp(dt, TEXT_HTML))
+		dt = 0;
+
+	/* dt only has a value if it's "not `As Is', ie, text/plain or app/ps. */
+	if (dt && XP_STRCMP(dt, file->type))
+		return FALSE;
+
+	return TRUE;
+}
+
+
+int
+MSG_CompositionPane::DownloadAttachments()
+{
+	int attachment_count = 0;
+	int new_download_count = 0;
+	int download_overlap_count = 0;
+	MSG_AttachmentData *tmp;
+	MSG_AttachmentData *downloads = 0;
+	MSG_AttachedFile *tmp2;
+	int returnValue = 0;
+
+	// *** Relax the rule a little bit to enable resume downloading at
+	// *** send time.
+	// XP_ASSERT(!m_deliveryInProgress);
+
+	// Make sure we do not have an attachement already pending. If we do,
+	// then we do not want to interrupt it. The new attachement will be picked up
+	// when we go to send the message.
+
+	if (m_attachmentInProgress)
+		return MK_INTERRUPTED;       // this status value is ignored by the caller
+
+	m_pendingAttachmentsCount = 0;	// reset m_pendingAttachmentsCount
+									// in case the attachmentlist has been
+									// cleared
+
+	if (m_attachData)
+		for (tmp = m_attachData; tmp->url; tmp++)
+			attachment_count++;
+
+	/* First, go through the list of desired attachments, and the list of
+	   currently-saved attachments, and delete the files (and data) of the
+	   ones which were attached/saved but are no longer.
+	   */
+	tmp2 = m_attachedFiles;
+	while (tmp2 && tmp2->orig_url) {
+		XP_Bool match = FALSE;
+		for (tmp = m_attachData; tmp && tmp->url; tmp++) {
+			if (msg_attachments_match(tmp, tmp2)) {
+				match = TRUE;
+				break;
+			}
+		}
+		if (match) {
+			tmp2++;
+			download_overlap_count++;
+		} else {
+			/* Delete the file, free the strings, and pull the other entries
+			   forward to cover this one. */
+			int i = 0;
+
+			if (tmp2->file_name) {
+				XP_FileRemove(tmp2->file_name, xpFileToPost);
+				XP_FREE(tmp2->file_name);
+			}
+			FREEIF(tmp2->orig_url);
+			FREEIF(tmp2->type);
+			FREEIF(tmp2->encoding);
+			FREEIF(tmp2->description);
+			FREEIF(tmp2->x_mac_type);
+			FREEIF(tmp2->x_mac_creator);
+			FREEIF(tmp2->real_name);
+		  
+                        do {
+                            tmp2[i]=tmp2[i+1];
+                        } while (tmp2[i++].orig_url);
+		}
+	}
+
+	/* Now download any new files that are in the list.
+	 */
+	if (download_overlap_count != attachment_count) {
+		MSG_AttachmentData *dfp;
+		new_download_count = attachment_count - download_overlap_count;
+		m_pendingAttachmentsCount = new_download_count;
+		downloads = (MSG_AttachmentData *)
+			XP_ALLOC(sizeof(MSG_AttachmentData) * (new_download_count + 1));
+		if (!downloads) {
+			FE_Alert(m_context, XP_GetString(MK_OUT_OF_MEMORY));
+			return MK_OUT_OF_MEMORY;
+		}
+		XP_MEMSET(downloads, 0, sizeof(*downloads) * (new_download_count + 1));
+
+		dfp = downloads;
+		for (tmp = m_attachData; tmp && tmp->url; tmp++) {
+			XP_Bool match = FALSE;
+			if (m_attachedFiles)
+				for (tmp2 = m_attachedFiles; tmp2->orig_url; tmp2++) {
+					if (msg_attachments_match(tmp, tmp2)) {
+						match = TRUE;
+						break;
+					}
+				}
+			if (!match) {
+				*dfp = *tmp;
+				dfp++;
+			}
+		}
+		if (!downloads[0].url) return 0;
+		// *** Relax the rule a little bit to enable resume downloading at
+		// *** send time.
+		// XP_ASSERT(!m_deliveryInProgress);
+		XP_ASSERT(!m_attachmentInProgress);
+		m_attachmentInProgress = TRUE;
+		FE_UpdateCompToolbar (this);
+		returnValue = msg_DownloadAttachments(this, this, downloads,
+#ifdef XP_OS2
+							(void (_Optlink*) (MWContext*,void*,int,const char*,MSG_AttachedFile*))
+#endif
+							   MSG_CompositionPane::DownloadAttachmentsDone_S);
+		XP_FREE(downloads);
+	}
+	return returnValue;
+}
+
+void 
+MSG_CompositionPane::DownloadAttachmentsDone_S(MWContext *context, 
+											   void *fe_data,
+											   int status,
+											   const char *error_message,
+											   struct MSG_AttachedFile *attachments)
+{
+	((MSG_CompositionPane*) fe_data)->DownloadAttachmentsDone(context, status,
+															  error_message,
+															  attachments);
+}
+
+void
+MSG_CompositionPane::DownloadAttachmentsDone(MWContext* context, int status,
+											 const char* error_message,
+											 struct MSG_AttachedFile *attachments)
+{
+	XP_ASSERT(context == m_context);
+
+	int old_count = 0;
+	int new_count = 0;
+	struct MSG_AttachedFile *tmp;
+	MSG_AttachedFile *newd;
+
+	// *** Relax the rule a little bit to enable resume downloading at
+	// *** send time.
+	// XP_ASSERT(!m_deliveryInProgress);
+	if (m_attachmentInProgress) {
+		m_attachmentInProgress = FALSE;
+		FE_UpdateCompToolbar (this);
+	}
+
+	if (status < 0) goto FAIL;
+
+	status = MK_INTERRUPTED;
+	if (!m_attachData) goto FAIL;
+
+	HG98229
+	if (m_attachedFiles) {
+		for (tmp = m_attachedFiles; tmp->orig_url; tmp++) old_count++;
+	}
+	if (attachments) {
+		for (tmp = attachments; tmp->orig_url; tmp++) new_count++;
+	}
+
+	if (old_count + new_count == 0) goto FAIL;
+	newd = (MSG_AttachedFile *)
+		XP_REALLOC(m_attachedFiles,
+				   ((old_count + new_count + 1)
+					* sizeof(MSG_AttachedFile)));
+
+	if (!newd) {
+		status = MK_OUT_OF_MEMORY;
+		error_message = XP_GetString(status);
+		goto FAIL;
+	}
+	m_attachedFiles = newd;
+	XP_MEMCPY(newd + old_count,
+			  attachments,
+			  sizeof(MSG_AttachedFile) * (new_count + 1));
+
+	XP_ASSERT (m_pendingAttachmentsCount >= new_count);
+	m_pendingAttachmentsCount -= new_count;
+	if (m_deliveryInProgress) {
+		m_deliveryInProgress = FALSE;
+		DoneComposeMessage(m_deliver_mode);
+	}
+	return;
+
+FAIL:
+	XP_ASSERT(status < 0);
+	if (error_message) {
+		FE_Alert(context, error_message);
+	}
+	else if (status != MK_INTERRUPTED) {
+		char *errmsg;
+		errmsg = PR_smprintf(XP_GetString(MK_COMMUNICATIONS_ERROR), status);
+		if (errmsg) {
+			FE_Alert(context, errmsg);
+			XP_FREE(errmsg);
+		}
+	}
+
+	/* Since we weren't able to store it, ditch the files and the strings
+	   describing them. */
+	msg_delete_attached_files(attachments);
+}
+
+
+/* How many implementations of this are there now?  4? */
+static void
+msg_mid_truncate_string (const char *input, char *output, int max_length)
+{
+	int L = XP_STRLEN(input);
+	if (L <= max_length) {
+		XP_MEMCPY(output, input, L+1);
+    } else {
+		int mid = (max_length - 3) / 2;
+		char *tmp = 0;
+		if (input == output) {
+			tmp = output;
+			output = (char *) XP_ALLOC(max_length + 1);
+			*tmp = 0;
+			if (!output) return;
+		}
+		XP_MEMCPY(output, input, mid);
+		XP_MEMCPY(output + mid, "...", 3);
+		XP_MEMCPY(output + mid + 3, input + L - mid, mid + 1);
+
+		if (tmp) {
+			XP_MEMCPY(tmp, output, max_length + 1);
+			XP_FREE(output);
+		}
+    }
+}
+
+
+char *
+MSG_CompositionPane::GetAttachmentString()
+{
+	/* #### bug 8688 */
+
+	MSG_AttachmentData *tmp;
+	int count;
+	int chars_per_attachment;
+	int default_field_width = 63; /* 72 - some space for the word
+									 "Attachment" */
+
+	count = 0;
+	for (tmp = m_attachData; tmp && tmp->url ; tmp++) count++;
+	if (count <= 0) return 0;
+
+	chars_per_attachment = (default_field_width - (count * 2)) / count;
+	if (chars_per_attachment < 15) chars_per_attachment = 15;
+
+	FREEIF(m_attachmentString);
+
+	m_attachmentString =
+		(char *) XP_ALLOC(count * (chars_per_attachment + 3) + 20);
+	if (!m_attachmentString) return 0;
+	*m_attachmentString = 0;
+
+	for (tmp = m_attachData ; tmp && tmp->url ; tmp++) {
+		const char *url = tmp->real_name ? tmp->real_name : tmp->url;
+		const char *ptr = XP_STRCHR(url, ':');
+		char *result = 0;
+
+		if (!ptr) {
+			/* No colon?  Must be a file name. */
+			ptr = url;
+			goto DO_FILE;
+		}
+
+		if (!XP_STRNCMP(url, "news:", 5) ||
+			!XP_STRNCMP(url, "snews:", 6) ||
+			!XP_STRNCMP(url, "IMAP:", 5) ||
+			!XP_STRNCMP(url, "mailbox:", 8)) {
+			/* ###tw Unfortunately, I don't think this stuff quite ports
+			   directly to the new world, so I'm gonna disable it for now... */
+
+			goto DONE;
+		}
+
+		/* Ok, so it must be something vaguely file-name-like.
+		   Look for a slash.
+		   */
+	DO_FILE:
+		{
+			char *ptr2 = XP_STRDUP(ptr);
+			if (!ptr2) goto DONE;
+			char* s = XP_STRCHR(ptr2, '?');
+			if (s) *s = 0;
+			s = XP_STRCHR(ptr2, '#');
+			if (s) *s = 0;
+			s = XP_STRRCHR(ptr2, '/');
+			if(!s) {
+				XP_FREE(ptr2);
+				goto DONE;
+			}
+			s++;
+			if (!*s || !strcasecomp(s,"index.html") ||
+				  !strcasecomp(s,"index.htm")) {
+				/* This had a useless file name; take the last directory name. */
+				char *s2 = s-1;
+				if (*s2 == '/') s2--;
+				while (s2 > ptr2 && *s2 != '/') s2--;
+				if (*s2 == ':' || *s2 == '/') s2++;
+				result = (char *) XP_ALLOC (s - s2 + 1);
+				XP_MEMCPY (result, s2, s - s2);
+				result[s - s2] = 0;
+			} else {
+				/* The file name is ok; use it. */
+				result = XP_STRDUP (s);
+			}
+			NET_UnEscape (result);
+			XP_FREE(ptr2);
+			goto DONE;
+		}
+
+	DONE:
+		if (tmp != m_attachData) {
+			XP_STRCAT(m_attachmentString, "; ");
+		}
+
+		if (!result) {
+			if (!XP_STRNCMP(url, "news:", 5) ||
+				!XP_STRNCMP(url, "snews:", 6) ||
+				!XP_STRNCMP(url, "IMAP:", 5) ||
+				!XP_STRNCMP(url, "mailbox:", 8)) {
+				result = XP_STRDUP("<message>");
+			} else {
+				result = XP_STRDUP(url);
+			}
+			if (!result) break;
+		}
+
+		msg_mid_truncate_string(result,
+								(m_attachmentString +
+								 XP_STRLEN(m_attachmentString)),
+								chars_per_attachment);
+		XP_FREE(result);
+	}
+
+	return m_attachmentString;
+}
+
+
+char*
+MSG_CompositionPane::UpdateHeaderContents(MSG_HEADER_SET which_header,
+										  const char* )
+{
+  switch (which_header) {
+	case MSG_TO_HEADER_MASK:
+	case MSG_CC_HEADER_MASK:
+	case MSG_BCC_HEADER_MASK:
+    case MSG_REPLY_TO_HEADER_MASK:
+	  break;
+  }
+  return NULL;
+}
+
+int
+MSG_CompositionPane::SetCompHeader(MSG_HEADER_SET header,
+								   const char *value)
+{
+	XP_ASSERT(header != MSG_ATTACHMENTS_HEADER_MASK);
+	ClearCompositionMessageID();
+	m_fields->SetHeader(header, value);
+	return 0;
+}
+
+const char*
+MSG_CompositionPane::GetCompHeader(MSG_HEADER_SET header)
+{
+	if (header == MSG_ATTACHMENTS_HEADER_MASK) {
+		return GetAttachmentString();
+	} else {
+		return m_fields ? m_fields->GetHeader(header) : (char *)NULL;
+	}
+}
+
+int
+MSG_CompositionPane::SetCompBoolHeader(MSG_BOOL_HEADER_SET header,
+									   XP_Bool bValue)
+{
+	return m_fields->SetBoolHeader(header, bValue);
+}
+
+XP_Bool
+MSG_CompositionPane::GetCompBoolHeader(MSG_BOOL_HEADER_SET header)
+{
+	return m_fields ? m_fields->GetBoolHeader(header) : FALSE;
+}
+
+const char*
+MSG_CompositionPane::GetCompBody()
+{
+	return m_fields ? m_fields->GetBody() : (char *)NULL;
+}
+
+int
+MSG_CompositionPane::SetCompBody(const char* value)
+{
+	return m_fields->SetBody(value);
+}
+
+const char*
+MSG_CompositionPane::GetWindowTitle()
+{
+	const char *s;
+
+	if (*m_fields->GetSubject()) {
+		s = m_fields->GetSubject();
+	} else if (*m_fields->GetTo()) {
+		s = m_fields->GetTo();
+	} else if (*m_fields->GetNewsgroups()) {
+		s = m_fields->GetNewsgroups();
+	} else {
+		s = XP_GetString(MK_MSG_MSG_COMPOSITION);
+	}
+	return s;
+}
+
+
+
+int
+MSG_CompositionPane::SanityCheck(int skippast)
+{
+	const char* body = m_fields->GetBody();
+	const char* sub = m_fields->GetSubject();
+	
+
+	if (skippast == MK_MSG_DOUBLE_INCLUDE) goto AFTER_DOUBLE_INCLUDE;
+	if (skippast == MK_MSG_EMPTY_MESSAGE) goto AFTER_EMPTY_MESSAGE;
+	if (skippast == MK_MSG_MISSING_SUBJECT) goto AFTER_MISSING_SUBJECT;
+	HG60283
+
+	// Check if they have quoted a document and not edited it, and also
+	// attached the same document.
+	if (m_quotedText &&
+		XP_STRNCMP(body, m_quotedText, XP_STRLEN(m_quotedText)) == 0 &&
+		m_attachData &&
+		m_attachData[0].url &&
+		m_defaultUrl &&
+		!XP_STRCMP (m_attachData[0].url, m_defaultUrl)) {
+		return MK_MSG_DOUBLE_INCLUDE;
+	}
+
+AFTER_DOUBLE_INCLUDE:
+	// Check if this message has no attachments, and the body has not been
+	// edited.
+	if (XP_STRCMP(body, m_initfields->GetBody()) == 0 &&
+		(!m_attachData || !m_attachData[0].url)) {
+		return MK_MSG_EMPTY_MESSAGE;
+	}
+
+AFTER_EMPTY_MESSAGE:
+	// Check if they neglected to type a subject.
+	if (sub) {
+		while (XP_IS_SPACE(*sub)) sub++;
+	}
+	if (!sub || !*sub) {
+		return MK_MSG_MISSING_SUBJECT;
+	}
+
+AFTER_MISSING_SUBJECT:
+HG60207
+	return 0;
+
+}
+
+
+void
+MSG_CompositionPane::DeliveryDoneCB_s(MWContext *context, void *fe_data,
+									  int status, const char *error_message)
+{
+	((MSG_CompositionPane*) fe_data)->DeliveryDoneCB(context, status,
+													 error_message);
+}
+
+void
+MSG_CompositionPane::DeliveryDoneCB(MWContext* context, int status,
+									const char* error_message)
+{
+	XP_ASSERT(context == m_context);
+
+	// *** We don't want to set m_status to status. The default value
+	// of m_status (-1) prevents the composition pane from closing down
+	// once we done with saving draft. The composition pane should remain up.
+	if ((m_deliver_mode != MSG_SaveAsDraft && m_deliver_mode != MSG_SaveAsTemplate)
+		|| (m_deliver_mode == MSG_SaveAsDraft && m_closeAfterSave))
+	  m_status = status;
+
+	XP_ASSERT(!m_attachmentInProgress);
+	if (m_deliveryInProgress) {
+		m_deliveryInProgress = FALSE;
+#ifndef XP_UNIX /* Does not need this function call for UNIX. 
+		   This will prevent toolbar to be enabled after msg sent on 
+		   UNIX. */
+		 FE_UpdateCompToolbar (this); 
+#endif
+	}
+
+	if (status < 0) {
+		if (error_message) {
+			FE_Alert(context, error_message);
+		} else if (status != MK_INTERRUPTED) {
+			char *errmsg;
+
+			HG92755
+			errmsg = PR_smprintf(XP_GetString(MK_COMMUNICATIONS_ERROR),
+								 status);
+			if (errmsg) {
+				FE_Alert(context, errmsg);
+				XP_FREE(errmsg);
+			}
+		}
+    } else {
+		/* ### jht bug 45220 -- do following only when successfully deliver the message */
+		/* time to delete message from draft/outbox */
+	}
+}
+
+void
+MSG_CompositionPane::MailCompositionAllConnectionsComplete ()
+{
+	/* This may be redundant, I'm not sure... */
+	if (m_deliveryInProgress) {
+		m_deliveryInProgress = FALSE;
+		FE_UpdateCompToolbar(this);
+	}
+	if (m_attachmentInProgress) {
+		m_attachmentInProgress = FALSE;
+		FE_UpdateCompToolbar(this);
+	}
+
+	if (m_status >= 0) {
+		delete this;
+	}
+}
+
+
+XP_Bool
+MSG_CompositionPane::DeliveryInProgress ()
+{
+	/* Disable the UI if delivery, attachment loading, or quoting is in
+	   progress. */
+	return m_deliveryInProgress || m_attachmentInProgress || (m_quoteUrl != 0);
+}
+
+/* This function sets the markup flag to indicate that the message
+   body is HTML.  Returns the previously set value.
+*/
+
+void
+MSG_CompositionPane::SetHTMLMarkup(XP_Bool flag)
+{
+    m_markup = flag;
+}
+
+XP_Bool
+MSG_CompositionPane::GetHTMLMarkup(void)
+{
+    return m_markup;
+}
+
+int
+MSG_CompositionPane::DoneComposeMessage( MSG_Deliver_Mode deliver_mode )
+{
+	int attachment_count = 0;
+	XP_Bool digest_p = FALSE;
+	int status = 0;
+
+	if (m_pendingAttachmentsCount) {
+		m_deliveryInProgress = TRUE; // so that DoneComposeMessage is called again
+		status = DownloadAttachments();
+		return status;
+	}
+
+	HG92762
+
+	if (m_markup && (deliver_mode != MSG_SaveAsDraft &&
+					 deliver_mode != MSG_SaveAsTemplate)) {
+		MSG_HTMLComposeAction action = DetermineHTMLAction();
+		if (action == MSG_HTMLAskUser)
+		{
+			status = -1;
+#ifndef XP_UNIX	// Unix will have to make this dialog a blocking dialog for this logic to work
+			if (m_callbacks.CreateAskHTMLDialog) {
+				status = (*m_callbacks.CreateAskHTMLDialog)(this, m_callbackclosure);
+				// if status == 0, then user wants to Send, so we continue
+				// if status < 0, do the HTML dialogs
+				// if status > 0, cancel
+				if (status == 0) {
+					 action = DetermineHTMLAction();	// reget the new action
+					 XP_ASSERT(action != MSG_HTMLAskUser);
+					 if (action == MSG_HTMLAskUser) {
+						 // Boy, the FE is busted.  Use our own.
+						 status = -1;
+					 }
+				}
+				if (status > 0) return 0;		// we have to return 0, even in the cancel case so that an error won't get displayed
+			}
+#endif
+			// if status still negative, do the HTML thing
+			if (status < 0) {
+				static XPDialogInfo dialogInfo = {
+					0,				// I'll provide all my own buttons, thanks.
+#ifdef XP_OS2
+					(PRBool (_Optlink*) (XPDialogState*,char**,int,unsigned int))
+#endif
+					MSG_CompositionPane::AskDialogDone_s,
+					500,
+					300
+				};
+				XPDialogStrings* strings =
+					XP_GetDialogStrings(MK_MSG_ASK_HTML_MAIL);
+				if (!strings) return MK_OUT_OF_MEMORY;
+				XP_MakeHTMLDialog(GetContext(), &dialogInfo,
+								  MK_MSG_ASK_HTML_MAIL_TITLE, strings, this, PR_FALSE);
+				return 0;
+			}
+
+		}
+
+		switch (action) {
+		case MSG_HTMLUseMultipartAlternative:
+			m_fields->SetUseMultipartAlternative(TRUE);
+			break;
+		case MSG_HTMLConvertToPlaintext:
+			m_fields->SetForcePlainText(TRUE);
+			break;
+		case MSG_HTMLSendAsHTML:
+			break;
+		default:
+			XP_ASSERT(0);
+			return -1;
+		}
+	}
+
+	HG42440
+
+	const char* body = m_fields->GetBody();
+	uint32 body_length = XP_STRLEN(body);
+
+
+	for (attachment_count = 0;
+		 m_attachData && m_attachData[attachment_count].url;
+		 attachment_count++)
+		;
+
+	if (m_attachData && m_attachData[0].url && m_attachData[1].url ) {
+		MSG_AttachmentData* s;
+		digest_p = TRUE;
+		for (s = m_attachData ; s->url ; s++) {
+			/* When there are attachments, start out assuming it is a digest,
+			   and then decide that it is not if any of the attached URLs are
+			   not mail or news messages. */
+			if (XP_STRNCMP(s->url, "news:", 5) != 0 &&
+				XP_STRNCMP(s->url, "snews:", 6) != 0 &&
+				XP_STRNCMP(s->url, "IMAP:", 5) != 0 &&
+				XP_STRNCMP(s->url, "mailbox:", 8) != 0) {
+				digest_p = FALSE;
+			}
+		}
+	}
+
+	XP_ASSERT(!m_attachmentInProgress);
+	XP_ASSERT(!m_deliveryInProgress);
+	m_deliveryInProgress = TRUE;
+	FE_UpdateCompToolbar(this);
+
+	if (m_messageId == NULL) {
+		m_messageId = msg_generate_message_id();
+		m_duplicatePost = FALSE;
+	} else {
+		m_duplicatePost = TRUE;
+	}
+
+	m_fields->SetMessageId(m_messageId);
+
+	MSG_MimeRelatedSaver *fs = NULL;
+
+#ifdef MSG_SEND_MULTIPART_RELATED
+	if (m_markup)
+	{
+		char *pRootPartName = NULL; // set to NULL so that we're given a temp filename
+		fs = new MSG_MimeRelatedSaver(this, m_context, m_fields, 
+									  digest_p, deliver_mode, 
+									  body, body_length,
+									  m_attachedFiles,
+									  DeliveryDoneCB_s,
+									  &pRootPartName);
+		if (fs)
+		{
+			EDT_SaveFileTo(m_context, 
+                           ((deliver_mode == MSG_SaveAsDraft  && !m_closeAfterSave) ||
+						    deliver_mode == MSG_SaveAsTemplate) ?
+                              ED_FINISHED_SAVE_DRAFT : ED_FINISHED_MAIL_SEND, 
+                          pRootPartName, fs, TRUE, TRUE);
+			// Note: EDT_SaveFileTo will delete fs, even if it returns an error.  So
+			// it is incorrect to delete it here.  Also, we ignore the result, because
+			// it calls FE_Alert itself.
+		}
+		FREEIF(pRootPartName);
+	}
+	else
+
+#endif // MSG_SEND_MULTIPART_RELATED
+
+	{
+		msg_StartMessageDeliveryWithAttachments(this, this,
+												m_fields,
+												digest_p, FALSE, deliver_mode,
+												(m_markup ? TEXT_HTML : 
+												 TEXT_PLAIN),
+												body, body_length,
+												m_attachedFiles,
+												NULL,
+#ifdef XP_OS2
+												(void (_Optlink*) (MWContext*,void*,int,const char*))
+#endif
+												DeliveryDoneCB_s);
+	}
+	return 0; // Always success, because Errors were reported and handled by EDT_SaveFileTo.
+}
+
+int
+MSG_CompositionPane::SendMessageNow()
+{
+	PREF_SetBoolPref("network.online", TRUE);	// make sure we're online.
+		// remember if we're queued so we know which folder
+	m_deliver_mode = MSG_DeliverNow;		
+	
+	HG73943
+	if (m_fields->GetAttachVCard())
+		CreateVcardAttachment();
+	// counts we need to update.
+	return DoneComposeMessage(MSG_DeliverNow);
+}
+
+int
+MSG_CompositionPane::QueueMessageForLater()
+{
+		// remember if we're queued so we know which folder
+	m_deliver_mode = MSG_QueueForLater;
+	if (m_fields->GetAttachVCard())
+		CreateVcardAttachment();
+	// counts we need to update.
+	return DoneComposeMessage(MSG_QueueForLater);
+}
+
+int
+MSG_CompositionPane::SaveMessageAsDraft()
+{
+  
+  m_deliver_mode = MSG_SaveAsDraft;    // remember if we're saved as draft so we know which
+                           // folder counts we need to update.
+  return DoneComposeMessage(MSG_SaveAsDraft);
+}
+
+int
+MSG_CompositionPane::SaveMessageAsTemplate()
+{
+  m_deliver_mode = MSG_SaveAsTemplate;
+
+#ifdef SUPPORT_X_TEMPLATE_NAME
+  char *defaultName = NULL;
+
+  defaultName = FE_Prompt (GetContext(),
+						   XP_GetString(MK_MSG_ENTER_NAME_FOR_TEMPLATE), 
+						   m_fields->GetSubject());
+  if (defaultName && *defaultName)
+  {
+	  m_fields->SetTemplateName(defaultName);
+	  XP_FREEIF(defaultName);
+  }
+#endif /* SUPPORT_X_TEMPLATE_NAME */
+
+  return DoneComposeMessage(MSG_SaveAsTemplate);
+}
+
+static int
+StuffParams(char** params, const char* name, int32 value)
+{
+	char* escaped = NET_EscapeHTML(name);
+	if (!escaped) return MK_OUT_OF_MEMORY;
+	char* tmp = PR_smprintf("<OPTION value=%ld>%s\n", (long) value, escaped);
+	XP_FREE(escaped);
+	if (!tmp) return MK_OUT_OF_MEMORY;
+	NET_SACat(params, tmp);
+	XP_FREE(tmp);
+	return 0;
+}
+
+//void *pWnd used to pass in pointer to parent window of Recipients dialog
+int
+MSG_CompositionPane::PutUpRecipientsDialog(void *pWnd )
+{
+	int status;
+	status = MungeThroughRecipients(NULL, NULL);
+	if (status < 0) return status;
+	MSG_RecipientList* ok = m_htmlrecip->GetList(TRUE);
+	MSG_RecipientList* notok = m_htmlrecip->GetList(FALSE);
+	if (m_callbacks.CreateRecipientsDialog) {
+		status = (*m_callbacks.CreateRecipientsDialog)(this, m_callbackclosure,
+													   notok, ok, pWnd);
+		if (status >= 0) return status;
+	}
+	static XPDialogInfo dialogInfo = {
+		0,				// I'll provide all my own buttons, thanks.
+#ifdef XP_OS2
+		(PRBool (_Optlink*) (XPDialogState*,char**,int,unsigned int))
+#endif
+		MSG_CompositionPane::RecipientDialogDone_s,
+		600,
+#ifdef XP_UNIX
+		375
+#else
+		300
+#endif
+	};
+	XPDialogStrings* strings =
+		XP_GetDialogStrings(MK_MSG_HTML_RECIPIENTS);
+	if (!strings) return MK_OUT_OF_MEMORY;
+
+
+	XP_CopyDialogString(strings, 0, "\n\
+function Scour(src) {\n\
+    for (i=src.options.length-1 ; i>=0 ; i--) {\n\
+	if (parseInt(src.options[i].value) >= 0) {\n\
+	    return;\n\
+	}\n\
+	src.options[i] = null;\n\
+    }\n\
+}\n\
+Scour(document.theform.nohtml);\n\
+Scour(document.theform.html);\n\
+function MoveItems(src, dest) {\n\
+    var i, j, k, v, selectindex;\n\
+    selectindex = -1;\n\
+    for (i=src.options.length-1 ; i>=0 ; i--) {\n\
+	if (src.options[i].selected) {\n\
+	    src.options[i].selected = false;\n\
+	    v = parseInt(src.options[i].value);\n\
+	    selectindex = i;\n\
+	    for (j=dest.options.length-1 ; j>=0 ; j--) {\n\
+		if (parseInt(dest.options[j].value) < v) {\n\
+		    break;\n\
+		}\n\
+		dest.options[j+1] = new Option(dest.options[j].text,\n\
+					       dest.options[j].value);\n\
+	    }\n\
+	    j++;\n\
+	    dest.options[j] = new Option(src.options[i].text,\n\
+					 src.options[i].value);\n\
+	    for (k=i ; k<src.options.length - 1 ; k++) {\n\
+		src.options[k] = new Option(src.options[k+1].text,\n\
+					    src.options[k+1].value);\n\
+	    }\n\
+	    src.options[k] = null;\n\
+	}\n\
+    }\n\
+    if (selectindex >= src.options.length) {\n\
+	selectindex = src.options.length - 1;\n\
+    }\n\
+    if (selectindex >= 0) {\n\
+	src.options[selectindex].selected = true;\n\
+    }\n\
+}\n\
+\n\
+function DoAdd() {\n\
+    MoveItems(document.theform.nohtml, document.theform.html);\n\
+}\n\
+\n\
+function DoRemove() {\n\
+    MoveItems(document.theform.html, document.theform.nohtml);\n\
+}\n\
+\n\
+function SelectAllIn(obj, value) {\n\
+    for (i=0 ; i<obj.length ; i++) {\n\
+	obj[i].selected = value;\n\
+    }\n\
+}\n\
+\n\
+function SelectAll() {\n\
+    SelectAllIn(document.theform.html, true);\n\
+    SelectAllIn(document.theform.nohtml, true);\n\
+}\n\
+function Doit(value) {\n\
+    document.theform.cmd.value = value;\n\
+    document.theform.submit();\n\
+}\n\
+");
+
+	for (int w=1 ; w<=2 ; w++) {
+		MSG_RecipientList* list;
+		char* params = NULL;
+		for (list = (w == 1) ? notok : ok; list->value >= 0 ; list++) {
+			status = StuffParams(&params, list->name, list->value);
+			if (status < 0) return status;
+		}
+		for (list = (w == 1) ? ok : notok; list->value >= 0 ; list++) {
+			status = StuffParams(&params, list->name, -1);
+			if (status < 0) return status;
+		}
+		XP_CopyDialogString(strings, w, params ? params : "");
+		FREEIF(params);
+	}
+
+	HG72999
+    Chrome chrome;
+    XP_MEMSET(&chrome, 0, sizeof(chrome));
+    chrome.type = MWContextDialog;
+    chrome.w_hint = dialogInfo.width;
+    chrome.h_hint = dialogInfo.height;
+    chrome.is_modal = TRUE;
+    chrome.show_scrollbar = TRUE;
+
+	XP_MakeHTMLDialogWithChrome(GetContext(), &dialogInfo,
+					  		    MK_MSG_HTML_RECIPIENTS_TITLE, strings,
+ 								&chrome, this, PR_FALSE);
+	return 0;
+}
+
+
+XP_Bool
+MSG_CompositionPane::IsDuplicatePost() {
+  return m_duplicatePost;
+}
+
+void 
+MSG_CompositionPane::ClearCompositionMessageID()
+{
+  FREEIF(m_messageId);
+}
+
+const char*
+MSG_CompositionPane::GetCompositionMessageID()
+{
+  return m_messageId;
+}
+
+HG20026
+
+
+int 
+MSG_CompositionPane::SetPreloadedAttachments ( MWContext *context,
+											   struct MSG_AttachmentData *attachmentData,
+											   struct MSG_AttachedFile *attachments,
+											   int attachments_count )
+{
+  XP_ASSERT ( context == m_context );
+  XP_ASSERT ( attachments && attachmentData );
+  if ( !attachments || !attachmentData ) return -1;
+
+  int status = 0;
+  const char *error_message = NULL;
+  
+  XP_ASSERT ( m_attachData == NULL );
+
+  m_attachData = (MSG_AttachmentData *) XP_ALLOC ( (attachments_count+1) *
+												   sizeof (MSG_AttachmentData) );
+  if ( !m_attachData ) {
+	FE_Alert ( m_context, XP_GetString ( MK_OUT_OF_MEMORY ) );
+	return MK_OUT_OF_MEMORY;
+  }
+
+  XP_MEMSET (m_attachData, 0, (attachments_count +1) * sizeof (MSG_AttachmentData));
+
+  XP_MEMCPY ( m_attachData, attachmentData, 
+			  sizeof (MSG_AttachmentData) * attachments_count );
+	
+  m_pendingAttachmentsCount = attachments_count;
+  m_attachmentInProgress = TRUE;
+
+  DownloadAttachmentsDone ( context, status, error_message, attachments );
+
+  return status;
+}
+
+static MSG_HEADER_SET standard_header_set[] = {
+    MSG_TO_HEADER_MASK,
+    MSG_REPLY_TO_HEADER_MASK,
+    MSG_CC_HEADER_MASK,
+    MSG_BCC_HEADER_MASK,
+    MSG_NEWSGROUPS_HEADER_MASK,
+    MSG_FOLLOWUP_TO_HEADER_MASK
+    };
+
+#define TOTAL_HEADERS (sizeof(standard_header_set)/sizeof(MSG_HEADER_SET))
+
+int 
+MSG_CompositionPane::RetrieveStandardHeaders(MSG_HeaderEntry ** return_list)
+{
+  int i, total;
+  const char * field;
+  MSG_HeaderEntry * list = NULL;
+
+  XP_ASSERT(return_list);
+
+  *return_list = NULL;
+
+  for (i=0, total=0; i<TOTAL_HEADERS; i++) {
+    MSG_HeaderEntry * entry;
+    int count;
+    field = GetCompHeader(standard_header_set[i]);
+
+    count = MSG_ExplodeHeaderField(standard_header_set[i],field,&entry);
+    if (entry) {
+      list = (MSG_HeaderEntry*)XP_REALLOC(list,(total+count)*sizeof(MSG_HeaderEntry));
+      if (list == NULL) {
+        XP_FREE(entry);
+        return(-1);
+      }
+      memcpy(&list[total],entry,count*sizeof(MSG_HeaderEntry));   
+      XP_FREE(entry);
+      total += count;
+    }
+  }
+
+  *return_list = list;
+  return(total);
+}
+
+void 
+MSG_CompositionPane::ClearComposeHeaders()
+{
+  int i;
+  for (i = 0; i<TOTAL_HEADERS; i++)
+    SetCompHeader(standard_header_set[i],NULL);
+}
+
+void 
+MSG_CompositionPane::SetHeaderEntries(MSG_HeaderEntry * in_list, int count)
+{
+  if ((count != -1)&&(in_list!=NULL)) {
+    int i;
+    for (i=0; i<count; i++) {
+      XP_ASSERT(in_list[i].header_value);
+      SetCompHeader(in_list[i].header_type,in_list[i].header_value);
+      XP_FREE(in_list[i].header_value);
+    }
+    XP_FREE(in_list);
+  }
+}
+
+
+
+PRBool
+MSG_CompositionPane::AskDialogDone_s(XPDialogState *state, char **argv,
+									 int argc, unsigned int button)
+{
+	return ((MSG_CompositionPane*)state->arg)->AskDialogDone(state, argv,
+															  argc, button);
+}
+
+
+PRBool
+MSG_CompositionPane::AskDialogDone(XPDialogState * /*state*/, char **argv,
+								   int argc, unsigned int /*button*/)
+{
+	switch (XP_ATOI(XP_FindValueInArgs("cmd", argv, argc))) {
+	case 0:
+		switch (XP_ATOI(XP_FindValueInArgs("mail", argv, argc))) {
+		case 1:
+			SetHTMLAction(MSG_HTMLUseMultipartAlternative);
+			break;
+		case 2:
+			SetHTMLAction(MSG_HTMLConvertToPlaintext);
+			break;
+		case 3:
+			SetHTMLAction(MSG_HTMLSendAsHTML);
+			break;
+		HG98276
+		default:
+			XP_ASSERT(0);
+		}
+		DoneComposeMessage(m_deliver_mode);
+		return PR_FALSE;
+	case 1:
+		return PR_FALSE;
+	case 2:
+		PutUpRecipientsDialog();
+		return PR_TRUE;
+	case 3:
+		XP_NetHelp(GetContext(), HELP_HTML_MAIL_QUESTION);
+		return PR_TRUE;
+	default:
+		XP_ASSERT(0);
+		break;
+	}
+	return PR_FALSE;
+}
+
+#ifndef XP_OS2
+static 
+#else
+extern "OPTLINK"
+#endif
+int DomainCompare(const void* e1, const void* e2)
+{
+	return XP_STRCMP(*((char**) e1), *((char**) e2));
+}
+
+int
+MSG_CompositionPane::ResultsRecipients(XP_Bool cancelled, int32* nohtml,
+									   int32* htmlok)
+{
+	int status = 0;
+	if (cancelled) return 0;
+	XP_ASSERT(m_htmlrecip);
+	if (!m_htmlrecip) return -1;
+	status = m_htmlrecip->SetNewList(nohtml, htmlok);
+	if (status < 0) return status;
+
+	char** list = NULL;
+	char** tmp;
+	char* ptr;
+	char* endptr = 0;
+	char* domainlist = NULL;
+	char** domainstrings = NULL;
+	XP_Bool changed;
+	int num = 0;
+	int max = 0;
+	int length;
+	int i, j;
+
+
+	PREF_CopyCharPref("mail.htmldomains", &domainlist);
+	changed = FALSE;
+
+	length = domainlist ? XP_STRLEN(domainlist) : 0;
+	for (ptr = domainlist ; ptr && *ptr ; ptr = XP_STRCHR(ptr + 1, ',')) {
+		max++;
+	}
+	max += m_htmlrecip->GetNum() + 1; // We be paranoid.
+	domainstrings = new char* [max];
+	if (!domainstrings) {
+		status = MK_OUT_OF_MEMORY;
+		goto FAIL;
+	}
+	for (ptr = domainlist ; ptr && *ptr ; ptr = endptr) {
+		endptr = XP_STRCHR(ptr, ',');
+		if (endptr) *endptr++ = '\0';
+		domainstrings[num++] = ptr;
+	}
+	list = m_htmlrecip->GetChangedList(Domain, FALSE);
+	for (tmp = list ; tmp && *tmp ; tmp++) {
+		for (i=0 ; i<num ; i++) {
+			while (i<num && XP_STRCMP(domainstrings[i], *tmp) == 0) {
+				num--;
+				domainstrings[i] = domainstrings[num];
+				changed = TRUE;
+			}
+		}
+	}
+	m_htmlrecip->FreeChangedList(list);
+	list = m_htmlrecip->GetChangedList(Domain, TRUE);
+	for (tmp = list ; tmp && *tmp ; tmp++) {
+		domainstrings[num++] = *tmp;
+		changed = TRUE;
+		length += XP_STRLEN(*tmp) + 1;
+	}
+	if (changed) {
+		// Now nuke dups.
+		XP_QSORT(domainstrings, num, sizeof(char*), DomainCompare);
+		for (i=0 ; i < num-1 ; i++) {
+			while (i < num-1 &&
+				   XP_STRCMP(domainstrings[i], domainstrings[i+1]) == 0) {
+				num--;
+				for (j=i+1 ; j<num ; j++) {
+					domainstrings[j] = domainstrings[j+1];
+				}
+			}
+		}
+		ptr = new char [length + 1];
+		if (!ptr) {
+			status = MK_OUT_OF_MEMORY;
+			goto FAIL;
+		}
+		*ptr = '\0';
+		for (i=0 ; i<num ; i++) {
+			XP_STRCAT(ptr, domainstrings[i]);
+			if (i < num-1) XP_STRCAT(ptr, ",");
+		}
+		PREF_SetCharPref("mail.htmldomains", ptr);
+		PREF_SavePrefFile();
+		delete [] ptr;
+		ptr = NULL;
+	}				
+
+ FAIL:
+	m_htmlrecip->FreeChangedList(list);
+	FREEIF(domainlist);
+	delete [] domainstrings;
+	return status;
+}
+
+
+
+
+PRBool
+MSG_CompositionPane::RecipientDialogDone_s(XPDialogState *state, char **argv,
+										   int argc, unsigned int button)
+{
+	return
+		((MSG_CompositionPane*)state->arg)->RecipientDialogDone(state, argv,
+																argc, button);
+}
+
+
+static void
+Slurp(int32* list, const char* name, char** argv, int argc)
+{
+	for (; argc > 0 ; argc -= 2 , argv += 2) {
+		if (XP_STRCMP(name, argv[0]) == 0) {
+			*list++ = XP_ATOI(argv[1]);
+		}
+	}
+	*list = -1;
+}
+
+PRBool
+MSG_CompositionPane::RecipientDialogDone(XPDialogState * /*state*/,
+										 char **argv,
+										 int argc, unsigned int /*button*/)
+{
+	HG73622
+	switch (XP_ATOI(XP_FindValueInArgs("cmd", argv, argc))) {
+	case 0: {
+		XP_ASSERT(argc > 0);
+		if (argc <= 0) return PR_FALSE;
+		int32* nohtml = new int32 [argc];
+		if (!nohtml) return PR_FALSE;
+		int32* htmlok = new int32 [argc];
+		if (!htmlok) {
+			delete [] nohtml;
+			return PR_FALSE;
+		}
+		Slurp(nohtml, "nohtml", argv, argc);
+		Slurp(htmlok, "html", argv, argc);
+		ResultsRecipients(FALSE, nohtml, htmlok);
+		delete [] nohtml;
+		delete [] htmlok;
+		return PR_FALSE;
+	}
+	case 1:
+		ResultsRecipients(TRUE, NULL, NULL);
+		return PR_FALSE;
+	case 2:
+		XP_NetHelp(GetContext(), HELP_HTML_MAIL_QUESTION_RECIPIENT);
+		return PR_TRUE;
+	default:
+		XP_ASSERT(0);
+		break;
+	}
+	return PR_FALSE;
+}
+
+
+XP_Bool
+MSG_CompositionPane::HasNoMarkup()
+{
+
+	// we want a link with the same text and link to pass
+	// <A HREF="http://warp/client/dogbert">http://warp/client/dogbert</A>
+
+	XP_ASSERT(m_markup);
+	if (!m_markup) return TRUE;
+	const char* body = m_fields->GetBody();
+	while (body && *body) {
+		body = XP_STRCHR(body, '<');
+		if (!body) break;
+		char* endptr = XP_STRCHR(body, '>');
+		XP_ASSERT(endptr);
+		if (!endptr) break;
+		char c = *++endptr;
+		*endptr = '\0';
+		XP_Bool recognized = FALSE;
+		char* newEnd = endptr;
+		
+		if (XP_STRNCASECMP(body, "<A HREF=", 8) == 0) {
+			char* pLinkStart = XP_STRCHR(body, '"');		// find the open quote
+			if (pLinkStart) {
+				++pLinkStart;								// past the open quote
+				char* pLinkEnd = XP_STRCHR(pLinkStart, '"');// find the close quote
+				if (pLinkEnd) {
+					char c2 = *pLinkEnd;					// save this char
+					*pLinkEnd = '\0';						// terminate the link
+
+					// now pLink points to the URL
+					// find the text to see if it's the same as the link
+					char* pTextStart = endptr;
+					*endptr = c;							// restore this char early because it's the lead char of our string
+					char* pTextEnd = XP_STRCHR(pTextStart, '<');
+					if (pTextEnd) {
+						char c3 = *pTextEnd;
+						*pTextEnd = '\0';					// terminate the text
+						recognized = (XP_STRCMP(pLinkStart, pTextStart) == 0);
+						*pTextEnd = c3;						// restore this char
+						newEnd = pTextEnd + 1;				// skip past the opening of the </A>
+					}
+					*pLinkEnd = c2;							// restore this char
+				}
+			}
+		} else {
+			recognized = (XP_STRCASECMP(body, "<P>") == 0 ||
+								  XP_STRCASECMP(body, "</P>") == 0 ||
+								  XP_STRCASECMP(body, "<BR>") == 0 ||
+								  XP_STRCASECMP(body, "<DT>") == 0 ||
+								  XP_STRCASECMP(body, "</DT>") == 0 ||
+								  XP_STRCASECMP(body, "<HTML>") == 0 ||
+								  XP_STRCASECMP(body, "</HTML>") == 0 ||
+								  XP_STRNCASECMP(body, "<BODY", 5) == 0 ||
+								  XP_STRCASECMP(body, "</BODY>") == 0 ||
+								  XP_STRCASECMP(body,
+												"<BLOCKQUOTE TYPE=CITE>") == 0 ||
+								  XP_STRCASECMP(body, "</BLOCKQUOTE>") == 0);
+		}
+
+		*endptr = c;
+		body = newEnd;
+		if (!recognized) return FALSE;
+	}
+	return TRUE;
+}
+
+int
+MSG_CompositionPane::MungeThroughRecipients(XP_Bool* someNonHTML,
+											XP_Bool* groupNonHTML)
+{
+	XP_Bool foo;
+	if (!someNonHTML) someNonHTML = &foo;
+	if (!groupNonHTML) groupNonHTML = &foo;
+	*someNonHTML = FALSE;
+	*groupNonHTML = FALSE;
+	int status = 0;
+	char* names = NULL;
+	char* addresses = NULL;
+	const char* groups;
+	char* name = NULL;
+	char* end;
+	XP_Bool match = FALSE;
+	m_host = NULL;				// Pure paranoia, in case we some day actually
+								// have a UI that lets people change this.
+
+	static int32 masks[] = {
+		MSG_TO_HEADER_MASK,
+		MSG_CC_HEADER_MASK,
+		MSG_BCC_HEADER_MASK
+	};
+	char* domainlist = NULL;
+
+	HG02726
+	delete m_htmlrecip;
+	m_htmlrecip = new MSG_HTMLRecipients();
+	if (!m_htmlrecip) return MK_OUT_OF_MEMORY;
+
+	for (int i=0 ; i < sizeof(masks) / sizeof(masks[0]) ; i++) {
+		const char* orig = m_fields->GetHeader(masks[i]);
+		if (!orig || !*orig) continue;
+		char* value = NULL;
+		if (!value) {
+			value = XP_STRDUP(orig);
+			if (!value) {
+				status = MK_OUT_OF_MEMORY;
+				goto FAIL;
+			}
+		}
+		int num = MSG_ParseRFC822Addresses(value, &names, &addresses);
+		XP_FREE(value);
+		value = NULL;
+		char* addr = NULL;
+		char* name = NULL;
+		for (int j=0 ; j<num ; j++) {
+			if (addr) {
+				addr = addr + XP_STRLEN(addr) + 1;
+				name = name + XP_STRLEN(name) + 1;
+			} else {
+				addr = addresses;
+				name = names;
+			}
+			if (!addr || !*addr) continue;
+			
+			// Check for a address book entry for this person.
+			char* at = XP_STRCHR(addr, '@');
+			
+			char* tmp = MSG_MakeFullAddress(name, addr);
+			status = m_htmlrecip->AddOne(tmp, addr, Address, match);
+			if (status < 0) goto FAIL;
+			XP_FREE(tmp);
+			tmp = NULL;
+
+			if (!at) {
+				// ###tw We got to decide what to do in these cases.  But
+				// for now, I'm just gonna ignore them.  Which is probably
+				// exactly the wrong thing.  Fortunately, these cases are
+				// now very rare, as we have code that inserts a default
+				// domain.
+				continue;
+			}
+			if (!domainlist) {
+				PREF_CopyCharPref("mail.htmldomains", &domainlist);
+			}
+			char* domain = at + 1;
+			for (;;) {
+				char* dot = XP_STRCHR(domain, '.');
+				if (!dot) break;
+				int32 domainlength = XP_STRLEN(domain);
+				char* ptr;
+				char* endptr = NULL;
+				XP_Bool found = FALSE;
+				for (ptr = domainlist ; ptr && *ptr ; ptr = endptr) {
+					endptr = XP_STRCHR(ptr, ',');
+					int length;
+					if (endptr) {
+						length = endptr - ptr;
+						endptr++;
+					} else {
+						length = XP_STRLEN(ptr);
+					}
+					if (length == domainlength) {
+						if (XP_STRNCASECMP(domain, ptr, length) == 0) {
+							found = TRUE;
+							match = TRUE;
+							break;
+						}
+					}
+				}
+				char* tmp = PR_smprintf("%s@%s",
+										XP_GetString(MK_MSG_EVERYONE),
+										domain);
+				if (!tmp) return MK_OUT_OF_MEMORY;
+				status = m_htmlrecip->AddOne(domain, tmp, Domain, found);
+				XP_FREE(tmp);
+				if (status < 0) goto FAIL;
+				domain = dot + 1;
+			}
+			if (!match) *someNonHTML = TRUE;
+		}
+	}
+
+	groups = m_fields->GetHeader(MSG_NEWSGROUPS_HEADER_MASK);
+	if (groups && *groups && !m_host)
+      goto FAIL;
+
+	end = NULL;
+	for ( ; groups && *groups ; groups = end) {
+		end = XP_STRCHR(groups, ',');
+		if (end) *end = '\0';
+		name = XP_STRDUP(groups);
+		if (end) *end++ = ',';
+		if (!name) {
+			status = MK_OUT_OF_MEMORY;
+			goto FAIL;
+		}
+		char* group = XP_StripLine(name);
+        match = FALSE;      /* MAILTO: libmsg had: isHTMLOKGroup() */
+		status = m_htmlrecip->AddOne(group, group, Newsgroup, match);
+		if (status < 0) goto FAIL;
+		char* tmp = XP_STRDUP(group);
+		if (!tmp) {
+			status = MK_OUT_OF_MEMORY;
+			goto FAIL;
+		}
+		HG02977
+		for (;;) {
+			XP_Bool found = FALSE;  /* MAILTO: libmsg had m_host->IsHTMLOKTree */
+			char* desc = PR_smprintf("%s.*", tmp);
+			if (!desc) {
+				status = MK_OUT_OF_MEMORY;
+				goto FAIL;
+			}
+			status = m_htmlrecip->AddOne(tmp, desc, GroupHierarchy, found);
+			XP_FREE(desc);
+			if (status < 0) {
+				XP_FREE(tmp);
+				tmp = NULL;
+				goto FAIL;
+			}
+			if (found) match = TRUE;
+			char* p = XP_STRRCHR(tmp, '.');
+			if (p) *p = '\0';
+			else break;
+		}
+		XP_FREE(tmp);
+		tmp = NULL;
+		if (!match) {
+			*someNonHTML = TRUE;
+			*groupNonHTML = TRUE;
+		}
+	}
+
+ FAIL:
+	FREEIF(names);
+	FREEIF(domainlist);
+	FREEIF(addresses);
+	FREEIF(name);
+	return status;
+}
+
+
+
+MSG_HTMLComposeAction
+MSG_CompositionPane::DetermineHTMLAction()
+{
+	XP_Bool someNonHTML, groupNonHTML;
+	int status;
+
+	MSG_HTMLComposeAction result = GetHTMLAction();
+
+
+	if (result == MSG_HTMLAskUser) {
+		// Well, before we ask, see if we can figure out what to do for
+		// ourselves.
+
+		status = MungeThroughRecipients(&someNonHTML, &groupNonHTML);
+		if (status < 0) return MSG_HTMLAskUser; // ###
+		if (!someNonHTML) return MSG_HTMLSendAsHTML;
+		if (HasNoMarkup()) {
+			// No point in sending this message as HTML; send it plain.
+			return MSG_HTMLConvertToPlaintext;
+		}
+		// See if a preference has been set to tell us what to do.  Note that
+		// we do not honor that preference for newsgroups, only for e-mail
+		// addresses.
+		if (!groupNonHTML) {
+			int32 value;
+			if (PREF_GetIntPref("mail.default_html_action", &value) >= 0) {
+				switch (value) {
+				case 1:				// Force plaintext.
+					return MSG_HTMLConvertToPlaintext;
+				case 2:				// Force HTML.
+					return MSG_HTMLSendAsHTML;
+				case 3:				// Force multipart/alternative.
+					return MSG_HTMLUseMultipartAlternative;
+				}
+			}
+		}
+	}
+	return result;
+}
+	
+
+
+#ifndef MOZ_MAIL_NEWS
+/* This is normally in mkpop3.c, of all the odd places!
+   But it's required for converting plain to html.
+ */
+/* Take the given buffer, tweak the newlines at the end if necessary, and
+   send it off to the given routine.  We are guaranteed that the given
+   buffer has allocated space for at least one more character at the end. */
+static int
+msg_convert_and_send_buffer(char* buf, uint32 length, XP_Bool convert_newlines_p,
+							int32 (*per_line_fn) (char *line,
+												  uint32 line_length,
+												  void *closure),
+							void *closure)
+{
+  /* Convert the line terminator to the native form.
+   */
+  char* newline;
+
+  XP_ASSERT(buf && length > 0);
+  if (!buf || length <= 0) return -1;
+  newline = buf + length;
+  XP_ASSERT(newline[-1] == CR || newline[-1] == LF);
+  if (newline[-1] != CR && newline[-1] != LF) return -1;
+
+  if (!convert_newlines_p)
+	{
+	}
+#if (LINEBREAK_LEN == 1)
+  else if ((newline - buf) >= 2 &&
+		   newline[-2] == CR &&
+		   newline[-1] == LF)
+	{
+	  /* CRLF -> CR or LF */
+	  buf [length - 2] = LINEBREAK[0];
+	  length--;
+	}
+  else if (newline > buf + 1 &&
+		   newline[-1] != LINEBREAK[0])
+	{
+	  /* CR -> LF or LF -> CR */
+	  buf [length - 1] = LINEBREAK[0];
+	}
+#else
+  else if (((newline - buf) >= 2 && newline[-2] != CR) ||
+		   ((newline - buf) >= 1 && newline[-1] != LF))
+	{
+	  /* LF -> CRLF or CR -> CRLF */
+	  length++;
+	  buf[length - 2] = LINEBREAK[0];
+	  buf[length - 1] = LINEBREAK[1];
+	}
+#endif
+
+  return (*per_line_fn)(buf, length, closure);
+}
+
+int
+msg_LineBuffer (const char *net_buffer, int32 net_buffer_size,
+				char **bufferP, uint32 *buffer_sizeP, uint32 *buffer_fpP,
+				XP_Bool convert_newlines_p,
+				int32 (*per_line_fn) (char *line, uint32 line_length,
+									  void *closure),
+				void *closure)
+{
+  int status = 0;
+  if (*buffer_fpP > 0 && *bufferP && (*bufferP)[*buffer_fpP - 1] == CR &&
+	  net_buffer_size > 0 && net_buffer[0] != LF) {
+	/* The last buffer ended with a CR.  The new buffer does not start
+	   with a LF.  This old buffer should be shipped out and discarded. */
+	XP_ASSERT(*buffer_sizeP > *buffer_fpP);
+	if (*buffer_sizeP <= *buffer_fpP) return -1;
+	status = msg_convert_and_send_buffer(*bufferP, *buffer_fpP,
+										 convert_newlines_p,
+										 per_line_fn, closure);
+	if (status < 0) return status;
+	*buffer_fpP = 0;
+  }
+  while (net_buffer_size > 0)
+	{
+	  const char *net_buffer_end = net_buffer + net_buffer_size;
+	  const char *newline = 0;
+	  const char *s;
+
+
+	  for (s = net_buffer; s < net_buffer_end; s++)
+		{
+		  /* Move forward in the buffer until the first newline.
+			 Stop when we see CRLF, CR, or LF, or the end of the buffer.
+			 *But*, if we see a lone CR at the *very end* of the buffer,
+			 treat this as if we had reached the end of the buffer without
+			 seeing a line terminator.  This is to catch the case of the
+			 buffers splitting a CRLF pair, as in "FOO\r\nBAR\r" "\nBAZ\r\n".
+		   */
+		  if (*s == CR || *s == LF)
+			{
+			  newline = s;
+			  if (newline[0] == CR)
+				{
+				  if (s == net_buffer_end - 1)
+					{
+					  /* CR at end - wait for the next character. */
+					  newline = 0;
+					  break;
+					}
+				  else if (newline[1] == LF)
+					/* CRLF seen; swallow both. */
+					newline++;
+				}
+			  newline++;
+			  break;
+			}
+		}
+
+	  /* Ensure room in the net_buffer and append some or all of the current
+		 chunk of data to it. */
+	  {
+		const char *end = (newline ? newline : net_buffer_end);
+		uint32 desired_size = (end - net_buffer) + (*buffer_fpP) + 1;
+
+		if (desired_size >= (*buffer_sizeP))
+		  {
+			status = msg_GrowBuffer (desired_size, sizeof(char), 1024,
+									 bufferP, buffer_sizeP);
+			if (status < 0) return status;
+		  }
+		XP_MEMCPY ((*bufferP) + (*buffer_fpP), net_buffer, (end - net_buffer));
+		(*buffer_fpP) += (end - net_buffer);
+	  }
+
+	  /* Now *bufferP contains either a complete line, or as complete
+		 a line as we have read so far.
+
+		 If we have a line, process it, and then remove it from `*bufferP'.
+		 Then go around the loop again, until we drain the incoming data.
+	   */
+	  if (!newline)
+		return 0;
+
+	  status = msg_convert_and_send_buffer(*bufferP, *buffer_fpP,
+										   convert_newlines_p,
+										   per_line_fn, closure);
+	  if (status < 0) return status;
+
+	  net_buffer_size -= (newline - net_buffer);
+	  net_buffer = newline;
+	  (*buffer_fpP) = 0;
+	}
+  return 0;
+}
+
+#endif /* ! MOZ_MAIL_NEWS */
+
diff --git a/mozilla/lib/mailto/msgcpane.h b/mozilla/lib/mailto/msgcpane.h
new file mode 100644
index 00000000000..42aa674e536
--- /dev/null
+++ b/mozilla/lib/mailto/msgcpane.h
@@ -0,0 +1,274 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgCPane_H_
+#define _MsgCPane_H_
+
+#include "rosetta.h"
+#include "msg.h"
+#include "msgpane.h"
+#include "xlate.h"
+
+
+/* The MSG_REPLY_TYPE shares the same space as MSG_CommandType, to avoid
+   possible weird errors, but is restricted to the `composition' commands
+   (MSG_ReplyToSender through MSG_ForwardMessage.)
+ */
+typedef MSG_CommandType MSG_REPLY_TYPE;
+
+
+struct MSG_AttachedFile;
+typedef struct PrintSetup_ PrintSetup;
+typedef struct _XPDialogState XPDialogState;
+
+HG82621
+class MSG_NewsHost;
+class MSG_HTMLRecipients;
+
+class MSG_CompositionPane : public MSG_Pane {
+public:
+
+	MSG_CompositionPane(MWContext* context, MWContext* old_context,
+						MSG_Prefs* prefs, MSG_CompositionFields* initfields,
+						MSG_Master* master);
+
+	// Or, if you prefer, construct using below constructor and be sure to
+	// soon call the Initialize() method:
+
+	MSG_CompositionPane(MWContext* context, MSG_Prefs* prefs,
+						MSG_Master* master);
+	int Initialize(MWContext* old_context, MSG_CompositionFields* initfields);
+
+	virtual ~MSG_CompositionPane();
+
+	virtual MSG_PaneType GetPaneType();
+
+	virtual void NotifyPrefsChange(NotifyCode code);
+
+	virtual MsgERR	GetCommandStatus(MSG_CommandType command,
+										 const MSG_ViewIndex* indices,
+										 int32 numindices,
+										 XP_Bool *selectable_p,
+										 MSG_COMMAND_CHECK_STATE *selected_p,
+										 const char **display_string,
+										 XP_Bool * plural_p);
+	virtual MsgERR DoCommand(MSG_CommandType command,
+							 MSG_ViewIndex* indices, int32 numindices);
+
+	const char* GetDefaultURL();
+
+
+	int SetCallbacks(MSG_CompositionPaneCallbacks* callbacks, void* closure);
+
+	MSG_CompositionFields* GetInitialFields();
+	
+
+	MSG_HEADER_SET GetInterestingHeaders();
+	int SetAttachmentList(struct MSG_AttachmentData*);
+	char* GetAttachmentString();
+	XP_Bool ShouldAutoQuote();
+	const char* GetCompHeader(MSG_HEADER_SET);
+	int SetCompHeader(MSG_HEADER_SET, const char*);
+	XP_Bool GetCompBoolHeader(MSG_BOOL_HEADER_SET);
+	int SetCompBoolHeader(MSG_BOOL_HEADER_SET, XP_Bool);
+	const char* GetCompBody();
+	int SetCompBody(const char*);
+	void ToggleCompositionHeader(uint32 header);
+	XP_Bool ShowingAllCompositionHeaders();
+	XP_Bool ShowingCompositionHeader(uint32 mask);
+    XP_Bool GetHTMLMarkup(void);
+    void SetHTMLMarkup(XP_Bool flag);
+	MsgERR QuoteMessage(int (*func)(void* closure, const char* data),
+						void* closure);
+	int PastePlaintextQuotation(const char* str);
+	const struct MSG_AttachmentData *GetAttachmentList();
+	int DownloadAttachments();
+	char* UpdateHeaderContents(MSG_HEADER_SET which_header, const char* value);
+	const char* GetWindowTitle();
+	void SetBodyEdited(XP_Bool value);
+	void MailCompositionAllConnectionsComplete();
+	XP_Bool DeliveryInProgress();
+
+	int SendMessageNow();
+    int QueueMessageForLater();
+    int SaveMessageAsDraft();
+	int SaveMessageAsTemplate();
+
+	XP_Bool IsDuplicatePost();
+	const char* GetCompositionMessageID();
+	void ClearCompositionMessageID();
+	HG22960
+
+	int SanityCheck(int skippast);
+
+    /* draft */
+    int SetPreloadedAttachments ( MWContext *context, 
+								  struct MSG_AttachmentData *attachmentData,
+								  struct MSG_AttachedFile *attachments,
+								  int attachments_count );
+
+#ifdef MOZ_MAIL_NEWS
+	virtual void SetIMAPMessageUID (MessageKey key);
+#endif /* MOZ_MAIL_NEWS */
+
+    int RetrieveStandardHeaders(MSG_HeaderEntry ** return_list);
+    void SetHeaderEntries(MSG_HeaderEntry * in_list,int count);
+    void ClearComposeHeaders();
+    
+    
+
+	int SetHTMLAction(MSG_HTMLComposeAction action) {
+		m_htmlaction = action;
+		return 0;
+	}
+	MSG_HTMLComposeAction GetHTMLAction() {return m_htmlaction;}
+
+  int PutUpRecipientsDialog(void *pWnd = NULL);
+
+  int ResultsRecipients(XP_Bool cancelled, int32* nohtml, int32* htmlok);
+
+  XP_Bool m_confirmed_uuencode_p; // Have we confirmed sending uuencoded data?
+
+  // For qutoing plain text to html then convert back to plain text
+  void SetLineWidth(int width) { m_lineWidth = width; }
+  int GetLineWidth() { return m_lineWidth; }
+
+protected:
+	static void QuoteHTMLDone_S(URL_Struct* url, 
+								int status, MWContext* context);
+
+	void InitializeHeaders(MWContext* old_context,
+						   MSG_CompositionFields* fields);
+
+	char* FigureBcc(XP_Bool newsBcc);
+
+	static void GetUrlDone_S(PrintSetup*);
+	void GetUrlDone(PrintSetup*);
+
+	static void DownloadAttachmentsDone_S(MWContext *context, 
+										  void *fe_data,
+										  int status,
+										  const char *error_message,
+										  struct MSG_AttachedFile *attachmnts);
+
+	void DownloadAttachmentsDone(MWContext* context, int status,
+								 const char* error_message,
+								 struct MSG_AttachedFile *attachments);
+
+    int DoneComposeMessage(MSG_Deliver_Mode deliver_mode);
+
+	static void DeliveryDoneCB_s(MWContext *context, void *fe_data, int status,
+								 const char *error_message);
+	void DeliveryDoneCB(MWContext* context, int status,
+						const char* error_message);
+
+	HG22860
+
+	XP_Bool HasNoMarkup();
+	MSG_HTMLComposeAction DetermineHTMLAction();
+	int MungeThroughRecipients(XP_Bool* someNonHTML, XP_Bool* groupNonHTML);
+
+	static PRBool AskDialogDone_s(XPDialogState *state, char **argv, int argc,
+								  unsigned int button);
+	PRBool AskDialogDone(XPDialogState *state, char **argv, int argc,
+						 unsigned int button);
+	static PRBool RecipientDialogDone_s(XPDialogState *state, char **argv,
+										int argc, unsigned int button);
+	PRBool RecipientDialogDone(XPDialogState *state, char **argv, int argc,
+							   unsigned int button);
+
+	int CreateVcardAttachment ();
+
+
+	MSG_REPLY_TYPE m_replyType;		/* The kind of message composition in
+									   progress (reply, forward, etc.) */
+
+	XP_Bool m_markup;					/* Whether we should generate messages
+										   whose first part is text/html rather
+										   than text/plain. */
+
+	MSG_AttachmentData *m_attachData;	/* null-terminated list of the URLs and
+										   desired types currently scheduled
+										   for attachment.  */
+	MSG_AttachedFile *m_attachedFiles;	/* The attachments which have already
+										   been downloaded, and some info about
+										   them. */
+
+	char *m_defaultUrl;			/* Default URL for attaching, etc. */
+
+	MSG_CompositionFields* m_initfields; // What all the fields were,
+										 // initially.
+	MSG_CompositionFields* m_fields; // Current value of all the fields.
+
+	char* m_messageId;			// Message-Id to use for composition.
+
+	char* m_attachmentString;	// Storage for string to display in UI for
+								// the list of attachments.
+	char* m_quotedText;			// The results of quoting the original text.
+
+	/* Stuff used while quoting a message. */
+	PrintSetup* m_print;
+	MWContext *m_textContext;
+	char* m_quoteUrl;
+	URL_Struct *m_dummyUrl;
+	Net_GetUrlExitFunc *m_exitQuoting;
+	int (*m_quotefunc)(void* closure, const char* data);
+	void* m_quoteclosure;
+	XP_Bool m_deliveryInProgress;    /* True while mail is being sent. */
+	XP_Bool m_attachmentInProgress;  /* True while attachments being
+										  saved. */
+	int m_pendingAttachmentsCount;
+
+	MSG_Deliver_Mode m_deliver_mode;  /* MSG_DelverNow, MSG_QueueForLater,
+									   * MSG_SaveAsDraft, MSG_SaveAsTemplate
+									   */
+
+    
+
+	XP_Bool m_cited;
+  
+	XP_Bool m_duplicatePost;		/* Whether we seem to be trying for a
+									   second time to post the same message.
+									   (If this is true, then we know to ignore
+									   435 errors from the newsserver.) */
+	HG92827
+
+	MSG_HTMLComposeAction m_htmlaction;
+	MSG_HTMLRecipients* m_htmlrecip;
+
+	int m_status;
+	// I'm sure this isn't what Terry had in mind... // ### dmb
+	MSG_HEADER_SET m_visible_headers;
+
+	MSG_NewsHost* m_host;		// Which newshost we're posting to.  This is
+								// lazily evaluated, so a NULL does necessarily
+								// mean we have no news host specified.
+
+	XP_Bool m_closeAfterSave;
+
+	XP_Bool m_haveQuoted;
+	XP_Bool m_haveAttachedVcard;
+
+	MSG_CompositionPaneCallbacks m_callbacks;
+	void* m_callbackclosure;
+	int m_lineWidth; // for quoting plain text to html then convert back
+						 // to plain text
+};
+
+
+#endif /* _MsgCPane_H_ */
diff --git a/mozilla/lib/mailto/msgglue.cpp b/mozilla/lib/mailto/msgglue.cpp
new file mode 100644
index 00000000000..91004a80444
--- /dev/null
+++ b/mozilla/lib/mailto/msgglue.cpp
@@ -0,0 +1,834 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "rosetta.h"
+#include "msg.h"
+#include "msgcom.h"
+#include "error.h"
+#include "client.h"
+#include "xpgetstr.h"
+#include "msgcpane.h"
+#include "msgprefs.h"
+#include "msgmast.h"
+#include "msgcflds.h"
+#include "shist.h"
+#include "msgppane.h"
+#include "mime.h"
+#include "msgbg.h"
+#include "prefapi.h"
+#include "msgurlq.h"
+#include "msgsend.h"
+#include "pw_public.h"
+#include HG99874
+
+extern "C"
+{
+	extern int MK_OUT_OF_MEMORY;
+	extern int MK_MSG_ID_NOT_IN_FOLDER;
+	extern int MK_MSG_CANT_OPEN;
+	extern int MK_MSG_INBOX_L10N_NAME;
+	extern int MK_MSG_OUTBOX_L10N_NAME;
+	extern int MK_MSG_OUTBOX_L10N_NAME_OLD;
+	extern int MK_MSG_TRASH_L10N_NAME;
+	extern int MK_MSG_DRAFTS_L10N_NAME;
+	extern int MK_MSG_SENT_L10N_NAME;
+	extern int MK_MSG_TEMPLATES_L10N_NAME;
+	extern int XP_MSG_IMAP_ACL_FULL_RIGHTS;
+	extern int XP_MSG_IMAP_PERSONAL_FOLDER_TYPE_NAME;
+	extern int XP_MSG_IMAP_PERSONAL_FOLDER_TYPE_DESCRIPTION;
+}
+
+#ifndef IMAP4_PORT_SSL_DEFAULT 
+#define IMAP4_PORT_SSL_DEFAULT 993 /* use a separate port for imap4 over ssl */
+#endif
+
+#if defined(XP_MAC) && defined (__MWERKS__)
+#pragma require_prototypes off
+#endif
+
+extern "C"
+int ConvertMsgErrToMKErr(uint32 err); // ### Need to get from a header file...
+
+
+inline MSG_CompositionPane* CastCompositionPane(MSG_Pane* pane) {
+  XP_ASSERT(pane && pane->GetPaneType() == MSG_COMPOSITIONPANE);
+  return (MSG_CompositionPane*) pane;
+}
+
+extern "C" MSG_Pane* MSG_FindPane(MWContext* context, MSG_PaneType type) {
+  return MSG_Pane::FindPane(context, type, FALSE);
+}
+
+extern "C" XP_Bool
+MSG_RequiresMailWindow (const char *) { return FALSE; }
+extern "C" XP_Bool
+MSG_RequiresNewsWindow (const char *) { return FALSE; }
+
+/* If this URL requires a particular kind of window, and this is not
+   that kind of window, then we need to find or create one.
+ */
+XP_Bool msg_NewWindowRequired (MWContext *context, const char *url)
+{
+  if (!context) 
+	  return TRUE;
+  if (context->type == MWContextSearch || context->type == MWContextPrint || context->type == MWContextBiff) 
+	  return FALSE;
+
+  /* Search URLs always run in the pane they started in */
+  if (!XP_STRNCASECMP(url, "search-libmsg:", 14))
+	  return FALSE;
+
+  // If we can figure out the content type, and there is no converter,
+  // return FALSE so we'll run the save as url in our window instead
+  // of creating an empty browser window.
+  char *contentType = MimeGetURLContentType(context, url);
+  if (contentType && !NET_HaveConverterForMimeType(contentType))
+	  return FALSE;
+
+  /* This is not a browser window, and one is required. */
+  if (context->type != MWContextBrowser && context->type != MWContextPane && MSG_RequiresBrowserWindow(url))
+	  return TRUE;
+
+    return FALSE; /*!msgPane && threadPane; */	// if msgPane is NULL, but we have a thread pane, return FALSE because we have the wrong window.
+}
+
+extern "C" XP_Bool MSG_NewWindowRequiredForURL (MWContext *context, URL_Struct *urlStruct)
+{
+	if (urlStruct->open_new_window_specified)
+		return urlStruct->open_new_window;
+
+	if (context->type != MWContextBrowser && !strncasecomp (urlStruct->address, "about:", 6) && !urlStruct->internal_url
+		&& strncasecomp(urlStruct->address, "about:editfilenew", 17))
+		return TRUE;
+
+	return msg_NewWindowRequired(context, urlStruct->address);
+}
+
+extern "C"
+{
+	void MSG_InitMsgLib(void) { } ;
+}
+
+extern "C" MSG_Master* MSG_InitializeMail(MSG_Prefs* prefs) 
+{
+	MSG_Master *master = prefs->GetMasterForBiff();
+	if (master)
+		return (master);		// already initialized
+	
+	MSG_InitMsgLib();			// make sure db code is initialized
+
+	master = new MSG_Master(prefs);
+	prefs->SetMasterForBiff(master);
+	return master;
+}
+
+
+extern "C" MSG_Pane* MSG_CreateProgressPane (MWContext *context,
+										 MSG_Master *master,
+										 MSG_Pane *parentPane)
+{
+	return new MSG_ProgressPane(context, master, parentPane);
+}
+
+extern "C" MSG_Pane* MSG_CreateCompositionPane(MWContext* context,
+											   MWContext* old_context,
+											   MSG_Prefs* prefs,
+											   MSG_CompositionFields* fields,
+											   MSG_Master* master)
+{
+	return new MSG_CompositionPane(context, old_context, prefs, fields, master);
+}
+
+extern "C" int
+MSG_SetCompositionPaneCallbacks(MSG_Pane* composepane,
+								MSG_CompositionPaneCallbacks* callbacks,
+								void* closure)
+{
+	return CastCompositionPane(composepane)->SetCallbacks(callbacks, closure);
+}
+
+extern "C" MSG_Pane* MSG_CreateCompositionPaneNoInit(MWContext* context,
+													 MSG_Prefs* prefs,
+													 MSG_Master* master)
+{
+	return new MSG_CompositionPane(context, prefs, master);
+}
+
+
+extern "C" int MSG_InitializeCompositionPane(MSG_Pane* comppane,
+											 MWContext* old_context,
+											 MSG_CompositionFields* fields)
+{
+	return CastCompositionPane(comppane)->Initialize(old_context, fields);
+}
+
+
+extern "C" void MSG_SetFEData(MSG_Pane* pane, void* data) {
+  pane->SetFEData(data);
+}
+
+extern "C" void* MSG_GetFEData(MSG_Pane* pane) {
+  return pane->GetFEData();
+}
+
+extern "C" MSG_PaneType MSG_GetPaneType(MSG_Pane* pane) {
+  return pane->GetPaneType();
+}
+
+extern "C" MWContext* MSG_GetContext(MSG_Pane* pane) {
+	if (pane)
+		return pane->GetContext();
+	else
+		return NULL;
+}
+
+extern "C" MSG_Prefs* MSG_GetPrefs(MSG_Pane* pane) {
+  return pane->GetPrefs();
+}
+
+extern "C" void MSG_WriteNewProfileAge() {
+	PREF_SetIntPref("mailnews.profile_age", MSG_IMAP_CURRENT_START_FLAGS);
+}
+
+extern "C" MSG_Prefs* MSG_GetPrefsForMaster(MSG_Master* master) {
+  return master->GetPrefs();
+}
+
+extern "C" int MSG_GetURL(MSG_Pane *pane, URL_Struct* url)
+{
+	XP_ASSERT(pane && url);
+	if (pane && url)
+	{
+		url->msg_pane = pane;
+		return msg_GetURL(pane->GetContext(), url, FALSE);
+	}
+	else
+		return 0;
+}
+
+extern "C" void MSG_Command(MSG_Pane* pane, MSG_CommandType command,
+							MSG_ViewIndex* indices, int32 numindices) {
+	int status =
+		ConvertMsgErrToMKErr(pane->DoCommand(command, indices, numindices));
+	if (status < 0) {
+		char* pString = XP_GetString(status);
+		if (pString && strlen(pString))
+			FE_Alert(pane->GetContext(), pString);
+	}
+}
+
+extern "C" int MSG_CommandStatus(MSG_Pane* pane,
+								 MSG_CommandType command,
+								 MSG_ViewIndex* indices, int32 numindices,
+								 XP_Bool *selectable_p,
+								 MSG_COMMAND_CHECK_STATE *selected_p,
+								 const char **display_string,
+								 XP_Bool *plural_p) {
+  return ConvertMsgErrToMKErr(pane->GetCommandStatus(command,
+													 indices, numindices,
+													 selectable_p,
+													 selected_p,
+													 display_string,
+													 plural_p));
+}
+
+extern "C" int MSG_SetToggleStatus(MSG_Pane* pane, MSG_CommandType command,
+								   MSG_ViewIndex* indices, int32 numindices,
+								   MSG_COMMAND_CHECK_STATE value) {
+  return ConvertMsgErrToMKErr(pane->SetToggleStatus(command,
+													indices, numindices,
+													value));
+}
+
+
+extern "C" MSG_COMMAND_CHECK_STATE MSG_GetToggleStatus(MSG_Pane* pane,
+													   MSG_CommandType command,
+													   MSG_ViewIndex* indices,
+													   int32 numindices)
+{
+  return pane->GetToggleStatus(command, indices, numindices);
+}
+
+
+extern "C" void MSG_DestroyMaster (MSG_Master* master) {
+	delete master;
+}
+
+
+extern "C" void MSG_DestroyPane(MSG_Pane* pane) {
+  delete pane;
+}
+
+
+extern "C" void MSG_SetLineWidth(MSG_Pane* composepane, int width)
+{
+	CastCompositionPane(composepane)->SetLineWidth(width);
+}
+
+extern "C" int MSG_SetHTMLAction(MSG_Pane* composepane,
+								 MSG_HTMLComposeAction action)
+{
+	return CastCompositionPane(composepane)->SetHTMLAction(action);
+}
+
+extern "C" MSG_HTMLComposeAction MSG_GetHTMLAction(MSG_Pane* composepane)
+{
+	return CastCompositionPane(composepane)->GetHTMLAction();
+}
+
+extern "C" int MSG_PutUpRecipientsDialog(MSG_Pane* composepane, void *pWnd)
+{
+	return CastCompositionPane(composepane)->PutUpRecipientsDialog(pWnd);
+}
+
+extern "C" int MSG_ResultsRecipients(MSG_Pane* composepane,
+									 XP_Bool cancelled,
+									 int32* nohtml,
+									 int32* htmlok)
+{
+	return CastCompositionPane(composepane)->ResultsRecipients(cancelled,
+															   nohtml,
+															   htmlok);
+}
+
+extern "C" XP_Bool MSG_GetHTMLMarkup(MSG_Pane * composepane) {
+    return CastCompositionPane(composepane)->GetHTMLMarkup();
+}
+
+extern "C" XP_Bool MSG_DeliveryInProgress(MSG_Pane * composepane) {
+    if (!composepane || MSG_COMPOSITIONPANE != MSG_GetPaneType(composepane))
+        return FALSE;
+    return CastCompositionPane(composepane)->DeliveryInProgress();
+}
+
+extern "C" void MSG_SetHTMLMarkup(MSG_Pane * composepane, XP_Bool flag) {
+    CastCompositionPane(composepane)->SetHTMLMarkup(flag);
+}
+
+extern "C" const char *MSG_GetMessageIdFromState(void *state)
+{
+	if (state)
+	{
+		MSG_SendMimeDeliveryState *deliveryState =
+			(MSG_SendMimeDeliveryState *) state;
+		return deliveryState->m_fields->GetMessageId();
+	}
+	return NULL;
+}
+
+extern "C" XP_Bool MSG_IsSaveDraftDeliveryState(void *state)
+{
+	if (state)
+		return (((MSG_SendMimeDeliveryState *) state)->m_deliver_mode ==
+				MSG_SaveAsDraft);
+	return FALSE;
+}
+
+extern "C" int MSG_SetPreloadedAttachments ( MSG_Pane *composepane,
+											 MWContext *context,
+											 void *attachmentData,
+											 void *attachments,
+											 int attachments_count )
+{
+  return ConvertMsgErrToMKErr ( CastCompositionPane(
+								  composepane)->SetPreloadedAttachments (
+									context, 
+									(MSG_AttachmentData  *) attachmentData,
+									(MSG_AttachedFile *) attachments,
+									attachments_count) );
+}
+
+extern "C" MSG_Prefs* MSG_CreatePrefs() {
+  return new MSG_Prefs();
+}
+
+extern "C" void MSG_DestroyPrefs(MSG_Prefs* prefs) {
+  delete prefs;
+}
+
+extern "C" XP_Bool
+MSG_GetNoInlineAttachments(MSG_Prefs* prefs)
+{
+	return prefs->GetNoInlineAttachments();
+}
+
+extern "C" XP_Bool MSG_GetAutoQuoteReply(MSG_Prefs* prefs) {
+  return prefs->GetAutoQuoteReply();
+}
+
+extern MSG_Pane*
+MSG_GetParentPane(MSG_Pane* progresspane)
+{
+	return progresspane->GetParentPane();
+}
+
+
+extern "C" MSG_Pane*
+MSG_MailDocument (MWContext *old_context)
+{
+  // For backwards compatability.
+  return MSG_MailDocumentURL(old_context,NULL);
+}
+
+extern "C" MSG_Pane*
+MSG_MailDocumentURL (MWContext *old_context,const char *url)
+{
+	// Don't allow a compose window to be created if the user hasn't 
+	// specified an email address
+	const char *real_addr = FE_UsersMailAddress();
+	if (MISC_ValidateReturnAddress(old_context, real_addr) < 0)
+		return NULL;
+
+	MSG_CompositionFields* fields = new MSG_CompositionFields();
+	if (!fields) return NULL;	// Out of memory.
+
+	/* It's so cool that there are half a dozen entrypoints to
+	   composition-window-creation. */
+	HG62239
+
+  /* If url is not specified, grab current history entry. */
+  if (!url) {
+	  History_entry *h =
+		  (old_context ? SHIST_GetCurrent (&old_context->hist) : 0);
+	  if (h && h->address && *h->address) {
+		  url = h->address;
+	  }
+  }
+#if 1 /* Do this if we want to attach the target of Mail Document by default */
+
+	if (url) {
+		fields->SetHeader(MSG_ATTACHMENTS_HEADER_MASK, url);
+	}
+#endif
+
+	if (old_context && old_context->title) {
+		fields->SetHeader(MSG_SUBJECT_HEADER_MASK, old_context->title);
+	}
+
+	if (url) {
+		fields->SetBody(url);
+	}
+
+	XP_Bool prefBool = FALSE;
+	PREF_GetBoolPref("mail.attach_vcard",&prefBool);
+	fields->SetAttachVCard(prefBool);
+
+	MSG_CompositionPane* comppane =	(MSG_CompositionPane*) 
+	  FE_CreateCompositionPane(old_context, fields, NULL, MSG_DEFAULT);
+	if (!comppane) {
+		delete fields;
+		return NULL;
+	}
+	
+	HG42420
+	XP_ASSERT(comppane->GetPaneType() == MSG_COMPOSITIONPANE);
+	return comppane;
+}
+
+
+extern "C" MSG_Pane*
+MSG_Mail (MWContext *old_context)
+{
+	MSG_CompositionFields* fields = new MSG_CompositionFields();
+	if (!fields) return NULL;	// Out of memory.
+
+	/* It's so cool that there are half a dozen entrypoints to
+	   composition-window-creation. */
+	HG42933
+
+	XP_Bool prefBool = FALSE;
+	PREF_GetBoolPref("mail.attach_vcard",&prefBool);
+	fields->SetAttachVCard(prefBool);
+
+	MSG_CompositionPane* comppane =	(MSG_CompositionPane*) 
+	  FE_CreateCompositionPane(old_context, fields, NULL, MSG_DEFAULT);
+	if (!comppane) {
+		delete fields;
+		return NULL;
+	}
+	
+	HG52965
+	XP_ASSERT(comppane->GetPaneType() == MSG_COMPOSITIONPANE);
+	return comppane;
+}
+
+extern "C" void
+MSG_ResetUUEncode(MSG_Pane *pane)
+{
+	CastCompositionPane(pane)->m_confirmed_uuencode_p = FALSE;
+}
+
+extern "C" MSG_CompositionFields*
+MSG_CreateCompositionFields (
+					const char *from,
+					const char *reply_to,
+					const char *to,
+					const char *cc,
+					const char *bcc,
+					const char *fcc,
+					const char *newsgroups,
+					const char *followup_to,
+					const char *organization,
+					const char *subject,
+					const char *references,
+					const char *other_random_headers,
+					const char *priority,
+					const char *attachment,
+					const char *newspost_url
+					HG66663
+					)
+{
+	MSG_CompositionFields* fields = new MSG_CompositionFields();
+
+	fields->SetFrom(from);
+	fields->SetReplyTo(reply_to);
+	fields->SetTo(to);
+	fields->SetCc(cc);
+	fields->SetBcc(bcc);
+	fields->SetFcc(fcc);
+	fields->SetNewsgroups(newsgroups);
+	fields->SetFollowupTo(followup_to);
+	fields->SetOrganization(organization);
+	fields->SetSubject(subject);
+	fields->SetReferences(references);
+	fields->SetOtherRandomHeaders(other_random_headers);
+	fields->SetAttachments(attachment);
+	fields->SetNewspostUrl(newspost_url);
+	fields->SetPriority(priority);
+	HG65243
+	return fields;
+}
+
+extern "C" void
+MSG_DestroyCompositionFields(MSG_CompositionFields *fields)
+{
+	delete fields;
+}
+
+extern "C" void
+MSG_SetCompFieldsReceiptType(MSG_CompositionFields *fields,
+							 int32 type)
+{
+	fields->SetReturnReceiptType(type);
+}
+
+extern "C" int32
+MSG_GetCompFieldsReceiptType(MSG_CompositionFields *fields)
+{
+	return fields->GetReturnReceiptType();
+}
+
+extern "C" int
+MSG_SetCompFieldsBoolHeader(MSG_CompositionFields *fields,
+							MSG_BOOL_HEADER_SET header,
+							XP_Bool bValue)
+{
+	return fields->SetBoolHeader(header, bValue);
+}
+
+extern "C" XP_Bool
+MSG_GetCompFieldsBoolHeader(MSG_CompositionFields *fields,
+							MSG_BOOL_HEADER_SET header)
+{
+	return fields->GetBoolHeader(header);
+}
+
+extern "C" XP_Bool
+MSG_GetForcePlainText(MSG_CompositionFields* fields)
+{
+	return fields->GetForcePlainText();
+}
+
+extern "C" MSG_Pane*
+MSG_ComposeMessage (MWContext *old_context,
+					const char *from,
+					const char *reply_to,
+					const char *to,
+					const char *cc,
+					const char *bcc,
+					const char *fcc,
+					const char *newsgroups,
+					const char *followup_to,
+					const char *organization,
+					const char *subject,
+					const char *references,
+					const char *other_random_headers,
+					const char *priority,
+					const char *attachment,
+					const char *newspost_url,
+					const char *body,
+					HG00282
+					XP_Bool force_plain_text,
+					const char* html_part
+					)
+{
+	// Don't allow a compose window to be created if the user hasn't 
+	// specified an email address
+	const char *real_addr = FE_UsersMailAddress();
+	if (MISC_ValidateReturnAddress(old_context, real_addr) < 0)
+		return NULL;
+	
+
+	HG02872
+
+
+	MSG_CompositionFields* fields =
+		MSG_CreateCompositionFields(from, reply_to, to, cc, bcc,
+									fcc, newsgroups, followup_to,
+									organization, subject, references,
+									other_random_headers, priority, attachment,
+									newspost_url HG65241);
+
+	fields->SetForcePlainText(force_plain_text);
+	fields->SetHTMLPart(html_part);
+	fields->SetDefaultBody(body);
+
+	XP_Bool prefBool = FALSE;
+	PREF_GetBoolPref("mail.attach_vcard",&prefBool);
+	fields->SetAttachVCard(prefBool);
+
+	MSG_CompositionPane* comppane =	(MSG_CompositionPane*) 
+	  FE_CreateCompositionPane(old_context, fields, NULL, MSG_DEFAULT);
+	if (!comppane) {
+		delete fields;
+		return NULL;
+	}
+	
+	XP_ASSERT(comppane->GetPaneType() == MSG_COMPOSITIONPANE);
+	return comppane;
+}
+
+
+extern "C" XP_Bool
+MSG_ShouldAutoQuote(MSG_Pane* comppane)
+{
+	return CastCompositionPane(comppane)->ShouldAutoQuote();
+}
+
+extern "C" const char*
+MSG_GetCompHeader(MSG_Pane* comppane, MSG_HEADER_SET header)
+{
+	return CastCompositionPane(comppane)->GetCompHeader(header);
+}
+
+
+extern "C" int
+MSG_SetCompHeader(MSG_Pane* comppane, MSG_HEADER_SET header, const char* value)
+{
+	return CastCompositionPane(comppane)->SetCompHeader(header, value);
+}
+
+
+extern "C" XP_Bool
+MSG_GetCompBoolHeader(MSG_Pane* comppane, MSG_BOOL_HEADER_SET header)
+{
+	return CastCompositionPane(comppane)->GetCompBoolHeader(header);
+}
+
+
+extern "C" int
+MSG_SetCompBoolHeader(MSG_Pane* comppane, MSG_BOOL_HEADER_SET header, XP_Bool bValue)
+{
+	return CastCompositionPane(comppane)->SetCompBoolHeader(header, bValue);
+}
+
+
+extern "C" const char*
+MSG_GetCompBody(MSG_Pane* comppane)
+{
+	return CastCompositionPane(comppane)->GetCompBody();
+}
+
+
+extern "C" int
+MSG_SetCompBody(MSG_Pane* comppane, const char* value)
+{
+	return CastCompositionPane(comppane)->SetCompBody(value);
+}
+
+
+
+extern "C" void
+MSG_QuoteMessage(MSG_Pane* comppane,
+				 int (*func)(void* closure, const char* data),
+				 void* closure)
+{
+	CastCompositionPane(comppane)->QuoteMessage(func, closure);
+}
+
+
+extern "C" int
+MSG_SanityCheck(MSG_Pane* comppane, int skippast)
+{
+	return CastCompositionPane(comppane)->SanityCheck(skippast);
+}
+
+
+
+
+extern "C" const char*
+MSG_GetAssociatedURL(MSG_Pane* comppane)
+{
+  return CastCompositionPane(comppane)->GetDefaultURL();
+}
+
+
+extern "C" void
+MSG_MailCompositionAllConnectionsComplete(MSG_Pane* comppane)
+{
+  CastCompositionPane(comppane)->MailCompositionAllConnectionsComplete();
+}
+
+
+extern "C" int
+MSG_PastePlaintextQuotation(MSG_Pane* comppane, const char* string)
+{
+	return CastCompositionPane(comppane)->PastePlaintextQuotation(string);
+}
+
+extern "C" char* 
+MSG_UpdateHeaderContents(MSG_Pane* comppane,
+						 MSG_HEADER_SET header,
+						 const char* value)
+{
+  return CastCompositionPane(comppane)->UpdateHeaderContents(header, value);
+}
+
+
+
+extern "C" int 
+MSG_SetAttachmentList(MSG_Pane* comppane,
+					  struct MSG_AttachmentData* list)
+{
+  return CastCompositionPane(comppane)->SetAttachmentList(list);
+}
+
+
+extern "C" const struct MSG_AttachmentData*
+MSG_GetAttachmentList(MSG_Pane* comppane)
+{
+  return CastCompositionPane(comppane)->GetAttachmentList();
+}
+
+
+extern "C" MSG_HEADER_SET MSG_GetInterestingHeaders(MSG_Pane* comppane)
+{
+	return CastCompositionPane(comppane)->GetInterestingHeaders();
+}
+
+
+
+
+
+
+
+
+extern "C" XP_Bool MSG_IsDuplicatePost(MSG_Pane* comppane) {
+	// if we're sending from the outbox, we don't have a compostion pane, so guess NO.
+	return (comppane->GetPaneType() == MSG_COMPOSITIONPANE) 
+		? CastCompositionPane(comppane)->IsDuplicatePost()
+		: FALSE;
+}
+
+
+extern "C" void
+MSG_ClearCompositionMessageID(MSG_Pane* comppane)
+{
+	if (comppane->GetPaneType() == MSG_COMPOSITIONPANE)
+		CastCompositionPane(comppane)->ClearCompositionMessageID();
+}
+
+
+extern "C" const char*
+MSG_GetCompositionMessageID(MSG_Pane* comppane)
+{
+	return (comppane->GetPaneType() == MSG_COMPOSITIONPANE)
+		? CastCompositionPane(comppane)->GetCompositionMessageID()
+		: 0;
+}
+
+/* What are we going to do about error messages and codes? Internally, we'd
+ like a nice error range system, but we need to export errors too... ###
+ */
+extern "C"
+int ConvertMsgErrToMKErr(MsgERR err)
+{
+	switch (err)
+	{
+	case eSUCCESS:
+		return 0;
+	case eOUT_OF_MEMORY:
+		return MK_OUT_OF_MEMORY;
+	case eID_NOT_FOUND:
+		return MK_MSG_ID_NOT_IN_FOLDER;
+	case eUNKNOWN:
+		return -1;
+	}
+	// Well, most likely, someone returned a negative number that
+	// got cast somewhere into a MsgERR.  If so, just return that value.
+	if (int(err) < 0) return int(err);
+	// Punt, and return the generic unknown error.
+	return -1;
+}
+
+extern "C" 
+int MSG_RetrieveStandardHeaders(MSG_Pane * pane, MSG_HeaderEntry ** return_list)
+{
+  XP_ASSERT(pane && pane->GetPaneType() == MSG_COMPOSITIONPANE);
+  return CastCompositionPane(pane)->RetrieveStandardHeaders(return_list);
+}
+
+extern "C"
+void MSG_SetHeaderEntries(MSG_Pane * pane,MSG_HeaderEntry * in_list,int count)
+{
+  XP_ASSERT(pane && pane->GetPaneType() == MSG_COMPOSITIONPANE);
+  CastCompositionPane(pane)->SetHeaderEntries(in_list,count);
+}
+
+extern "C"
+void MSG_ClearComposeHeaders(MSG_Pane * pane)
+{
+  XP_ASSERT(pane && pane->GetPaneType() == MSG_COMPOSITIONPANE);
+  CastCompositionPane(pane)->ClearComposeHeaders();
+}
+
+extern "C"
+int MSG_ProcessBackground(URL_Struct* urlstruct)
+{
+	return msg_Background::ProcessBackground(urlstruct);
+}
+
+extern "C" XP_Bool MSG_RequestForReturnReceipt(MSG_Pane *pane)
+{
+	return pane->GetRequestForReturnReceipt();
+}
+
+extern "C" XP_Bool MSG_SendingMDNInProgress(MSG_Pane *pane)
+{
+	return pane->GetSendingMDNInProgress();
+}
+
+//
+// NET_IsOffline() is declared in net.h, but libnet doesn't define it
+// publically anywhere.  There's one in network/protocols/nntp/mknews.c
+// but it's declared MODULE_PRIVATE and we can't see it from here,
+// at least not in MOZ_MAIL_COMPOSE mode.
+//
+#ifndef MOZ_MAIL_NEWS
+XP_Bool NET_IsOffline() { return FALSE; }
+#endif /* MOZ_MAIL_NEWS */
diff --git a/mozilla/lib/mailto/msghdr.h b/mozilla/lib/mailto/msghdr.h
new file mode 100644
index 00000000000..596b5944351
--- /dev/null
+++ b/mozilla/lib/mailto/msghdr.h
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgHdr_H_
+#define _MsgHdr_H_
+
+const int kMaxSubject = 160;
+const int kMaxAuthor = 160;
+const int kMaxRecipient = 80;
+const int kMaxMsgIdLen = 80;
+const int kMaxReferenceLen = 10 * kMaxMsgIdLen;
+
+typedef int32 MsgFlags;	// try to keep flags view is going to care about
+						// in the first byte, so we can copy the flags over directly
+
+const int32	kIsRead			= 0x1;	// same as MSG_FLAG_READ
+const int32	kReplied		= 0x2;	// same as MSG_FLAG_REPLIED
+const int32	kMsgMarked		= 0x4;	// same as MSG_FLAG_MARKED - (kMarked collides with IMAP)
+const int32	kHasChildren	= 0x8;  // no equivalent (shares space with FLAG_EXPUNGED)
+const int32	kIsThread		= 0x10; // !!shares space with MSG_FLAG_HAS_RE
+const int32	kElided			= 0x20; // same as MSG_FLAG_ELIDED
+const int32	kExpired		= 0x40; // same as MSG_FLAG_EXPIRED
+const int32	kOffline		= 0x80; // this message has been downloaded
+const int32	kWatched		= 0x100;
+const int32	kSenderAuthed	= 0x200; // same as MSG_FLAG_SENDER_AUTHED
+const int32	kExpunged		= 0x400;  // NOT same value as MSG_FLAG_EXPUNGED
+const int32	kHasRe			= 0x800;  // Not same values as MSG_FLAG_HAS_RE
+const int32	kForwarded		= 0x1000; // this message has been forward (mail only)
+const int32	kIgnored		= 0x2000; // this message is ignored
+
+const int32	kMDNNeeded		= 0x4000; // this message needs MDN report
+const int32 kMDNSent		= 0x8000; // MDN report has been Sent
+
+const int32 kNew			= 0x10000; // used for status, never stored in db.
+const int32	kAdded			= 0x20000; // Just added to db - used in 
+							  // notifications, never set in msgHdr.
+
+const int32 kTemplate       = 0x40000; // this message is a template
+
+const int32 kDirty			= 0x80000;
+const int32 kPartial		= 0x100000;	// NOT same value as MSG_FLAG_PARTIAL
+const int32 kIMAPdeleted	= 0x200000;	// same value as MSG_FLAG_IMAP_DELETED
+const int32 kHasAttachment	= 0x10000000;	// message has attachments
+
+const int32	kSameAsMSG_FLAG  = kHasAttachment|kIsRead|kMsgMarked|kExpired|kElided|kSenderAuthed|kReplied|kOffline|kForwarded|kWatched|kIMAPdeleted;
+const int32	kMozillaSameAsMSG_FLAG  = kIsRead|kMsgMarked|kExpired|kElided|kSenderAuthed|kReplied|kOffline|kForwarded|kWatched|kIMAPdeleted;
+const int32	kExtraFlags		= 0xFF;
+
+struct MessageHdrStruct
+{
+	MessageKey   m_threadId; 
+	MessageKey	m_messageKey; 	
+	char		m_subject[kMaxSubject];
+	char		m_author[kMaxAuthor];
+	char		m_messageId[kMaxMsgIdLen];
+	char		m_references[kMaxReferenceLen]; 
+	char		m_recipients[kMaxRecipient];
+	time_t 		m_date;                         
+	uint32		m_messageSize;	// lines for news articles, bytes for mail messages
+	uint32		m_flags;
+	uint16		m_numChildren;		// for top-level threads
+	uint16		m_numNewChildren;	// for top-level threads
+	char		m_level;		// indentation level
+	MSG_PRIORITY m_priority;
+public:
+	void SetSubject(const char * subject);
+	void SetAuthor(const char * author);
+	void SetMessageID(const char * msgID);
+	void SetReferences(const char * referencesStr);
+	void SetDate(const char * date);
+	void SetLines(uint32 lines);
+	void SetSize(uint32 size);
+	const char *GetReference(const char *nextRef, char *reference);
+	static void StripMessageId(const char *msgID, char *outMsgId, int msgIdLen);
+};
+
+#endif _MsgHdr_H_
diff --git a/mozilla/lib/mailto/msgmast.cpp b/mozilla/lib/mailto/msgmast.cpp
new file mode 100644
index 00000000000..6f154f14165
--- /dev/null
+++ b/mozilla/lib/mailto/msgmast.cpp
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define FORCE_PR_LOG /* Allow logging in the release build */
+
+#include "rosetta.h"
+#include "msg.h"
+#include "errcode.h"
+
+#include "msgmast.h"
+#include "msgprefs.h" 
+#include "prtime.h"
+#include "prefapi.h"
+#include "rosetta.h"
+#include HG99877
+#include "msgurlq.h"
+#include "xpgetstr.h"
+#include "prlog.h"
+#include "nslocks.h"
+#include "pw_public.h"
+
+extern "C" {
+	extern int MK_OUT_OF_MEMORY;
+	extern int MK_MSG_SET_HTML_NEWSGROUP_HEIRARCHY_CONFIRM;
+	extern int MK_MSG_FOLDER_ALREADY_EXISTS;
+	extern int MK_MSG_INBOX_L10N_NAME;
+	extern int MK_IMAP_UPGRADE_WAIT_WHILE_UPGRADE;
+	extern int MK_IMAP_UPGRADE_PROMPT_QUESTION;
+	extern int MK_IMAP_UPGRADE_CUSTOM;
+	extern int MK_POP3_USERNAME_UNDEFINED;
+	extern int XP_PASSWORD_FOR_POP3_USER;
+	extern int XP_MSG_CACHED_PASSWORD_NOT_MATCHED;
+	extern int XP_MSG_PASSWORD_FAILED;
+	extern int MK_POP3_PASSWORD_UNDEFINED;
+}
+
+#ifndef NSPR20
+PR_LOG_DEFINE(IMAP);
+#else
+PRLogModuleInfo *IMAP;
+#endif
+
+MSG_Master::MSG_Master(MSG_Prefs* prefs)
+{
+	XP_Bool purgeBodiesByAge;
+	int32		purgeMethod;
+	int32		daysToKeepHdrs;
+	int32		headersToKeep;
+	int32		daysToKeepBodies;
+
+	m_prefs = prefs;
+	m_prefs->AddNotify(this);
+	
+#ifndef NSPR20
+	PR_LogInit(&IMAPLog);
+#else
+	IMAP = PR_NewLogModule("IMAP");
+#endif
+	// on the mac, use this java script preference
+	// as an alternate to setenv
+	XP_Bool imapIOlogging;
+	PREF_GetBoolPref("imap.io.mac.logging",	    &imapIOlogging); 
+	if (imapIOlogging)
+		IMAP->level = PR_LOG_ALWAYS;
+
+}
+
+MSG_Master::~MSG_Master()
+{
+	m_prefs->RemoveNotify(this);
+}
+
+
+void
+MSG_Master::SetFirstPane(MSG_Pane* pane)
+{
+	m_firstpane = pane;
+}
+
+
+MSG_Pane*
+MSG_Master::GetFirstPane()
+{
+	return m_firstpane;
+}
+
+void MSG_Master::NotifyPrefsChange(NotifyCode )
+{
+}
diff --git a/mozilla/lib/mailto/msgmast.h b/mozilla/lib/mailto/msgmast.h
new file mode 100644
index 00000000000..c8d2c496358
--- /dev/null
+++ b/mozilla/lib/mailto/msgmast.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgMast_H_
+#define _MsgMast_H_
+
+#include "errcode.h"
+#include "msgprnot.h"
+
+class MSG_Prefs;
+class MSG_Pane;
+class msg_HostTable;
+
+typedef void * pw_ptr;
+
+class MSG_Master : public MSG_PrefsNotify {
+public:
+	MSG_Master(MSG_Prefs* prefs);
+	virtual ~MSG_Master();
+
+	MSG_Prefs* GetPrefs() {return m_prefs;}
+
+	void SetFirstPane(MSG_Pane* pane);
+	MSG_Pane* GetFirstPane();
+
+	MSG_Pane *FindPaneOfType(MSG_FolderInfo *id, MSG_PaneType type) ;
+	MSG_Pane *FindPaneOfType(const char *url, MSG_PaneType type) ;
+	
+	MSG_Pane *FindFirstPaneOfType(MSG_PaneType type);
+	MSG_Pane *FindNextPaneOfType(MSG_Pane *startHere, MSG_PaneType type);
+
+	MSG_NewsHost* FindHost(const char* name, XP_Bool isSecure,
+						   int32 port); // If port is negative, then we will
+										// look for a ":portnum" as part of the
+										// name.  Otherwise, there had better
+										// not be a colon in the name.
+	MSG_NewsHost* GetDefaultNewsHost();
+
+	void NotifyPrefsChange(NotifyCode code);
+
+protected:
+
+private:
+	MSG_Prefs* m_prefs;
+	MSG_Pane* m_firstpane;
+};
+
+
+#endif /* _MsgMast_H_ */
diff --git a/mozilla/lib/mailto/msgmdn.cpp b/mozilla/lib/mailto/msgmdn.cpp
new file mode 100644
index 00000000000..69f27cc7b7a
--- /dev/null
+++ b/mozilla/lib/mailto/msgmdn.cpp
@@ -0,0 +1,885 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "msgmdn.h"
+#include "net.h"
+#include "xp_time.h"
+#include "prtime.h"
+#include "prtypes.h"
+#include "fe_proto.h"
+#include "msg.h"
+#include "msgpane.h"
+#include "prefapi.h"
+#include "intl_csi.h"
+#include "msgurlq.h"
+#include "gui.h"
+#include "msgprefs.h"
+#include "mkutils.h"
+#include "mktcp.h"
+#include "netutils.h"
+
+extern "C"
+{
+	extern int MK_MSG_MDN_DISPLAYED;
+	extern int MK_MSG_MDN_DISPATCHED;
+	extern int MK_MSG_MDN_PROCESSED;
+	extern int MK_MSG_MDN_DELETED;
+	extern int MK_MSG_MDN_DENIED;
+	extern int MK_MSG_MDN_FAILED;
+	extern int MK_MSG_MDN_WISH_TO_SEND;
+	extern int MK_OUT_OF_MEMORY;
+	extern int MK_MSG_DELIV_MAIL;
+	extern int MK_MDN_DISPLAYED_RECEIPT;
+	extern int MK_MDN_DISPATCHED_RECEIPT;
+	extern int MK_MDN_PROCESSED_RECEIPT;
+	extern int MK_MDN_DELETED_RECEIPT;
+	extern int MK_MDN_DENIED_RECEIPT;
+	extern int MK_MDN_FAILED_RECEIPT;
+}
+
+extern "C" char *mime_make_separator(const char *prefix);
+extern "C" char *msg_generate_message_id();
+extern "C" char *strip_continuations(char *original);
+
+#define MH_ALLOC_COPY(dst, src) \
+	do { dst = (char *) XP_ALLOC(src->length+1); *(dst+src->length)=0; \
+		 if (src->length) XP_MEMCPY(dst, src->value, src->length); } while (0)
+#define PUSH_N_FREE_STRING(p) \
+	do { if (p) { status = WriteString(p); PR_smprintf_free(p); p=0; \
+				   if (status<0) return status; } \
+		 else { return MK_OUT_OF_MEMORY; } } while (0)
+
+char DispositionTypes[7][16] = {
+	"displayed",
+	"dispatched",
+	"processed",
+	"deleted",
+	"denied",
+	"failed",
+	""
+};
+
+MSG_ProcessMdnNeededState::MSG_ProcessMdnNeededState(
+	EDisposeType intendedType,
+	MSG_Pane *pane,
+	MSG_FolderInfo *folder,
+	uint32 key,
+	MimeHeaders *srcHeaders,
+	XP_Bool autoAction)
+{
+	XP_ASSERT (srcHeaders && pane);
+	if (!srcHeaders || !pane) return;
+	m_disposeType = intendedType;
+	m_pane = pane;
+	m_autoAction = autoAction;
+
+	m_returnPath = MimeHeaders_get (srcHeaders, HEADER_RETURN_PATH, FALSE,
+									FALSE);
+	m_dispositionNotificationTo = 
+		MimeHeaders_get(srcHeaders, HEADER_DISPOSITION_NOTIFICATION_TO, FALSE,
+						FALSE); 
+	if (!m_dispositionNotificationTo)
+		m_dispositionNotificationTo =
+			MimeHeaders_get(srcHeaders, HEADER_RETURN_RECEIPT_TO, FALSE,
+							FALSE); 
+	m_date = MimeHeaders_get (srcHeaders, HEADER_DATE, FALSE, FALSE);
+	m_to = MimeHeaders_get (srcHeaders, HEADER_TO, FALSE, FALSE);
+	m_cc = MimeHeaders_get (srcHeaders, HEADER_CC, FALSE, FALSE);
+	m_subject = MimeHeaders_get (srcHeaders, HEADER_SUBJECT, FALSE, FALSE);
+	if (m_subject) strip_continuations(m_subject);
+	m_messageId = MimeHeaders_get (srcHeaders, HEADER_MESSAGE_ID, FALSE,
+								   FALSE);
+	m_originalRecipient = MimeHeaders_get (srcHeaders,
+										   HEADER_ORIGINAL_RECIPIENT, FALSE,
+										   FALSE);
+
+	m_all_headers = (char *) XP_ALLOC(srcHeaders->all_headers_fp + 1);
+	*(m_all_headers+srcHeaders->all_headers_fp)=0;
+	m_all_headers_size = srcHeaders->all_headers_fp;
+	XP_MEMCPY(m_all_headers, srcHeaders->all_headers,
+			  srcHeaders->all_headers_fp); 
+	InitAndProcess();
+}
+
+MSG_ProcessMdnNeededState::MSG_ProcessMdnNeededState(
+	EDisposeType intendedType,
+	MSG_Pane *pane,
+	MSG_FolderInfo *folder,
+	uint32 key,
+	struct message_header *returnPath,
+	struct message_header *dnt,
+	struct message_header *to,
+	struct message_header *cc,
+	struct message_header *subject,
+	struct message_header *date,
+	struct message_header *originalRecipient,
+	struct message_header *messageId,
+	char *allHeaders,
+	int32 allHeadersSize,
+	XP_Bool autoAction)
+{
+	XP_ASSERT (pane);
+	if (!pane) return;
+	m_disposeType = intendedType;
+	m_pane = pane;
+	m_autoAction = autoAction;
+
+	MH_ALLOC_COPY (m_returnPath, returnPath);
+	MH_ALLOC_COPY (m_dispositionNotificationTo, dnt);
+	MH_ALLOC_COPY (m_to, to);
+	MH_ALLOC_COPY (m_cc, cc);
+	MH_ALLOC_COPY (m_date, date);
+	MH_ALLOC_COPY (m_subject, subject);
+	MH_ALLOC_COPY (m_originalRecipient, originalRecipient);
+	MH_ALLOC_COPY (m_messageId, messageId);
+
+	m_all_headers = (char *) XP_ALLOC (allHeadersSize+1);
+	*(m_all_headers+allHeadersSize) = 0;
+	m_all_headers_size = allHeadersSize;
+	XP_MEMCPY(m_all_headers, allHeaders, allHeadersSize);
+	InitAndProcess();
+}
+
+void MSG_ProcessMdnNeededState::InitAndProcess()
+{
+	XP_Bool mdnEnabled = FALSE;
+
+	m_outFile = 0;
+	m_csid = 0;
+	m_msgFileName = 0;
+	m_mimeSeparator = 0;
+	m_autoSend = FALSE;
+	m_reallySendMdn = FALSE;
+	
+	PREF_GetBoolPref("mail.mdn.report.enabled", &mdnEnabled);
+
+	if (m_dispositionNotificationTo &&
+		mdnEnabled && 
+		ProcessSendMode() &&
+		ValidateReturnPath())
+		CreateMdnMsg();
+}
+
+int32 MSG_ProcessMdnNeededState::OutputAllHeaders()
+{	
+	XP_ASSERT(m_all_headers && m_all_headers_size);
+
+    // **** this is disgusting; I don't have a better way to deal with it 
+	char *buf = m_all_headers, *buf_end =
+		m_all_headers+m_all_headers_size;
+	char *start = buf, *end = buf;
+	int32 count = 0, ret = 0;
+	
+	while (buf < buf_end)
+	{
+		switch (*buf)
+		{
+		case 0:
+			if (*(buf+1) == LF)
+			{
+				// *buf = CR;
+				end = buf;
+			}
+			else if (*(buf+1) == 0)
+			{
+				// the case of message id
+				*buf = '>';
+			}
+			break;
+		case CR:
+			end = buf;
+			*buf = 0;
+			break;
+		case LF:
+			if (buf > start && *(buf-1) == 0)
+			{
+				start = buf + 1;
+				end = start;
+			}
+			else
+			{
+				end = buf;
+			}
+			break;
+		}
+		buf++;
+		
+		if (end > start && (*end == LF || !*end))
+		{
+			// strip out private X-Mozilla-Status header & X-Mozilla-Draft-Info
+			if (!XP_STRNCASECMP(start, X_MOZILLA_STATUS, X_MOZILLA_STATUS_LEN) ||
+				!XP_STRNCASECMP(start, X_MOZILLA_DRAFT_INFO, X_MOZILLA_DRAFT_INFO_LEN))
+			{ 
+				// make sure we are also copying the last null terminated char
+				// XP_MEMCPY(start, end+2, (buf_end+1) - (end+2));
+				// buf_end -= (end+2 - start);
+				// m_all_headers_size -= (end+2 - start);
+				if (*end == LF)
+					start = end+1;
+				else
+					start = end+2;
+			}
+			else
+			{
+				XP_Bool endIsLF = *end == LF;
+				if (endIsLF)
+					*end = 0;
+				char *wrapped_string = (char *) 
+					XP_WordWrap(m_csid, (unsigned char *) start, 72, FALSE);
+				if (wrapped_string)
+				{
+					ret = WriteString(wrapped_string);
+					if (ret < 0) return ret;
+					count += ret;
+					XP_FREEIF(wrapped_string);
+					ret = WriteString(CRLF);
+					if (ret < 0) return ret;
+					count += ret;
+				}
+				if (endIsLF)
+					start = end+1;
+				else 
+					start = end+2;
+			}
+			buf = start;
+			end = start;
+		}
+	}
+	return count;
+}
+
+
+MSG_ProcessMdnNeededState::~MSG_ProcessMdnNeededState()
+{
+	if (m_outFile)
+	{
+		XP_FileClose(m_outFile);
+		m_outFile = 0;
+	}
+
+	if (m_msgFileName)
+	{
+		XP_FileRemove(m_msgFileName, xpFileToPost);
+		XP_FREEIF(m_msgFileName);
+	}
+
+	XP_FREEIF(m_mimeSeparator);
+	XP_FREEIF(m_returnPath);
+	XP_FREEIF(m_dispositionNotificationTo);
+	XP_FREEIF(m_to);
+	XP_FREEIF(m_cc);
+	XP_FREEIF(m_subject);
+	XP_FREEIF(m_date);
+	XP_FREEIF(m_originalRecipient);
+	XP_FREEIF(m_messageId);
+	XP_FREEIF(m_all_headers);
+}
+
+int32
+MSG_ProcessMdnNeededState::WriteString( const char *str )
+{
+	XP_ASSERT (str);
+	if (!str) return 0;
+
+	int32 len = XP_STRLEN(str);
+	
+	return XP_FileWrite(str, len, m_outFile);
+}
+
+	
+XP_Bool
+MSG_ProcessMdnNeededState::MailAddrMatch( const char *addr1, const char *addr2)
+{
+	XP_Bool isMatched = TRUE;
+	const char *atSign1 = NULL, *atSign2 = NULL;
+	const char *lt = NULL, *local1 = NULL, *local2 = NULL;
+	const char *end1 = NULL, *end2 = NULL;
+
+	if (!addr1 || !addr2)
+		return FALSE;
+
+	lt = XP_STRCHR(addr1, '<');
+	if (!lt)
+		local1 = addr1;
+	else
+		local1 = lt+1;
+
+	lt = XP_STRCHR(addr2, '<');
+	if (!lt)
+		local2 = addr2;
+	else
+		local2 = lt+1;
+
+	end1 = XP_STRCHR(local1, '>');
+	if (!end1)
+		end1 = addr1 + XP_STRLEN(addr1);
+
+	end2 = XP_STRCHR(local2, '>');
+	if (!end2)
+		end2 = addr2 + XP_STRLEN(addr2);
+
+	atSign1 = XP_STRCHR(local1, '@');
+	atSign2 = XP_STRCHR(local2, '@');
+	if (!atSign1 || !atSign2 ||	  // ill formed addr-spec
+		(atSign1 - local1) != (atSign2 - local2))
+	{
+		isMatched = FALSE;
+	}
+	else if (XP_STRNCMP(local1, local2, (atSign1-local1)))
+	{	// case sensitive compare for local part
+		isMatched = FALSE;
+	}
+	else if ((end1 - atSign1) != (end2 - atSign2) ||
+		XP_STRNCASECMP(atSign1, atSign2, (end1 - atSign1)))
+	{	// case insensitive compare for domain part
+		isMatched = FALSE;
+	}
+	return isMatched;
+}
+
+XP_Bool
+MSG_ProcessMdnNeededState::ValidateReturnPath()
+{
+	// ValidateReturnPath applies to Automatic Send Mode only
+	// if we were in manual mode by pass this check
+	if (!m_autoSend)
+		return m_reallySendMdn;
+	
+	if (!m_returnPath || !m_dispositionNotificationTo ||
+		!*m_returnPath || !*m_dispositionNotificationTo)
+	{
+		m_autoSend = FALSE;
+		goto done;
+	}
+	
+	m_autoSend = MailAddrMatch(m_returnPath, m_dispositionNotificationTo);
+
+done:
+	return m_reallySendMdn;
+}
+
+XP_Bool
+MSG_ProcessMdnNeededState::NotInToOrCc()
+{
+	XP_ASSERT(m_pane);
+	msg_StringArray to_cc_list (TRUE);
+	MSG_Prefs *prefs = m_pane->GetPrefs();
+	XP_ASSERT(prefs);
+	char *reply_to = NULL;
+	char *to = m_to ? MSG_ExtractRFC822AddressMailboxes(m_to) : (char *)NULL;
+	char *cc = m_cc ? MSG_ExtractRFC822AddressMailboxes(m_cc) : (char *)NULL;
+	const char *usr_addr = FE_UsersMailAddress();
+	int i, size;
+	XP_Bool bRet = FALSE;
+	
+	// start with a simple check
+	if (XP_STRCASESTR(m_to, usr_addr) || XP_STRCASESTR(m_cc, usr_addr))
+		goto done;
+
+	PREF_CopyCharPref("mail.identity.reply_to", &reply_to);
+
+	to_cc_list.ImportTokenList(to);
+	to_cc_list.ImportTokenList(cc);
+
+	for (i=0, size=to_cc_list.GetSize(); i < size; i++)
+	{
+		const char *addr = to_cc_list.GetAt(i);
+
+		if (prefs->IsEmailAddressAnAliasForMe(addr) ||
+			(reply_to && XP_STRCASESTR(reply_to, addr)))
+			goto done;
+	}
+	bRet = TRUE;
+
+done:
+	XP_FREEIF(to);
+	XP_FREEIF(cc);
+	XP_FREEIF(reply_to);
+	return bRet;
+}
+
+XP_Bool
+MSG_ProcessMdnNeededState::ProcessSendMode()
+{
+	const char *user_addr = FE_UsersMailAddress();
+	const char *localDomain = NULL;
+	char *prefDomain = NULL;
+	int miscState = 0;
+	int32 intPref;
+
+	XP_ASSERT(user_addr);
+	if (!user_addr) 
+		return m_reallySendMdn;
+
+	PREF_CopyCharPref("mail.identity.defaultdomain", &prefDomain);
+	
+	
+	localDomain = XP_STRCHR(user_addr, '@');
+
+	if (prefDomain && *prefDomain)
+	{
+		if (!XP_STRCASESTR(m_dispositionNotificationTo, prefDomain))
+			miscState |= MDN_OUTSIDE_DOMAIN;
+		XP_FREEIF(prefDomain);
+	}
+	else if (localDomain)
+	{
+		localDomain++; // advance after @ sign
+		if (!XP_STRCASESTR(m_dispositionNotificationTo, localDomain))
+			miscState |= MDN_OUTSIDE_DOMAIN;
+	}
+	if (NotInToOrCc())
+	{
+		miscState |= MDN_NOT_IN_TO_CC;
+	}
+	m_reallySendMdn = TRUE;
+	// *********
+	// How are we gona deal with the auto forwarding issues? Some server
+	// didn't bother to add addition header or modify existing header to the
+	// message when forwarding. They simply copy the exact same message to
+	// another user's mailbox. Some change To: to Apparently-To:
+	// *********
+	// starting from lowest denominator to highest
+	if (!miscState)
+	{	// under normal situation: recipient is in to and cc
+		// list, sender is from the same domain
+		intPref = 0;
+		PREF_GetIntPref("mail.mdn.report.other", &intPref);
+		switch (intPref)
+		{
+		default:
+		case 0:
+			m_reallySendMdn = FALSE;
+			break;
+		case 1:
+			m_autoSend = TRUE;
+			break;
+		case 2:
+			m_autoSend = FALSE;
+			break;
+		case 3:
+			m_autoSend = TRUE;
+			m_disposeType = eDenied;
+			break;
+		}
+#ifdef CHECK_SENDER_AND_USER_ARE_SAME
+		// original sender is same as current user; doesn't make sense
+		if (m_reallySendMdn && 
+			MailAddrMatch(m_dispositionNotificationTo, user_addr))
+			m_reallySendMdn = FALSE;
+#endif
+	}
+	else if (miscState == (MDN_OUTSIDE_DOMAIN | MDN_NOT_IN_TO_CC))
+	{
+		int32 intPref2 = 0;
+		intPref = 0;
+		PREF_GetIntPref("mail.mdn.report.outside_domain", &intPref);
+		PREF_GetIntPref("mail.mdn.report.not_in_to_cc", &intPref2);
+		if (intPref != intPref2)
+		{
+			m_autoSend = FALSE;	// ambiguous; always ask
+		}
+		else
+		{
+			switch (intPref)
+			{
+			default:
+			case 0:
+				m_reallySendMdn = FALSE;
+				break;
+			case 1:
+				m_autoSend = TRUE;
+				break;
+			case 2:
+				m_autoSend = FALSE;
+				break;
+			}
+		}
+	}
+	else if (miscState & MDN_OUTSIDE_DOMAIN)
+	{
+		intPref = 0;          // reset int pref to 0
+		PREF_GetIntPref("mail.mdn.report.outside_domain", &intPref);
+		switch (intPref)
+		{
+		default:
+		case 0:
+			m_reallySendMdn = FALSE;
+			break;
+		case 1:
+			m_autoSend = TRUE;
+			break;
+		case 2:
+			m_autoSend = FALSE;
+			break;
+		}
+	}
+	else if (miscState & MDN_NOT_IN_TO_CC)
+	{
+		intPref =0;			  // reset to 0
+		PREF_GetIntPref("mail.mdn.report.not_in_to_cc", &intPref);
+		switch (intPref)
+		{
+		case 0:
+		default:
+			m_reallySendMdn = FALSE;
+			break;
+		case 1:
+			m_autoSend = TRUE;
+			break;
+		case 2:
+			m_autoSend = FALSE;
+			break;
+		}
+	}
+
+	return m_reallySendMdn;
+}
+
+void
+MSG_ProcessMdnNeededState::CreateMdnMsg()
+{
+	int32 status = 0;
+	
+	if (!m_autoSend)
+		m_reallySendMdn = 
+			FE_Confirm(m_pane->GetContext(),
+			   XP_GetString(MK_MSG_MDN_WISH_TO_SEND));
+
+	if (!m_reallySendMdn)
+		return;
+	m_msgFileName = WH_TempName (xpFileToPost, "mdnmsg");
+	if (!m_msgFileName)
+		return;
+	m_outFile = XP_FileOpen (m_msgFileName, xpFileToPost, XP_FILE_WRITE_BIN);
+	if (!m_outFile) goto done;
+	status = CreateFirstPart();
+	if (status < 0) goto done;
+	status = CreateSecondPart();
+	if (status < 0) goto done;
+	status = CreateThirdPart();
+	
+done:
+	if (m_outFile)
+	{
+		XP_FileClose(m_outFile);
+		m_outFile = 0;
+	}
+	if (status < 0)
+	{
+		// may want post out error message
+		XP_FileRemove(m_msgFileName, xpFileToPost);
+		XP_FREEIF(m_msgFileName);
+	}
+	else
+	{
+		DoSendMdn();
+	}
+}
+
+int32
+MSG_ProcessMdnNeededState::CreateFirstPart()
+{
+	int gmtoffset = XP_LocalZoneOffset();
+	char *convbuf = NULL, *tmpBuffer = NULL;
+	int16 win_csid;
+	char *parm = NULL;
+	char *firstPart = NULL;
+	int formatId = MK_MSG_MDN_DISPLAYED;
+	int32 status = 0;
+	char *receipt_string = NULL;
+	char *wrapped_string = NULL;
+
+	XP_ASSERT(m_outFile);
+
+	if (!m_mimeSeparator)
+		m_mimeSeparator = mime_make_separator("mdn");
+	if (!m_mimeSeparator)
+		return MK_OUT_OF_MEMORY;
+
+	tmpBuffer = (char *) XP_ALLOC(256);
+
+	if (!tmpBuffer)
+		return MK_OUT_OF_MEMORY;
+
+	win_csid = INTL_DefaultWinCharSetID(m_pane->GetContext());
+	m_csid = INTL_DefaultMailCharSetID(win_csid);
+
+#ifndef NSPR20
+    PRTime now;
+    PR_ExplodeTime(&now, PR_Now());
+#else
+    PRExplodedTime now;
+    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
+#endif /* NSPR20 */
+
+	/* Use PR_FormatTimeUSEnglish() to format the date in US English format,
+	   then figure out what our local GMT offset is, and append it (since
+	   PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as
+	   per RFC 1123 (superceding RFC 822.)
+	 */
+	PR_FormatTimeUSEnglish(tmpBuffer, 100,
+						   "Date: %a, %d %b %Y %H:%M:%S ",
+						   &now);
+
+	PR_snprintf(tmpBuffer + XP_STRLEN(tmpBuffer), 100,
+				"%c%02d%02d" CRLF,
+				(gmtoffset >= 0 ? '+' : '-'),
+				((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60),
+				((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60));
+
+	status = WriteString(tmpBuffer);
+	XP_FREEIF(tmpBuffer);
+	if (status < 0) return status;
+
+	convbuf = IntlEncodeMimePartIIStr((char *) FE_UsersMailAddress(),
+									  m_csid, TRUE);
+
+	parm = PR_smprintf("From: %s" CRLF, convbuf ? convbuf : FE_UsersMailAddress());
+	PUSH_N_FREE_STRING (parm);
+			
+	XP_FREEIF(convbuf);
+
+	parm = msg_generate_message_id();
+	tmpBuffer = PR_smprintf("Message-ID: %s" CRLF, parm);
+	PUSH_N_FREE_STRING(tmpBuffer);
+	
+	XP_FREEIF(parm);
+
+	receipt_string = XP_GetString(MK_MDN_DISPLAYED_RECEIPT + (int)
+								  m_disposeType);
+
+	parm = PR_smprintf ("%s - %s", (receipt_string ? receipt_string :
+						"Return Receipt"), (m_subject ? m_subject
+						: ""));
+	convbuf = 
+		IntlEncodeMimePartIIStr(parm ? parm : "Return Receipt",
+								m_csid, TRUE);
+	tmpBuffer = PR_smprintf("Subject: %s" CRLF, (convbuf ? convbuf : (parm ? parm :
+		                            "Return Receipt")));
+	PUSH_N_FREE_STRING(tmpBuffer);
+	if (parm)
+	{
+		PR_smprintf_free(parm);
+		parm = 0;
+	}
+	XP_FREEIF(convbuf);
+
+	convbuf = IntlEncodeMimePartIIStr(m_dispositionNotificationTo, m_csid,
+									  TRUE); 
+	tmpBuffer = PR_smprintf("To: %s" CRLF, convbuf ? convbuf :	m_dispositionNotificationTo); 
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	XP_FREEIF(convbuf);
+
+	// *** This is not in the spec. I am adding this so we could do
+	// threading
+	if (*m_messageId == '<')
+		tmpBuffer = PR_smprintf("References: %s" CRLF, m_messageId);
+	else
+		tmpBuffer = PR_smprintf("References: <%s>" CRLF, m_messageId);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("%s" CRLF, "MIME-Version: 1.0");
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("Content-Type: multipart/report; \
+report-type=disposition-notification;\r\n\tboundary=\"%s\"" CRLF CRLF,
+				m_mimeSeparator); 
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("--%s" CRLF, m_mimeSeparator);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	char charset[30];
+	INTL_CharSetIDToName(m_csid, charset);
+
+	tmpBuffer = PR_smprintf("Content-Type: text/plain; charset=%s" CRLF, charset);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("Content-Transfer-Encoding: %s" CRLF CRLF, ENCODING_7BIT);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	formatId = MK_MSG_MDN_DISPLAYED + ((int) m_disposeType - (int)
+									   eDisplayed); 
+
+	firstPart = XP_STRDUP(XP_GetString(formatId));
+	convbuf = IntlEncodeMimePartIIStr(firstPart, m_csid, TRUE);
+	wrapped_string = (char *) XP_WordWrap(m_csid, (unsigned char *)
+										  (convbuf ? convbuf : firstPart),
+										  72, FALSE);
+	tmpBuffer = PR_smprintf("%s" CRLF CRLF, wrapped_string ? wrapped_string : firstPart);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	XP_FREEIF(firstPart);
+	XP_FREEIF(convbuf);
+	XP_FREEIF(wrapped_string);
+
+	return status;
+}
+
+int32
+MSG_ProcessMdnNeededState::CreateSecondPart()
+{
+	char *tmpBuffer = NULL;
+	char *convbuf = NULL;
+	int32 status = 0;
+	
+	tmpBuffer = PR_smprintf("--%s" CRLF, m_mimeSeparator);
+	PUSH_N_FREE_STRING(tmpBuffer);
+	
+	tmpBuffer = PR_smprintf("%s" CRLF, "Content-Type: message/disposition-notification");
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("%s" CRLF, "Content-Disposition: inline");
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("Content-Transfer-Encoding: %s" CRLF CRLF, ENCODING_7BIT);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("Reporting-UA: %s; %s %s" CRLF,
+				NET_HostName(), XP_AppCodeName, XP_AppVersion);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	if (m_originalRecipient && *m_originalRecipient)
+	{
+		tmpBuffer = PR_smprintf("Original-Recipient: %s" CRLF, m_originalRecipient);
+		PUSH_N_FREE_STRING(tmpBuffer);
+	}
+
+	convbuf = IntlEncodeMimePartIIStr((char *) FE_UsersMailAddress(), m_csid,
+									  TRUE); 
+	tmpBuffer = PR_smprintf("Final-Recipient: rfc822;%s" CRLF, convbuf ? convbuf :
+				FE_UsersMailAddress()); 
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	XP_FREEIF (convbuf);
+
+	if (*m_messageId == '<')
+		tmpBuffer = PR_smprintf("Original-Message-ID: %s" CRLF, m_messageId);
+	else
+		tmpBuffer = PR_smprintf("Original-Message-ID: <%s>" CRLF, m_messageId);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("Disposition: %s/%s; %s" CRLF CRLF,
+				(m_autoAction ? "automatic-action" : "manual-action"),
+				(m_autoSend ? "MDN-sent-automatically" : "MDN-sent-manually"),
+				DispositionTypes[(int) m_disposeType]);
+	PUSH_N_FREE_STRING(tmpBuffer);
+	
+	return status;
+}
+
+int32
+MSG_ProcessMdnNeededState::CreateThirdPart()
+{
+	char *tmpBuffer = NULL;
+	int32 status = 0;
+
+	tmpBuffer = PR_smprintf("--%s" CRLF, m_mimeSeparator);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("%s" CRLF, "Content-Type: text/rfc822-headers");
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("%s" CRLF, "Content-Transfer-Encoding: 7bit");
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	tmpBuffer = PR_smprintf("%s" CRLF CRLF, "Content-Disposition: inline");
+	PUSH_N_FREE_STRING(tmpBuffer);
+   
+	status = OutputAllHeaders();
+
+	if (status < 0) return status;
+
+	status = WriteString(CRLF);
+	if (status < 0) return status;
+
+	tmpBuffer = PR_smprintf("--%s--" CRLF, m_mimeSeparator);
+	PUSH_N_FREE_STRING(tmpBuffer);
+
+	return status;
+}
+
+void
+MSG_ProcessMdnNeededState::DoSendMdn()
+{
+	XP_ASSERT(m_dispositionNotificationTo);
+	
+	if (!m_dispositionNotificationTo) return; // MK_OUT_OF_MEMORY
+
+	char *tmpBuffer =			// 9 = mailto: + null + 1 extra
+		(char *) XP_ALLOC(XP_STRLEN(m_dispositionNotificationTo) + 9);
+
+	if (!tmpBuffer) return;		// MK_OUT_OF_MEMORY
+
+	URL_Struct *url = NULL;
+
+	FE_Progress (m_pane->GetContext(), XP_GetString(MK_MSG_DELIV_MAIL));
+
+	XP_STRCPY(tmpBuffer, "mailto:");
+	
+	XP_STRCAT(tmpBuffer, m_dispositionNotificationTo);
+
+	url = NET_CreateURLStruct (tmpBuffer, NET_DONT_RELOAD);
+	if (url)
+	{
+		url->post_data = XP_STRDUP(m_msgFileName);
+		url->post_data_size = XP_STRLEN(m_msgFileName);
+		url->post_data_is_file = TRUE;
+		url->method = URL_POST_METHOD;
+		url->fe_data = this;
+		url->internal_url = TRUE;
+		url->msg_pane = m_pane;
+			// clear m_msgFileName to prevent removing temp file too early
+		XP_FREEIF(m_msgFileName);
+		// Set sending MDN in progress so the smtp state machine can null out
+		// the address for MAIL FROM
+		m_pane->SetSendingMDNInProgress(TRUE);
+
+		MSG_UrlQueue::AddUrlToPane (url,
+									MSG_ProcessMdnNeededState::PostSendMdn,
+									m_pane,
+									TRUE);
+	}
+	XP_FREEIF(tmpBuffer);
+}
+
+/* static */ void
+MSG_ProcessMdnNeededState::PostSendMdn(URL_Struct *url, int status, MWContext
+									   *context)
+{
+	if (url->msg_pane)
+		url->msg_pane->SetSendingMDNInProgress(FALSE);
+
+	if (status < 0)
+	{
+		char *error_msg = NET_ExplainErrorDetails(status, 0, 0, 0, 0);
+		if (error_msg)
+			FE_Alert(context, error_msg);
+		XP_FREEIF(error_msg);
+	}
+	if (url->post_data)
+	{
+		XP_FileRemove(url->post_data, xpFileToPost);
+		XP_FREEIF(url->post_data);
+		url->post_data_size = 0;
+	}
+	NET_FreeURLStruct(url);
+}
+
diff --git a/mozilla/lib/mailto/msgmdn.h b/mozilla/lib/mailto/msgmdn.h
new file mode 100644
index 00000000000..e18949a9d17
--- /dev/null
+++ b/mozilla/lib/mailto/msgmdn.h
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef MSGMDN_H
+#define MSGMDN_H
+
+#include "xp.h"
+#include "msgzap.h"
+#include "libmime.h"
+
+class MSG_Pane;
+class MSG_FolderInfo;
+struct message_header;
+
+#define MDN_NOT_IN_TO_CC          ((int) 0x0001)
+#define MDN_OUTSIDE_DOMAIN        ((int) 0x0002)
+
+#define HEADER_RETURN_PATH					"Return-Path"
+#define HEADER_DISPOSITION_NOTIFICATION_TO	"Disposition-Notification-To"
+#define HEADER_APPARENTLY_TO				"Apparently-To"
+#define HEADER_ORIGINAL_RECIPIENT			"Original-Recipient"
+#define HEADER_REPORTING_UA                 "Reporting-UA"
+#define HEADER_MDN_GATEWAY                  "MDN-Gateway"
+#define HEADER_FINAL_RECIPIENT              "Final-Recipient"
+#define HEADER_DISPOSITION                  "Disposition"
+#define HEADER_ORIGINAL_MESSAGE_ID          "Original-Message-ID"
+#define HEADER_FAILURE                      "Failure"
+#define HEADER_ERROR                        "Error"
+#define HEADER_WARNING                      "Warning"
+#define HEADER_RETURN_RECEIPT_TO            "Return-Receipt-To"
+
+
+class MSG_ProcessMdnNeededState : public MSG_ZapIt
+{
+public:
+	enum EDisposeType {
+		eDisplayed = 0x0,
+		eDispatched,
+		eProcessed,
+		eDeleted,
+		eDenied,
+		eFailed
+	};
+
+public:
+	MSG_ProcessMdnNeededState (EDisposeType intendedType,
+							   MSG_Pane *pane,
+							   MSG_FolderInfo *folder,
+							   uint32 key,
+							   MimeHeaders *srcHeader,
+							   XP_Bool autoAction = FALSE);
+
+	MSG_ProcessMdnNeededState (EDisposeType intendedType,
+							   MSG_Pane *pane,
+							   MSG_FolderInfo *folder,
+							   uint32 key,
+							   struct message_header *returnPath,
+							   struct message_header *dnt,
+							   struct message_header *to,
+							   struct message_header *cc,
+							   struct message_header *subject,
+							   struct message_header *date,
+							   struct message_header *originalRecipient,
+							   struct message_header *messageId,
+							   char *allHeaders,
+							   int32 allHeadersSize,
+							   XP_Bool autoAction = TRUE);
+
+	virtual ~MSG_ProcessMdnNeededState ();
+	static void PostSendMdn(URL_Struct *url, int status, MWContext *context);
+	
+protected:
+
+    XP_Bool ProcessSendMode();		// this should be called prior to
+								// ValidateReturnPath();
+	XP_Bool ValidateReturnPath();
+	XP_Bool MailAddrMatch(const char *addr1, const char *addr2);
+	XP_Bool NotInToOrCc();
+
+	void CreateMdnMsg();
+	int32 CreateFirstPart();
+	int32 CreateSecondPart();
+	int32 CreateThirdPart();
+	void DoSendMdn();
+
+	// helper fucntion
+	void InitAndProcess();
+	int32 OutputAllHeaders();
+	int32 WriteString(const char *str);
+
+protected:
+	EDisposeType m_disposeType;
+	MSG_Pane *m_pane;
+	XP_File m_outFile;
+	int16 m_csid;
+	char *m_msgFileName;
+	char *m_mimeSeparator;
+	XP_Bool m_reallySendMdn;	/* really send mdn? */
+	XP_Bool m_autoSend;			/* automatic vs manual send mode */
+	XP_Bool m_autoAction;		/* automatic vs manual action */
+	char *m_returnPath;
+	char *m_dispositionNotificationTo;
+	char *m_date;
+	char *m_to;
+	char *m_cc;
+	char *m_subject;
+	char *m_messageId;
+	char *m_originalRecipient;
+	char *m_all_headers;
+	int32 m_all_headers_size;
+};
+
+#endif
diff --git a/mozilla/lib/mailto/msgpane.cpp b/mozilla/lib/mailto/msgpane.cpp
new file mode 100644
index 00000000000..857b11b6966
--- /dev/null
+++ b/mozilla/lib/mailto/msgpane.cpp
@@ -0,0 +1,647 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "rosetta.h"
+#include "msg.h"
+#include "errcode.h"
+#include "xpgetstr.h"
+#include "libi18n.h"
+
+#include "msgpane.h"
+#include "msgprefs.h"
+#include "msgmast.h"
+#include "msghdr.h"
+
+#include "xp_time.h"
+#include "xplocale.h"
+#include "msg.h"
+#include "msgmast.h"
+
+#include "prefapi.h"
+#include "xp_qsort.h"
+#include "intl_csi.h"
+#include "xlate.h"
+#include "msgurlq.h"
+#include "pw_public.h"
+#include "mime.h"
+
+extern "C"
+{
+extern int MK_MSG_ADDRESS_BOOK;
+extern int MK_MSG_COMPRESS_ALL_FOLDER;
+extern int MK_MSG_EMPTY_TRASH_FOLDER;
+extern int MK_MSG_ERROR_WRITING_MAIL_FOLDER;
+extern int MK_MSG_GET_NEW_MAIL;
+extern int MK_MSG_GET_NEW_DISCUSSION_MSGS;
+extern int MK_MSG_NEW_MAIL_MESSAGE;
+extern int MK_MSG_NO_POP_HOST;
+extern int MK_OUT_OF_MEMORY;
+extern int MK_MSG_SAVE_MESSAGE_AS;
+extern int MK_MSG_SAVE_MESSAGES_AS;
+extern int MK_MSG_OPEN_DRAFT;
+extern int MK_MSG_ID_NOT_IN_FOLDER;
+extern int MK_MSG_FOLDER_UNREADABLE;
+extern int MK_MSG_DELIV_NEW_MSGS;
+extern int MK_MSG_QUEUED_DELIVERY_FAILED;
+extern int MK_MSG_NEWS_HOST_TABLE_INVALID;
+extern int MK_MSG_CANCEL_MESSAGE;
+extern int MK_MSG_MESSAGE_CANCELLED;
+extern int MK_MSG_MARK_SEL_AS_READ;
+extern int MK_MSG_MARK_SEL_AS_UNREAD;
+extern int MK_MSG_MARK_THREAD_READ;
+extern int MK_MSG_MARK_ALL_READ;
+extern int MK_MSG_BACKTRACK;
+extern int MK_MSG_GO_FORWARD;
+extern int MK_MSG_UNABLE_MANAGE_MAIL_ACCOUNT;
+extern int MK_POP3_NO_MESSAGES;
+extern int MK_MSG_MANAGE_MAIL_ACCOUNT;
+extern int MK_MSG_CANT_DELETE_RESERVED_FOLDER;
+extern int MK_MSG_PANES_OPEN_ON_FOLDER;
+extern int MK_MSG_DELETE_FOLDER_MESSAGES;
+extern int MK_MSG_NO_POST_TO_DIFFERENT_HOSTS_ALLOWED;
+extern int MK_MSG_GROUP_NOT_ON_SERVER;
+extern int MK_MSG_NEW_NEWSGROUP;
+extern int MK_MSG_ADVANCE_TO_NEXT_FOLDER;
+extern int MK_MSG_FLAG_MESSAGE;
+extern int MK_MSG_UNFLAG_MESSAGE;
+extern int MK_MSG_RETRIEVE_FLAGGED;
+extern int MK_MSG_RETRIEVE_SELECTED;
+XP_Bool NET_IsNewsMessageURL (const char *url);
+} 
+
+MSG_Pane* MSG_Pane::MasterList = NULL;
+
+
+
+typedef struct msg_incorporate_state
+{
+	MWContext				*context;
+	MSG_FolderInfoMail	*inbox;
+	MSG_Pane		*pane;
+	const char* dest;
+	const char *destName;
+	int32 start_length;
+//	int numdup;
+	char *ibuffer;
+	uint32 ibuffer_size;
+	uint32 ibuffer_fp;
+#ifdef MANGLE_INTERNAL_ENVELOPE_LINES
+	XP_Bool mangle_from;			/* True if "From " lines need to be subject
+								   to the Usual Mangling Conventions.*/
+#endif /* MANGLE_INTERNAL_ENVELOPE_LINES */
+	char* headers;
+	uint32 headers_length;
+	uint32 headers_maxlength;
+	XP_Bool gathering_headers;
+	XP_Bool expect_multiple;
+	XP_Bool expect_envelope;
+	ParseMailboxState *incparsestate; /* Parse state for messages */
+	int status;
+} msg_incorporate_state;
+
+
+
+MSG_Pane::MSG_Pane(MWContext* context, MSG_Master* master) {
+	m_context = context;
+	m_nextInMasterList = MasterList;
+
+	MasterList = this;
+
+	m_master = master;
+	if (master) {
+		m_nextPane = master->GetFirstPane();
+		master->SetFirstPane(this);
+		m_prefs = master->GetPrefs();
+		m_prefs->AddNotify(this);
+
+		m_context->mailMaster = master;
+	}
+}
+
+
+MSG_Pane::~MSG_Pane() {
+	UnregisterFromPaneList();
+
+	if (m_master) {
+		m_master->GetPrefs()->RemoveNotify(this);
+	}
+
+	if (m_progressContext)
+		PW_DestroyProgressContext(m_progressContext);
+}
+
+
+MSG_Pane* MSG_Pane::GetFirstPaneForContext(MWContext *context)
+{
+
+	if (context)
+		return GetNextPaneForContext(NULL, context);
+	
+	return(NULL);
+}
+
+MSG_Pane* MSG_Pane::GetNextPaneForContext(MSG_Pane *startPane, MWContext *context)
+{
+	MSG_Pane* result = NULL;
+	result = (startPane) ? startPane->m_nextInMasterList : MasterList;
+
+	for (; result ; result = result->m_nextInMasterList) 
+	{
+		if (result->GetContext() == context)
+			return result;
+	}
+	return NULL;
+}
+
+
+// Remove a pane from the pane list
+// Note that if after we remove ourselves from the list, the only pane left
+// belongs to the Biff (Check for New Mail) Master then we tell it to go away, which will cause
+// its own hidden progress window and context to be deleted.
+
+void MSG_Pane::UnregisterFromPaneList()
+{
+	if (m_master) {
+		MSG_Pane* tmp = m_master->GetFirstPane();
+		if (tmp == this) {
+			m_master->SetFirstPane(m_nextPane);
+		} else {
+			for (; tmp ; tmp = tmp->m_nextPane) {
+				if (tmp->m_nextPane == this) {
+					tmp->m_nextPane = m_nextPane;
+					break;
+				}
+			}
+		}
+	}
+
+	MSG_Pane** ptr;
+	for (ptr = &MasterList ; *ptr ; ptr = &((*ptr)->m_nextInMasterList)) {
+		if (*ptr == this) {
+			*ptr = this->m_nextInMasterList;
+			break;
+		}
+	}
+}
+
+// this method can be used to find out if a pane has been deleted...
+/*static*/ XP_Bool MSG_Pane::PaneInMasterList(MSG_Pane *pane)
+{
+	MSG_Pane* curPane;
+	XP_Bool ret = FALSE;
+	// it will return FALSE if pane is NULL
+	for (curPane = MasterList ; curPane ; curPane = curPane->m_nextInMasterList) 
+	{
+		if (curPane == pane)
+		{
+			ret = TRUE;
+			break;
+		}
+	}
+	return ret;
+}
+
+
+MSG_Pane* MSG_Pane::FindPane(MWContext* context, MSG_PaneType type, XP_Bool contextMustMatch /* = FALSE */) {
+  MSG_Pane* result;
+  for (result = MasterList ; result ; result = result->m_nextInMasterList) {
+	if (result->GetContext() == context && (type == MSG_ANYPANE ||
+											result->GetPaneType() == type)) {
+	  return result;
+	}
+  }
+  if (!contextMustMatch)
+  {
+	  for (result = MasterList ; result ; result = result->m_nextInMasterList) {
+		if (type == MSG_ANYPANE || result->GetPaneType() == type) {
+		  return result;
+		}
+	  }
+  }
+  return NULL;
+}
+
+/* static */ MSG_PaneType MSG_Pane::PaneTypeForURL(const char *url)
+{
+	MSG_PaneType retType = MSG_ANYPANE;
+	int urlType = NET_URL_Type(url);
+	char *folderName = NULL;
+
+	switch (urlType)
+	{
+		case MAILTO_TYPE_URL:
+			retType = MSG_COMPOSITIONPANE;
+			break;
+		default:
+			break;
+	}
+	FREEIF(folderName);
+	return retType;
+}
+
+/* inline virtuals moved to cpp file to help compilers that don't implement virtuals
+	defined in headers well.
+*/
+MSG_PaneType MSG_Pane::GetPaneType() {return MSG_PANE;}
+void MSG_Pane::NotifyPrefsChange(NotifyCode /*code*/) {}
+MSG_Pane* MSG_Pane::GetParentPane() {return NULL;}
+
+void MSG_Pane::SetFEData(void* data) {
+	m_fedata = data;
+}
+
+void* MSG_Pane::GetFEData() {
+	return m_fedata;
+}
+
+XP_Bool MSG_Pane::IsLinePane() {
+	return FALSE;
+}
+
+MWContext* MSG_Pane::GetContext() {
+	return m_context;
+}
+
+MSG_Prefs* MSG_Pane::GetPrefs() {
+	return m_prefs;
+}
+
+MsgERR
+MSG_Pane::ComposeNewMessage()
+{
+	return (MSG_Mail(GetContext())) ? 0 : MK_OUT_OF_MEMORY;
+}
+
+//This is a long one.  I'd like to break it down but some of the work
+//that is done here just isn't really useful elsewhere.  This handles
+//serveral selection cases in the threadwindow of the Mail and News pane.
+//If the individual selected something which we can use to populate the
+//send to lines, it get added into the addressee fields with the group label.
+//If nothing of any use was selected, the "mailto" label is used with a blank.
+//They are not allowed to select groups across news servers.  Such an act
+//will result in an informative error message and bring you back to the
+//mail and news pane.  
+MsgERR
+MSG_Pane::ComposeMessageToMany(MSG_ViewIndex* , int32 )
+{
+		return ComposeNewMessage();
+}
+
+
+
+
+char*
+MSG_Pane::CreateForwardSubject(MessageHdrStruct* header)
+{
+	char *fwd_subject = 0;
+	const char *subject = 0;
+	char *conv_subject = 0;
+	INTL_CharSetInfo c = LO_GetDocumentCharacterSetInfo(GetContext());
+
+	subject = header->m_subject;
+
+	while (XP_IS_SPACE(*subject)) subject++;
+
+	conv_subject = IntlDecodeMimePartIIStr(subject, INTL_GetCSIWinCSID(c), FALSE);
+	if (conv_subject == NULL)
+		conv_subject = (char *) subject;
+	fwd_subject =
+		(char *) XP_ALLOC((conv_subject ? XP_STRLEN(conv_subject) : 0) + 20);
+	if (!fwd_subject) goto FAIL;
+
+	XP_STRCPY (fwd_subject, "[Fwd: ");
+	if (header->m_flags & kHasRe) {
+		XP_STRCAT (fwd_subject, "Re: ");
+	}
+	XP_STRCAT (fwd_subject, conv_subject);
+	XP_STRCAT (fwd_subject, "]");
+
+FAIL:
+	if (conv_subject != subject) {
+		FREEIF(conv_subject);
+	}
+	return fwd_subject;
+}
+
+void
+MSG_Pane::InterruptContext(XP_Bool /*safetoo*/)
+{
+	XP_InterruptContext(m_context);
+}
+
+
+MsgERR
+MSG_Pane::DoCommand(MSG_CommandType command, MSG_ViewIndex* indices,
+					int32 numIndices)
+{
+	MsgERR status = 0;
+
+	switch (command) {
+		break;
+	case MSG_MailNew:
+		status = ComposeMessageToMany(indices, numIndices);
+		break;
+  default:
+#ifdef DEBUG
+	  FE_Alert (GetContext(), "command not implemented");
+#endif
+	break;
+  }
+  return status;
+}
+
+
+MsgERR
+MSG_Pane::GetCommandStatus(MSG_CommandType command,
+						   const MSG_ViewIndex* indices, int32 numIndices,
+						   XP_Bool *selectable_pP,
+						   MSG_COMMAND_CHECK_STATE *selected_pP,
+						   const char **display_stringP,
+						   XP_Bool *plural_pP)
+{
+	const char *display_string = 0;
+	XP_Bool plural_p = FALSE;
+	XP_Bool selectable_p = FALSE;
+	XP_Bool selected_p = FALSE;
+	XP_Bool selected_used_p = FALSE;
+	
+	switch(command) {
+
+	case MSG_MailNew:
+		display_string = XP_GetString(MK_MSG_NEW_MAIL_MESSAGE);
+		// don't enable compose if we're parsing a folder
+        selectable_p = TRUE;
+		break;
+  default:
+//	XP_ASSERT(0);
+	break;
+  }
+  if (selectable_pP)
+	*selectable_pP = selectable_p;
+  if (selected_pP)
+  {
+    if (selected_used_p)
+    {
+      if (selected_p)
+        *selected_pP = MSG_Checked;
+      else
+        *selected_pP = MSG_Unchecked;
+    }
+    else
+    {
+      *selected_pP = MSG_NotUsed;
+    }
+  }
+  if (display_stringP)
+	*display_stringP = display_string;
+  if (plural_pP)
+	*plural_pP = plural_p;
+
+  return 0;
+}
+
+
+MSG_COMMAND_CHECK_STATE
+MSG_Pane::GetToggleStatus(MSG_CommandType command, MSG_ViewIndex* indices,
+						  int32 numindices)
+{
+  MSG_COMMAND_CHECK_STATE result = MSG_NotUsed;
+  if (GetCommandStatus(command, indices, numindices, NULL, &result,
+					   NULL, NULL) != 0) {
+	return MSG_NotUsed;
+  }
+  return result;
+}
+
+
+MsgERR
+MSG_Pane::SetToggleStatus(MSG_CommandType command,
+						  MSG_ViewIndex* indices, int32 numindices,
+						  MSG_COMMAND_CHECK_STATE value)
+{
+	MsgERR	status = eSUCCESS;
+
+	MSG_COMMAND_CHECK_STATE old = GetToggleStatus(command, indices, numindices);
+	if (old == MSG_NotUsed) return eUNKNOWN;
+	if (old != value) 
+	{
+		if ((status = DoCommand(command, indices, numindices)) == eSUCCESS)
+		{
+			if (GetToggleStatus(command, indices, numindices) != value) 
+			{
+				XP_ASSERT(0);
+				return eUNKNOWN;
+			}
+		}
+	}
+	return status;
+}
+
+void MSG_Pane::SetRequestForReturnReceipt(XP_Bool bRequested)
+{
+	m_requestForReturnReceipt = bRequested;
+}
+
+XP_Bool MSG_Pane::GetRequestForReturnReceipt()
+{
+	return m_requestForReturnReceipt;
+}
+
+void MSG_Pane::SetSendingMDNInProgress(XP_Bool inProgress)
+{
+	m_sendingMDNInProgress = inProgress;
+}
+
+XP_Bool MSG_Pane::GetSendingMDNInProgress()
+{
+	return m_sendingMDNInProgress;
+}
+
+char*
+MSG_Pane::MakeMailto(const char *to, const char *cc,
+					const char *newsgroups,
+					const char *subject, const char *references,
+					const char *attachment, const char *host_data,
+					XP_Bool xxx_p, XP_Bool sign_p)
+{
+	char *to2 = 0, *cc2 = 0;
+	char *out, *head;
+	char *qto, *qcc, *qnewsgroups, *qsubject, *qreferences;
+	char *qattachment, *qhost_data;
+	char *url;
+	char *me = MIME_MakeFromField();
+	char *to_plus_me = 0;
+
+	to2 = MSG_RemoveDuplicateAddresses (to, ((cc && *cc) ? me : 0), TRUE /*removeAliasesToMe*/);
+	if (to2 && !*to2) {
+		XP_FREE(to2);
+		to2 = 0;
+	}
+
+	/* This to_plus_me business is so that, in reply-to-all of a message
+	   to which I was a recipient, I don't go into the CC field (that's
+	   what BCC/FCC are for.) */
+	if (to2 && cc && me) {
+		to_plus_me = (char *) XP_ALLOC(XP_STRLEN(to2) + XP_STRLEN(me) + 10);
+	}
+	if (to_plus_me) {
+		XP_STRCPY(to_plus_me, me);
+		XP_STRCAT(to_plus_me, ", ");
+		XP_STRCAT(to_plus_me, to2);
+	}
+	FREEIF(me);
+
+	cc2 = MSG_RemoveDuplicateAddresses (cc, (to_plus_me ? to_plus_me : to2), TRUE /*removeAliasesToMe*/);
+	if (cc2 && !*cc2) {
+		XP_FREE(cc2);
+		cc2 = 0;
+	}
+
+	FREEIF(to_plus_me);
+
+	/* Catch the case of "Reply To All" on a message that was from me.
+	   In that case, we've got an empty To: field at this point.
+	   What we should do is, promote the first CC address to the To:
+	   field.  But I'll settle for promoting all of them.
+	   */
+	if (cc2 && *cc2 && (!to2 || !*to2)) {
+		FREEIF(to2);
+		to2 = cc2;
+		cc2 = 0;
+	}
+
+	qto		  = to2		   ? NET_Escape (to2, URL_XALPHAS)		  : 0;
+	qcc		  = cc2		   ? NET_Escape (cc2, URL_XALPHAS)		  : 0;
+	qnewsgroups = newsgroups ? NET_Escape (newsgroups, URL_XALPHAS) : 0;
+	qsubject	  = subject    ? NET_Escape (subject, URL_XALPHAS)    : 0;
+	qreferences = references ? NET_Escape (references, URL_XALPHAS) : 0;
+	qattachment = attachment ? NET_Escape (attachment, URL_XALPHAS) : 0;
+	qhost_data  = host_data  ? NET_Escape (host_data, URL_XALPHAS)  : 0;
+
+	url = (char *)
+		XP_ALLOC ((qto         ? XP_STRLEN(qto)			+ 15 : 0) +
+				  (qcc         ? XP_STRLEN(qcc)			+ 15 : 0) +
+				  (qnewsgroups ? XP_STRLEN(qnewsgroups) + 15 : 0) +
+				  (qsubject    ? XP_STRLEN(qsubject)	+ 15 : 0) +
+				  (qreferences ? XP_STRLEN(qreferences) + 15 : 0) +
+				  (qhost_data  ? XP_STRLEN(qhost_data)  + 15 : 0) +
+				  (qattachment ? XP_STRLEN(qattachment) + 15 : 0) +
+				  60);
+	if (!url) goto FAIL;
+	XP_STRCPY (url, "mailto:");
+	head = url + XP_STRLEN (url);
+	out = head;
+# define PUSH_STRING(S) XP_STRCPY(out, S), out += XP_STRLEN(S)
+# define PUSH_PARM(prefix,var) \
+	if (var) {				   \
+		if (out == head)	   \
+			*out++ = '?';	   \
+		else				   \
+			*out++ = '&';	   \
+		PUSH_STRING (prefix);  \
+		*out++ = '=';		   \
+		PUSH_STRING (var);	   \
+	}						   \
+
+		PUSH_PARM("to", qto);
+		PUSH_PARM("cc", qcc);
+		PUSH_PARM("newsgroups", qnewsgroups);
+		PUSH_PARM("subject", qsubject);
+		PUSH_PARM("references", qreferences);
+		PUSH_PARM("attachment", qattachment);
+		PUSH_PARM("newshost", qhost_data);
+		{
+		  char *t = "true";  /* avoid silly compiler warning */
+		  HG92725
+		  if (sign_p)    PUSH_PARM("sign", t);
+		}
+# undef PUSH_PARM
+# undef PUSH_STRING
+
+FAIL:
+		FREEIF (to2);
+		FREEIF (cc2);
+		FREEIF (qto);
+		FREEIF (qcc);
+		FREEIF (qnewsgroups);
+		FREEIF (qsubject);
+		FREEIF (qreferences);
+		FREEIF (qattachment);
+		FREEIF (qhost_data);
+
+		return url;
+}
+
+#ifdef GENERATINGPOWERPC
+#pragma global_optimizer off
+#endif
+
+
+MSG_PaneURLChain::MSG_PaneURLChain(MSG_Pane *pane)
+{
+	m_pane = pane;
+}
+
+MSG_PaneURLChain::~MSG_PaneURLChain()
+{
+}
+
+// override to chain urls. return non-zero to continue.
+int	MSG_PaneURLChain::GetNextURL()
+{
+	return 0;
+}
+
+#ifndef MOZ_MAIL_NEWS
+/* This is normally in mkpop3.c, of all the odd places!
+   But it's required for mail compose.
+ */
+int
+msg_GrowBuffer (uint32 desired_size, uint32 element_size, uint32 quantum,
+				char **buffer, uint32 *size)
+{
+  if (*size <= desired_size)
+	{
+	  char *new_buf;
+	  uint32 increment = desired_size - *size;
+	  if (increment < quantum) /* always grow by a minimum of N bytes */
+		increment = quantum;
+
+#ifdef TESTFORWIN16
+	  if (((*size + increment) * (element_size / sizeof(char))) >= 64000)
+		{
+		  /* Make sure we don't choke on WIN16 */
+		  XP_ASSERT(0);
+		  return MK_OUT_OF_MEMORY;
+		}
+#endif /* DEBUG */
+
+	  new_buf = (*buffer
+				 ? (char *) XP_REALLOC (*buffer, (*size + increment)
+										* (element_size / sizeof(char)))
+				 : (char *) XP_ALLOC ((*size + increment)
+									  * (element_size / sizeof(char))));
+	  if (! new_buf)
+		return MK_OUT_OF_MEMORY;
+	  *buffer = new_buf;
+	  *size += increment;
+	}
+  return 0;
+}
+
+#endif /* ! MOZ_MAIL_NEWS */
diff --git a/mozilla/lib/mailto/msgpane.h b/mozilla/lib/mailto/msgpane.h
new file mode 100644
index 00000000000..1316d8c3136
--- /dev/null
+++ b/mozilla/lib/mailto/msgpane.h
@@ -0,0 +1,200 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+#ifndef _MsgPane_H_
+#define _MsgPane_H_
+
+#include "msg.h"
+#include "errcode.h"
+#include "msgzap.h"
+#include "msgprnot.h"
+
+class MSG_Master;
+class MessageDBView;
+class MSG_FolderInfo;
+class MSG_NewsHost;
+class ParseMailboxState;
+class msg_Background;
+class OfflineImapGoOnlineState;
+class MSG_FolderInfoMail;
+class MSG_PostDeliveryActionInfo;
+
+struct tImapFilterClosure;
+
+struct msg_incorporate_state;
+struct MessageHdrStruct;
+
+
+#ifdef MOZ_MAIL_NEWS
+class PaneListener : public ChangeListener
+{
+public:
+	PaneListener(MSG_Pane *pPane);
+	virtual ~PaneListener();
+	virtual void OnViewChange(MSG_ViewIndex startIndex, int32 numChanged, 
+		MSG_NOTIFY_CODE changeType, ChangeListener *instigator);
+	virtual void OnViewStartChange(MSG_ViewIndex startIndex, int32 numChanged, 
+		MSG_NOTIFY_CODE changeType, ChangeListener *instigator);
+	virtual void OnViewEndChange(MSG_ViewIndex startIndex, int32 numChanged, 
+		MSG_NOTIFY_CODE changeType, ChangeListener *instigator);
+	virtual void OnKeyChange(MessageKey keyChanged, int32 flags, 
+		ChangeListener * instigator);
+	virtual void OnAnnouncerGoingAway (ChangeAnnouncer *instigator);
+	virtual void OnAnnouncerChangingView(ChangeAnnouncer * /* instigator */, MessageDBView * /* view */) ;
+	virtual void StartKeysChanging();
+	virtual void EndKeysChanging();
+
+protected:
+	MSG_Pane		*m_pPane;
+	XP_Bool			m_keysChanging;	// are keys changing?
+	XP_Bool			m_keyChanged;	// has a key changed since StartKeysChanging called?
+};
+#endif /* MOZ_MAIL_NEWS */
+
+// If a MSG_Pane has its url chain ptr set to a non-null value,
+// it calls the GetNextURL method whenever it finishes a url that is chainable.
+// These include delivering queued mail,  get new mail, and retrieving
+// messages for offline use, oddly enough - the three kinds of urls I need to queue.
+// Sadly, neither the msg_Background or MSG_UrlQueue do what I want,
+// because I need to chain network urls that have their own exit functions
+// and indeed chain urls themselves.
+class MSG_PaneURLChain
+{
+public:
+	MSG_PaneURLChain(MSG_Pane *pane);
+	virtual ~MSG_PaneURLChain();
+	virtual int		GetNextURL();	// return 0 to stop chaining.
+protected:
+	MSG_Pane	*m_pane;
+};
+
+class MSG_Pane : public MSG_PrefsNotify {
+public:
+
+  // hack..
+  // Find a pane of the given type that matches the given context.  If none,
+  // find some other pane of the given type (if !contextMustMatch).
+  static MSG_Pane* FindPane(MWContext* context,
+							MSG_PaneType type = MSG_ANYPANE,
+							XP_Bool contextMustMatch = FALSE);
+
+  static XP_Bool PaneInMasterList(MSG_Pane *pane);
+
+
+  static MSG_PaneType PaneTypeForURL(const char *url);
+  XP_Bool		NavigationGoesToNextFolder(MSG_MotionType motionType);
+  MSG_Pane(MWContext* context, MSG_Master* master);
+  virtual ~MSG_Pane();
+
+  void SetFEData(void*);
+  void* GetFEData();
+
+  virtual XP_Bool IsLinePane();
+  virtual MSG_PaneType GetPaneType() ;
+  virtual void NotifyPrefsChange(NotifyCode /*code*/);
+
+  virtual MSG_Pane* GetParentPane();
+  
+  MSG_Pane* GetNextPane() {return m_nextPane;}
+
+  MSG_Pane *GetFirstPaneForContext(MWContext *context);
+
+  MSG_Pane *GetNextPaneForContext(MSG_Pane *pane, MWContext *context);
+
+  virtual MWContext* GetContext();
+  MSG_Prefs* GetPrefs();
+
+  MSG_Master* GetMaster() {return m_master;}
+
+  virtual MsgERR DoCommand(MSG_CommandType command,
+						   MSG_ViewIndex* indices, int32 numindices);
+
+  virtual MsgERR GetCommandStatus(MSG_CommandType command,
+								  const MSG_ViewIndex* indices, int32 numindices,
+								  XP_Bool *selectable_p,
+								  MSG_COMMAND_CHECK_STATE *selected_p,
+								  const char **display_string,
+								  XP_Bool *plural_p);
+
+  virtual MsgERR SetToggleStatus(MSG_CommandType command,
+								 MSG_ViewIndex* indices, int32 numindices,
+								 MSG_COMMAND_CHECK_STATE value);
+
+  virtual MSG_COMMAND_CHECK_STATE GetToggleStatus(MSG_CommandType command,
+												  MSG_ViewIndex* indices,
+												  int32 numindices);
+
+  MsgERR ComposeNewMessage();
+  //ComposeMessageToMany calls ComposeNewMessage if nothing was selected
+  //otherwise it builds a string containing selected groups to post to.
+  MsgERR ComposeMessageToMany(MSG_ViewIndex* indices, int32 numIndices);
+
+  virtual void InterruptContext(XP_Bool safetoo);
+
+  char* CreateForwardSubject(MessageHdrStruct* header);
+
+	// Removes this pane from the main pane list.  This is so that calls to
+	// MSG_Master::FindPaneOfType() won't find this one (because, for example,
+	// we know we're about to delete this one.)
+	void UnregisterFromPaneList();
+
+	// These routines should be used only by the msg_Background class.
+	msg_Background* GetCurrentBackgroundJob() {return m_background;}
+	void SetCurrentBackgroundJob(msg_Background* b) {m_background = b;}
+	void SetShowingProgress(XP_Bool showingProgress) {m_showingProgress = showingProgress;}
+
+	void SetRequestForReturnReceipt(XP_Bool isNeeded);
+	XP_Bool GetRequestForReturnReceipt();
+
+	void SetSendingMDNInProgress(XP_Bool inProgress);
+	XP_Bool GetSendingMDNInProgress();
+
+	char* MakeMailto(const char *to, const char *cc,
+					const char *newsgroups,
+					const char *subject, const char *references,
+					const char *attachment, const char *host_data,
+					XP_Bool xxx_p, XP_Bool sign_p);
+
+protected:
+  static MSG_Pane* MasterList;	
+  MSG_Pane* m_nextInMasterList;	
+
+  
+  MSG_Pane* m_nextPane;			// Link of panes created with the same master.
+  
+  
+  MSG_Master* m_master;
+  MWContext* m_context;
+  MSG_Prefs* m_prefs;
+  void* m_fedata;
+  int m_numstack;				// used for DEBUG, and to tell listeners
+								// if we're in an update block.
+  
+  msg_Background* m_background;
+
+  XP_Bool m_requestForReturnReceipt;
+  XP_Bool	m_showingProgress;
+  XP_Bool m_sendingMDNInProgress;
+  MSG_PostDeliveryActionInfo *m_actionInfo;
+
+  MWContext	*m_progressContext;
+};
+
+
+#endif /* _MsgPane_H_ */
diff --git a/mozilla/lib/mailto/msgppane.cpp b/mozilla/lib/mailto/msgppane.cpp
new file mode 100644
index 00000000000..627380f3a45
--- /dev/null
+++ b/mozilla/lib/mailto/msgppane.cpp
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "msg.h"
+#include "msgppane.h"
+
+MSG_ProgressPane::MSG_ProgressPane(MWContext* context, MSG_Master* master,
+										 MSG_Pane *parentPane) 
+: MSG_Pane(context, master)
+{
+	m_parentPane = parentPane;
+
+	// progress panes must not look appetizing to JavaScript
+	//XP_ASSERT(MWContextMailNewsProgress == context->type);
+	if (context->type != MWContextMailNewsProgress)
+		context->type = MWContextMailNewsProgress; 
+	if (m_parentPane)
+		m_parentPane->SetShowingProgress(TRUE);
+}
+
+MSG_ProgressPane::~MSG_ProgressPane()
+{
+	if (GetParentPane())
+		m_parentPane->SetShowingProgress(FALSE);
+
+	if (m_context->imapURLPane == this)
+		m_context->imapURLPane = NULL;
+}
+
+
+MsgERR
+MSG_ProgressPane::DoCommand(MSG_CommandType command, MSG_ViewIndex* indices,
+					int32 numIndices)
+{
+		return MSG_Pane::DoCommand(command, indices, numIndices);
+}
+
+MSG_Pane* MSG_ProgressPane::GetParentPane()
+{
+	// parent pane may have been deleted w/o us knowing, so check if it's in master list.
+	if (!PaneInMasterList(m_parentPane))
+		m_parentPane = NULL;
+	return m_parentPane;
+}
+
diff --git a/mozilla/lib/mailto/msgppane.h b/mozilla/lib/mailto/msgppane.h
new file mode 100644
index 00000000000..db475d4289a
--- /dev/null
+++ b/mozilla/lib/mailto/msgppane.h
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgProgressPane_H_
+#define _MsgProgressPane_H_
+
+#include "msgpane.h"
+
+class MSG_ProgressPane : public MSG_Pane
+{
+public:
+	MSG_ProgressPane(MWContext* context, MSG_Master* master, MSG_Pane *parentPane);
+	virtual ~MSG_ProgressPane();
+	virtual MsgERR	DoCommand(MSG_CommandType command, MSG_ViewIndex* indices,
+								int32 numIndices);
+
+	virtual MSG_Pane* GetParentPane();
+
+protected:
+	MSG_Pane	*m_parentPane;
+};
+#endif
+
+
diff --git a/mozilla/lib/mailto/msgprefs.cpp b/mozilla/lib/mailto/msgprefs.cpp
new file mode 100644
index 00000000000..26d932a808f
--- /dev/null
+++ b/mozilla/lib/mailto/msgprefs.cpp
@@ -0,0 +1,979 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "msg.h"
+#include "errcode.h"
+
+#include "rosetta.h"
+#include "msgprefs.h"
+#include "msgprnot.h"
+#include "prefapi.h"
+#include "msgmast.h"
+#include "proto.h" // for XP_FindSomeContext
+
+extern "C" 
+{
+  #include "mkreg.h"
+}
+
+#include "ptrarray.h"
+
+#ifdef XP_MAC
+	#include "Memory.h"
+	#include "Files.h"
+	#include "ufilemgr.h"
+	#include "uprefd.h"
+#else
+	extern "C" 
+	{
+		const char *FE_GetFolderDirectory(MWContext *c);
+		void NET_SetMailRelayHost(char *);
+		void NET_SetNewsHost(const char *);
+	}
+#endif
+
+extern "C"
+{
+	extern int MK_MSG_MAIL_DIRECTORY_CHANGED;
+	extern int MK_MSG_SENT_L10N_NAME;
+	extern void MIME_ConformToStandard(XP_Bool conform_p);
+	extern int MK_MSG_UNABLE_TO_SAVE_DRAFT;
+	extern int MK_MSG_UNABLE_TO_SAVE_TEMPLATE;
+}
+
+// Notify listeners that something got changed. updateCode is an int16 instead of
+// a MSG_PrefsNotify::NotifyCode because it was deemed a Bad Thing to include all of
+// msgprnot.h just to pick up that definition.
+void MSG_Prefs::Notify(int16 updateCode) 
+{	
+	int i;
+	
+	// if we are changing mail servers, trash cached path to imap databases
+	// m_IMAPdirectory will be reset by next reload call
+	if ((updateCode == MSG_PrefsNotify::MailServerType) || (updateCode == MSG_PrefsNotify::PopHost))
+		FREEIF(m_IMAPdirectory);
+
+	// Do the notification in such a way that deleted listeners don't
+	// foul up the notification for everyone else. (m_notifying affects
+	// the behavior of RemoveNotify so that it only NULLs deleted listeners.)
+	m_notifying = TRUE;
+	for (i = 0; i < m_numnotify ; i++) 
+	{
+	    if (m_notify[i])
+	    	m_notify[i]->NotifyPrefsChange((MSG_PrefsNotify::NotifyCode) updateCode);
+	}
+	m_notifying = FALSE;
+	
+	// Clean up after nulled pointers.
+	for(i=(m_numnotify-1);i >= 0; i--)
+	{
+		if (! m_notify[i])
+		{
+			if (i == (m_numnotify-1))
+				// last element is null, keep decrementing the count
+				m_numnotify--; 
+			else
+				// replace this null element with the last in the list
+				m_notify[i] = m_notify[--m_numnotify];
+		}
+	}
+}
+
+
+char *headerPrefNames[] = 
+{
+	"mail.identity.reply_to",
+	"mail.default_cc",
+	"mail.default_fcc",
+	"mail.imap_sentmail_path",
+	"news.default_cc",
+	"news.default_fcc",
+	"news.imap_sentmail_path",
+};
+
+enum headerPrefIndices
+{
+	mail_identity_reply_to=0,
+	mail_default_cc,
+	mail_default_fcc,             // this is a mess don't change order
+	mail_imap_sentmail_path,
+	news_default_cc,
+	news_default_fcc,             // this is a mess don't change order
+	news_imap_sentmail_path,
+	num_of_header_prefs
+};
+
+void MSG_Prefs::PlatformFileToURLPath(const char *platformFile, char **result)
+{
+	*result = NULL;
+
+	char *tmp = XP_PlatformFileToURL(platformFile);
+	XP_ASSERT(tmp && !strncmp(tmp, "file://", 7));
+	if (tmp && !strncmp(tmp, "file://", 7))
+		*result = XP_STRDUP(&(tmp[7]));
+
+#ifdef XP_UNIX
+	if ( *result && **result == '~' ) {
+		char buf[1024];
+		char* home_dir = getenv("HOME");
+		char* tmp = (*result) + 1;
+
+		while ( *tmp == '/' ) 
+			tmp++;
+
+		/* trim trailing slashes in home_dir */
+		while ( (tmp = strrchr(home_dir, '/')) && tmp[1] == '\0' ) 
+			*tmp = '\0';
+
+		PR_snprintf(buf, sizeof(buf), "%s/%s", home_dir ? home_dir : "", tmp);
+		XP_FREE(*result);
+		*result = XP_STRDUP(buf);
+	}
+#endif
+
+        FREEIF(tmp);
+}
+
+static XP_Bool ShouldSavePrefAsBinaryAlias(const char* prefname)
+{
+#ifdef XP_MAC
+	// Return TRUE if path names are saved as binary alias prefs (the default).
+	// Return FALSE for the URL cases, now saved as a string (new in Nova). These are IMAP
+	// fccs, and all drafts and all templates.
+	if (XP_STRCMP(prefname, "mail.imap_sentmail_path") == 0)
+		return FALSE; // URL
+	else if (XP_STRCMP(prefname, "news.imap_sentmail_path") == 0)
+		return FALSE; // URL
+	else if (XP_STRCMP(prefname, "mail.default_drafts") == 0)
+		return FALSE; // URL
+	else if (XP_STRCMP(prefname, "mail.default_templates") == 0)
+		return FALSE; // URL
+	return TRUE;
+#else
+	return FALSE;
+#endif // XP_MAC
+}
+
+int MSG_Prefs::GetXPDirPathPref(const char *prefName, XP_Bool /*expectFile*/, char **result)
+{
+	int returnVal = PREF_NOERROR;
+	char *tmp = NULL;
+	*result = NULL; // in case we fail
+	if (ShouldSavePrefAsBinaryAlias(prefName))
+	{
+		returnVal = PREF_CopyPathPref(prefName, &tmp);
+		if (returnVal == PREF_NOERROR)
+			*result = tmp;
+		return returnVal;
+	}
+	returnVal = PREF_CopyCharPref(prefName, &tmp); // paths are strings elsewhere
+	if (returnVal == PREF_NOERROR)
+	{
+		// Convert pathname to an xp path.
+		if (XP_STRLEN(tmp) > 0 && NET_URL_Type(tmp) != IMAP_TYPE_URL &&
+			NET_URL_Type(tmp) != MAILBOX_TYPE_URL)
+		{
+			PlatformFileToURLPath(tmp,result);
+			XP_FREEIF(tmp);
+		}
+		else
+			*result = tmp;
+	}
+	return returnVal;
+}
+
+int MSG_Prefs::SetXPMailFilePref(const char* /*prefName*/, char *xpPath)
+{
+	int returnVal = PREF_NOERROR;
+
+	if (NET_URL_Type(xpPath) != IMAP_TYPE_URL)
+	{
+		// ## mwelch 4.0b2 hack! Create the mail file if it doesn't already exist.
+		//           Mail parent folder was created at app startup, so it is
+		//           safe to assume that the parent directory exists.
+		char *platformPath = WH_FileName(xpPath, xpMailFolder);
+		XP_File fp = XP_FileOpen(xpPath, xpMailFolder, XP_FILE_APPEND_BIN);
+		if (fp) 
+			XP_FileClose(fp);
+
+		XP_FREEIF(platformPath);
+	}
+	return returnVal;
+} // MSG_Prefs::SetXPMailFilePref
+
+void MSG_Prefs::SetMailNewsProfileAgeFlag(int32 flag, XP_Bool set /* = TRUE */)
+{
+	// each 'trick' uses this function to register that it is done, but we do not
+	// want one trick to erase the completion of another.
+	int32 currentAge = 0;
+	PREF_GetIntPref("mailnews.profile_age",&currentAge);
+	if (set)
+	{
+		if (!(currentAge & flag))
+			PREF_SetIntPref("mailnews.profile_age",(currentAge | flag));
+	}
+	else
+	{
+		if (currentAge & flag)
+			PREF_SetIntPref("mailnews.profile_age",(currentAge | ~flag));
+	}
+	m_dirty = TRUE;
+}
+
+int32 MSG_Prefs::GetStartingMailNewsProfileAge()
+{
+	Reload();
+	return m_startingMailNewsProfileAge;
+}
+
+void MSG_Prefs::Reload()
+{
+	if (m_dirty)
+	{
+		// Temp vars we need to convey pref values.
+		int32 intPref;
+		char *strPref;
+		int prefError = PREF_NOERROR;
+
+		// Load in boolean prefs.
+		PREF_GetBoolPref("mail.fixed_width_messages", &m_plainText);
+		PREF_GetBoolPref("mail.auto_quote", &m_autoQuote);
+		PREF_GetBoolPref("news.show_pretty_names", &m_showPrettyNames);
+		PREF_GetBoolPref("news.notify.on", &m_newsNotifyOn);
+		PREF_GetBoolPref("mail.cc_self", &m_mailBccSelf);
+		PREF_GetBoolPref("news.cc_self", &m_newsBccSelf);
+		PREF_GetBoolPref("mail.wrap_long_lines", &m_wraplonglines);
+		HG63256
+		
+		PREF_GetBoolPref("mail.inline_attachments", &m_noinline);
+		PREF_GetBoolPref("mail.prompt_purge_threshhold", &m_purgeThreshholdEnabled); //Ask about compacting folders
+		m_noinline = !m_noinline;
+		
+		// Load in int/enum prefs.
+		intPref = (int) MSG_ItalicFont; // make italic if pref call fails
+		PREF_GetIntPref("mail.quoted_style", &intPref);
+		m_citationFont = (MSG_FONT) intPref;
+		
+		intPref = (int) MSG_NormalSize; // make normal size if pref call fails
+		PREF_GetIntPref("mail.quoted_size", &intPref);
+		m_citationFontSize = (MSG_CITATION_SIZE) intPref;
+		
+		intPref = 1;
+		PREF_GetIntPref("mailnews.nav_crosses_folders", &intPref);
+		m_navCrossesFolders = intPref;
+
+		PREF_GetIntPref("mailnews.profile_age",&m_startingMailNewsProfileAge);
+
+		intPref = 1; // default in case we fail
+		prefError = PREF_GetIntPref("mail.show_headers", &intPref);
+		switch (intPref)
+		{
+		case 0: m_headerstyle = MSG_ShowMicroHeaders; break;
+		case 1: m_headerstyle = MSG_ShowSomeHeaders; break;
+		case 2: m_headerstyle = MSG_ShowAllHeaders; break;
+		default:
+			XP_ASSERT(FALSE);
+			break;
+		}
+
+		intPref = 0; // if no pref is set, return 0 - let the backend set the default port
+		HG87635
+
+
+		// Server preference.
+		// ### mwelch This used to use mail.use_imap, but we're switching
+		//            to mail.server_type as of 4.0b2.
+		intPref = 0; // pop by default
+		prefError = PREF_GetIntPref("mail.server_type", &intPref);
+		m_mailInputType = intPref;
+		m_mailServerIsIMAP = (m_mailInputType == 1);
+
+		PREF_GetIntPref("mail.purge_threshhold", &m_purgeThreshhold);
+		// Get string prefs.
+
+		if (!m_freezeMailDirectory)
+		{
+			// m_localMailDirectory
+			strPref = m_localMailDirectory;
+			m_localMailDirectory = NULL;
+
+			// Get the m_localMailDirectory pref. Passing in TRUE (expectFile) since the flag
+			// tells the Mac-specific code to make use of the name (usually "\pMail") in the FSSpec
+			// as well as the parent directory ID.
+			GetXPDirPathPref("mail.directory", TRUE, &m_localMailDirectory);
+
+#if defined (XP_MAC)
+			if (!m_localMailDirectory || !*m_localMailDirectory)
+			{
+				Assert_(FALSE); // can this happen?  If not, remove this.
+				char *newDirURL = NULL;
+				// ### mwelch This is a hack, because the MacFE
+				//            doesn't set the mail root directory by default.
+				FSSpec mailFolder = CPrefs::GetFolderSpec(CPrefs::MailFolder);
+				newDirURL = CFileMgr::EncodedPathNameFromFSSpec(mailFolder, true);
+				m_localMailDirectory = newDirURL;
+			}
+#endif
+		
+			// It is still possible to have a NULL directory at this
+			// point in the code. This is because the WinFE sets the default
+			// mail directory preference after creating the prefs object.
+			
+			if (m_localMailDirectory)
+			{
+				// by arbitrary convention, the directory shouldn't have 
+				// a trailing slash
+				int len = XP_STRLEN(m_localMailDirectory);
+				if (len && m_localMailDirectory[len-1] == '/')
+					m_localMailDirectory[len-1] = '\0';
+				
+#if !defined(XP_MAC) && !defined(XP_WIN) && !defined(XP_OS2)
+				if (!strPref || strcmp(m_localMailDirectory, strPref))
+				{
+					// Create the directory if it doesn't exist (Unix only)
+					XP_StatStruct dirStat;
+					if (-1 == XP_Stat(m_localMailDirectory, &dirStat, xpMailFolder))
+						XP_MakeDirectory (m_localMailDirectory, xpMailFolder);
+				}
+#endif
+			}
+			if (strPref) XP_FREE(strPref);
+		}
+		HG93653
+		char onlineDir[256];
+		onlineDir[0] = '\0';
+		int stringSize = 256;
+		PREF_GetCharPref("mail.imap.server_sub_directory", 
+						 onlineDir, &stringSize);
+		if ( *onlineDir && (*(onlineDir + XP_STRLEN(onlineDir) - 1) != '/') )
+			XP_STRCAT(onlineDir, "/");
+		if ((!m_OnlineImapSubDir) || 
+			((m_OnlineImapSubDir) &&
+			 XP_STRCMP(onlineDir, m_OnlineImapSubDir)))
+		{
+			FREEIF(m_OnlineImapSubDir);
+			m_OnlineImapSubDir = XP_STRDUP(onlineDir);
+			//if (XP_STRCMP(m_OnlineImapSubDir,""))	// only set it if it is not empty
+			//	IMAP_SetNamespacesFromPrefs(GetPopHost(), m_OnlineImapSubDir, "", "");
+		}
+
+		PREF_GetBoolPref("mailnews.searchServer", &m_searchServer);
+
+		PREF_GetBoolPref("mailnews.searchSubFolders", &m_searchSubFolders);
+
+		PREF_GetBoolPref("mailnews.confirm.moveFoldersToTrash", &m_confirmMoveFoldersToTrash);
+
+		FREEIF(m_customHeaders);
+		PREF_CopyCharPref("mailnews.customHeaders",&m_customHeaders);  
+
+		FREEIF(m_citationColor);
+		PREF_CopyCharPref("mail.citation_color", &m_citationColor);
+		
+		FREEIF(m_popHost);
+		PREF_CopyCharPref("network.hosts.pop_server", &m_popHost);
+		
+		PREF_GetBoolPref("mail.imap.delete_is_move_to_trash", &m_ImapDeleteMoveToTrash);
+		
+		// Set the smtp and news (nntp) hosts.
+		strPref = NULL;
+		prefError = PREF_CopyCharPref("network.hosts.smtp_server", &strPref);
+		if (prefError == PREF_NOERROR)
+			NET_SetMailRelayHost(strPref);
+		XP_FREEIF(strPref);
+
+		for(int i=0;i<(int) num_of_header_prefs ;i++)
+		{
+			strPref = NULL;
+			// Only look at the path if the "use it" bool flag is set!
+			// Bug #45449 jrm
+			XP_Bool doingFccPath = TRUE, wantsFccPath = FALSE;
+			if (i == mail_default_fcc || i == mail_imap_sentmail_path)
+#ifdef XP_MAC
+				PREF_GetBoolPref("mail.use_fcc", &wantsFccPath);
+#else
+			    wantsFccPath = TRUE;
+#endif
+			else if (i == news_default_fcc || i == news_imap_sentmail_path)
+#ifdef XP_MAC
+				PREF_GetBoolPref("news.use_fcc", &wantsFccPath);
+#else
+			    wantsFccPath = TRUE;
+#endif
+			else
+				doingFccPath = FALSE;
+			if (doingFccPath && wantsFccPath)
+			{
+				prefError = GetXPDirPathPref(headerPrefNames[i], TRUE, &strPref);
+				if ((prefError != PREF_NOERROR) || (!strPref) || (!*strPref) ||
+					(m_localMailDirectory && !XP_STRCMP(strPref, m_localMailDirectory)))
+				{
+					// Take the directory preference and add "Sent" to it.
+					char *sent = XP_GetString(MK_MSG_SENT_L10N_NAME);
+					XP_FREEIF(strPref);
+
+					if (m_localMailDirectory && *m_localMailDirectory)
+						strPref = PR_smprintf("%s/%s", m_localMailDirectory, sent);
+
+#ifdef XP_MAC
+					// Still may need to ensure the file exists.
+					SetXPMailFilePref(headerPrefNames[i], strPref);
+#endif
+				}
+			}
+			else if (!doingFccPath)
+				PREF_CopyCharPref(headerPrefNames[i], &strPref);
+			FREEIF(m_defaultHeaders[i]);
+			m_defaultHeaders[i] = strPref;
+		}
+
+		// Collect all the email addresses which specify the user. We'll need to know them
+		// when checking the Reply recipients, or doing MDN receipts
+		if (PREF_NOERROR == PREF_CopyCharPref ("mail.identity.useremail.aliases", &strPref))
+		{
+			if (*strPref) // default is empty string. don't create an array for that
+			{
+				if (!m_emailAliases)
+					m_emailAliases = new msg_StringArray (TRUE /*ownsMemory*/);
+				if (m_emailAliases)
+				{
+					m_emailAliases->RemoveAll();
+					m_emailAliases->ImportTokenList (strPref);
+				}
+			}
+			XP_FREE (strPref);
+		}
+
+		// Collect the email addresses which can't be considered aliases for this user.
+		// This is intended to keep the email aliases feature from defeating the reply-to
+		// header in messages
+		char *replyTo = m_defaultHeaders[mail_identity_reply_to];
+		if (replyTo && *replyTo)
+		{
+			if (!m_emailAliasesNot)
+				m_emailAliasesNot = new msg_StringArray (TRUE);
+			if (m_emailAliasesNot)
+			{
+				char *addresses = NULL;
+				int num = 0;
+				if (0 != (num = MSG_ParseRFC822Addresses (replyTo, NULL, &addresses)))
+				{
+					// We're ignoring the name of the reply-to header, since the
+					// actual address is all we care about for the alias calculation
+					m_emailAliasesNot->RemoveAll();
+					for (int i = 0; i < num; i++)
+					{
+						m_emailAliasesNot->Add (addresses);
+						addresses += XP_STRLEN (addresses) + 1;
+					}
+				}
+			}
+		}
+
+
+	}
+	m_dirty = FALSE;
+}
+
+int PR_CALLBACK MSG_PrefsChangeCallback(const char * prefName, void *data)
+{
+	MSG_Prefs *prefs = (MSG_Prefs *) data;
+
+	if (prefs)
+		prefs->m_dirty = TRUE;
+
+	// Depending on the preference being changed,
+	// notify listeners as to the change.
+
+	// Default headers first, since we have easy access to them.
+	for (int i=0;i<(int) num_of_header_prefs;i++)
+	{
+		if (!XP_STRCMP(prefName, headerPrefNames[i]))
+		{
+			prefs->Notify(MSG_PrefsNotify::DefaultHeader);
+			return PREF_NOERROR;
+		}
+	}
+
+	if (!XP_STRNCMP(prefName, "netw", 4))
+	{
+    	// cause smtp and news host to be set to new values immediately
+        if (prefs) prefs->Reload(); 
+	}
+	else if (!XP_STRNCMP(prefName, "mail", 4))
+	{
+		if (0) ;
+	}
+
+	return PREF_NOERROR;
+}
+
+MSG_Prefs::MSG_Prefs()
+{
+	m_citationFont = MSG_PlainFont;
+	m_citationFontSize = MSG_Bigger;
+	m_plainText = TRUE;
+	m_mailServerIsIMAP = FALSE;
+	HG98298
+	m_ImapDeleteMoveToTrash = TRUE;
+	m_IMAPdirectory = NULL;
+	m_headerstyle = MSG_ShowSomeHeaders;
+	m_masterForBiff = NULL;
+	m_notifying = FALSE;
+
+	// Set up dirty flag.
+	m_dirty = TRUE;
+	m_freezeMailDirectory = FALSE;
+
+	m_emailAliases = NULL;
+	m_emailAliasesNot = NULL;
+
+	// Set up prefs callback.
+	PREF_RegisterCallback("mail.", &MSG_PrefsChangeCallback, this);
+	PREF_RegisterCallback("news.", &MSG_PrefsChangeCallback, this);
+	PREF_RegisterCallback("mailnews.", &MSG_PrefsChangeCallback, this);
+	PREF_RegisterCallback("network.hosts.", &MSG_PrefsChangeCallback, this);
+
+	// Load pref values from the prefs api.
+	// (We can rely on the string members being NULL initially 
+	// since we derive from MSG_Zap.)
+	Reload();
+
+
+	// we are only interested in what this prefs value was at startup so initialize it
+	// here rather than in Reload()
+	m_startingMailNewsProfileAge = 0;
+	PREF_GetIntPref("mailnews.profile_age",&m_startingMailNewsProfileAge);
+	HG92734
+}
+
+MSG_Prefs::~MSG_Prefs() 
+{
+	XP_ASSERT(m_numnotify == 0);
+	FREEIF(m_localMailDirectory);
+	FREEIF(m_citationColor);
+	FREEIF(m_popHost);
+	for (int i=0 ; i<sizeof(m_defaultHeaders)/sizeof(char*) ; i++) 
+		FREEIF(m_defaultHeaders[i]);
+	XP_FREEIF(m_IMAPdirectory);
+
+	delete m_emailAliases;
+	m_emailAliases = NULL;
+	delete m_emailAliasesNot;
+	m_emailAliasesNot = NULL;
+
+}
+
+
+
+void MSG_Prefs::AddNotify(MSG_PrefsNotify* notify)
+{
+	MSG_PrefsNotify** tmp = m_notify;
+	m_notify = new MSG_PrefsNotify* [m_numnotify + 1];
+	for (int i=0 ; i<m_numnotify ; i++) {
+		XP_ASSERT(tmp[i] != notify);
+		m_notify[i] = tmp[i];
+	}
+	m_notify[m_numnotify++] = notify;
+	delete [] tmp;  // not sure why this wasn't here before.
+					// Could have used XP_PtrArray...
+}
+
+
+void MSG_Prefs::RemoveNotify(MSG_PrefsNotify* notify)
+{
+	int i = 0;
+
+	if (m_notifying)
+	{
+		// We're in the process of notifying listeners, so we
+		// can't shuffle pointers around.
+		// Just null out the pointer in question, Notify will
+		// clean up after us.
+		for (; i<m_numnotify; i++)
+		{
+			if (m_notify[i] == notify)
+				m_notify[i] = NULL;
+		}
+		return;
+	}
+
+	// If we're not notifying listeners, just replace the
+	// dead element with the last in the list, then decrement
+	// the listener count.
+	for (; i<m_numnotify ; i++) 
+	{
+		if (m_notify[i] == notify) 
+		{
+			m_notify[i] = m_notify[--m_numnotify];
+			return;
+		}
+	}
+	XP_ASSERT(0);
+}
+
+XP_Bool MSG_Prefs::GetSearchServer()
+{
+	Reload();
+	return m_searchServer;
+}
+
+XP_Bool MSG_Prefs::GetSearchSubFolders()
+{
+	Reload();
+	return m_searchSubFolders;
+}
+
+int32 MSG_Prefs::GetNumCustomHeaders()
+{
+	Reload();
+	// determine number of custom headers in the preference so far....
+	int count = 0;
+	
+	if (!m_customHeaders)
+		return 0;
+
+	char * buffer = XP_STRDUP(m_customHeaders);
+	char * marker = buffer;
+
+	while (XP_STRTOK_R(nil, ":, ", &buffer))
+		count++;
+	XP_FREEIF(marker);
+	return count;
+}
+
+
+// caller must use XP_FREE to deallocate the header string this returns.
+char * MSG_Prefs::GetNthCustomHeader(int offset)
+{
+	Reload();
+	char * temp = NULL;
+	if (offset < 0)
+		return temp;
+
+	if (!m_customHeaders)
+		return NULL;
+
+	char * buffer = XP_STRDUP(m_customHeaders);
+	char * marker = buffer;
+
+	for (int count = 0; count <= offset; count++)
+	{
+		temp = XP_STRTOK_R(nil,",: ",&buffer);
+		if (!temp)
+			break;
+	}
+
+	// temp now points to the token string
+	if (temp)
+		temp = XP_STRDUP(temp); // make a copy of the string  // caller must deallocate the space
+
+	XP_FREEIF(marker);      // free our copy of the buffer...
+	return temp;
+}
+
+
+#ifdef XP_UNIX
+void MSG_Prefs::SetFolderDirectory(const char* d)
+{
+	PREF_SetCharPref("mail.directory", d);
+	m_dirty = TRUE;
+}
+#else
+void MSG_Prefs::SetFolderDirectory(const char*)
+{
+}
+#endif
+
+
+const char *MSG_Prefs::GetFolderDirectory()
+{
+	Reload();
+	return m_localMailDirectory;
+}
+
+const char *MSG_Prefs::GetIMAPFolderDirectory()
+{
+	Reload();
+	if (!m_IMAPdirectory)
+	{
+		char *machinePathName = 0;
+		if (m_popHost)
+		{
+			// see if there's a :port in the server name.  If so, strip it off when
+			// creating the server directory.
+			char *server = XP_STRDUP(m_popHost);
+			char *port = 0;
+			if (server)
+			{
+				port = XP_STRCHR(server,':');
+				if (port)
+				*port = 0;
+				machinePathName = WH_FileName(server, xpImapServerDirectory);
+				XP_FREE(server);
+			}	
+		}
+		if (machinePathName)
+		{
+			char *imapUrl = XP_PlatformFileToURL (machinePathName);
+			if (imapUrl)
+			{
+				m_IMAPdirectory = XP_STRDUP(imapUrl + XP_STRLEN("file://"));
+				XP_FREE(imapUrl);
+			}
+			XP_FREE (machinePathName);
+		}
+	}
+	return m_IMAPdirectory;
+}
+
+
+void MSG_Prefs::GetCitationStyle(MSG_FONT* f, MSG_CITATION_SIZE* s, const char** c)
+{
+	Reload();
+	if (f) *f = m_citationFont;
+	if (s) *s = m_citationFontSize;
+	if (c) *c = m_citationColor;
+}
+
+
+const char* MSG_Prefs::GetPopHost() 
+{
+	Reload();
+	return m_popHost;
+}
+
+XP_Bool MSG_Prefs::IMAPMessageDeleteIsMoveToTrash()
+{
+	Reload();
+	return m_ImapDeleteMoveToTrash;
+}
+
+/*
+const char *MSG_Prefs::GetOnlineImapSubDir()
+{
+	Reload();
+	return m_OnlineImapSubDir;
+}
+*/
+
+XP_Bool MSG_Prefs::GetMailServerIsIMAP4()
+{
+	Reload();
+	return m_mailServerIsIMAP;
+}
+
+HG87637
+
+const char *MSG_Prefs::GetCopyToSentMailFolderPath()
+{
+	return GetDefaultHeaderContents(MSG_FCC_HEADER_MASK);
+}
+
+MSG_CommandType MSG_Prefs::GetHeaderStyle()
+{
+	Reload();
+	return m_headerstyle;
+}
+
+XP_Bool MSG_Prefs::GetNoInlineAttachments()
+{
+	Reload();
+	return m_noinline;
+}
+
+XP_Bool MSG_Prefs::GetWrapLongLines()
+{
+	Reload();
+	return m_wraplonglines;
+}
+
+XP_Bool MSG_Prefs::GetAutoQuoteReply() 
+{
+	Reload();
+	return m_autoQuote;
+}
+
+const char* MSG_Prefs::GetDefaultHeaderContents(MSG_HEADER_SET header) 
+{
+	Reload();
+	int i = ConvertHeaderSetToSubscript(header);
+	if (i < 0) 
+		return NULL;
+	return m_defaultHeaders[i];
+}
+
+XP_Bool MSG_Prefs::GetDefaultBccSelf(XP_Bool newsBcc)
+{
+	Reload();
+	return newsBcc ? m_newsBccSelf : m_mailBccSelf;
+}
+
+int32 MSG_Prefs::GetPurgeThreshhold()
+{
+    Reload();
+	return m_purgeThreshhold;
+}
+
+XP_Bool MSG_Prefs::GetPurgeThreshholdEnabled()
+{
+    Reload();
+	return m_purgeThreshholdEnabled;
+}
+
+XP_Bool MSG_Prefs::GetShowPrettyNames()
+{
+    Reload();
+	return m_showPrettyNames;
+}
+
+HG92435
+
+XP_Bool MSG_Prefs::GetNewsNotifyOn()
+{
+    Reload();
+	return m_newsNotifyOn;
+}
+
+void MSG_Prefs::SetNewsNotifyOn(XP_Bool notify)
+{
+	PREF_SetBoolPref("news.notify.on", notify);
+}
+
+MSG_NCFValue MSG_Prefs::GetNavCrossesFolders()
+{
+    Reload();
+	return (MSG_NCFValue) m_navCrossesFolders;
+}
+
+void MSG_Prefs::SetNavCrossesFolders(MSG_NCFValue cross)
+{
+	PREF_SetIntPref("mailnews.nav_crosses_folders", (int32) cross);
+}
+
+MSG_Master *MSG_Prefs::GetMasterForBiff()
+{
+    Reload();
+	return m_masterForBiff;
+}
+
+void MSG_Prefs::SetMasterForBiff(MSG_Master *mstr)
+{
+	// Since we're dealing with a mail master, this by
+	// definition is a temporary preference. So, just
+	// set the member in this case.
+	m_masterForBiff = mstr;
+}
+
+
+XP_Bool MSG_Prefs::CopyStringIfChanged(char** str, const char* value) 
+{
+	if (*str == NULL && value == NULL) return FALSE;
+	if (*str && value && XP_STRCMP(*str, value) == 0) return FALSE;
+
+	if (*str)
+		delete [] *str;
+	if (value) 
+	{
+		*str = new char[XP_STRLEN(value) + 1];
+		if (*str) 
+			XP_STRCPY(*str, value);
+	} 
+	else 
+		*str = NULL;
+	return TRUE;
+}
+
+
+int MSG_Prefs::ConvertHeaderSetToSubscript(MSG_HEADER_SET header) 
+{
+	switch (header) 
+	{
+		case MSG_REPLY_TO_HEADER_MASK:
+			return 0;
+		case MSG_BCC_HEADER_MASK:
+			return 1;
+		case MSG_FCC_HEADER_MASK:
+		{
+			XP_Bool use_imap_sentmail = FALSE;
+			PREF_GetBoolPref("mail.use_imap_sentmail", &use_imap_sentmail);
+			if (use_imap_sentmail)
+				return 3;
+			else
+				return 2;
+		}
+		case MSG_NEWS_BCC_HEADER_MASK:
+			return 4;
+		case MSG_NEWS_FCC_HEADER_MASK:
+		{
+			XP_Bool use_imap_sentmail = FALSE;
+			PREF_GetBoolPref("news.use_imap_sentmail", &use_imap_sentmail);
+			if (use_imap_sentmail)
+				return 6;
+			else
+				return 5;
+		}
+		default:
+			XP_ASSERT (0);
+			return -1;
+	}
+}
+
+
+msg_StringArray *MSG_Prefs::m_emailAliases = NULL;
+msg_StringArray *MSG_Prefs::m_emailAliasesNot = NULL;
+
+/*static*/ XP_Bool MSG_Prefs::IsEmailAddressAnAliasForMe (const char *addr)
+{
+	// Does the address match one of the user's alias expressions (e.g. foo@*.netscape.com)
+
+	if (m_emailAliasesNot)
+	{
+		// Some addresses can't be considered aliases. Right now, this is just used
+		// for the Reply-To address, so that if you Reply All, your Reply-To address 
+		// will be included, or if you send yourself an MDN request, you'll get one back
+		//
+		// NB: this list is guaranteed to hold only addresses, not names, so we can strcmp
+		// it without parsing it (here)
+		for (int i = 0; i < m_emailAliasesNot->GetSize(); i++)
+			if (!strcasecomp (addr, m_emailAliasesNot->GetAt(i)))
+				return FALSE;
+	}
+
+	if (m_emailAliases) // master/prefs may not have been initialized yet
+	{
+		for (int i = 0; i < m_emailAliases->GetSize(); i++)
+		{
+			char *alias = (char*) m_emailAliases->GetAt(i); //Hacky cast: regexp API isn't const
+
+			if (VALID_SXP == NET_RegExpValid (alias))
+			{
+				// The alias is a regular expression, so send it into the regexp evaluator
+				if (!NET_RegExpMatch ((char*) addr, alias, FALSE /*case sensitive*/))
+					return TRUE;
+			}
+			else
+			{
+				// The alias is not a regular expression, so just use a string compare
+				if (!strcasecomp (addr, alias))
+					return TRUE;
+			}
+		}
+	}
+	return FALSE;
+}
+
diff --git a/mozilla/lib/mailto/msgprefs.h b/mozilla/lib/mailto/msgprefs.h
new file mode 100644
index 00000000000..fa5b500103b
--- /dev/null
+++ b/mozilla/lib/mailto/msgprefs.h
@@ -0,0 +1,301 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1997 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgPrefs_H_
+#define _MsgPrefs_H_
+
+#include "msgzap.h"
+#include "rosetta.h"
+
+/*
+  mwelch 97 July:
+
+  Before adding anything new to MSG_Prefs, consider whether your
+  new preference can best be managed using the prefs API directly.
+  If you are not getting the preference value often or otherwise
+  have no need to cache the prefs value, you are probably better
+  off calling the prefs API everywhere and leaving this object 
+  alone.
+
+  Having said that, if you want to add a new member variable and
+  its access functions to MSG_Prefs, here is the way you want to
+  do this, in order to keep the world happy. (Specific conditions,
+  of course, may apply to your preference; the instructions below
+  apply to most circumstances.)
+
+  If a change in your preference does not need to trigger an immediate
+  action:
+
+  1. Put a call to PREF_Get{Int,Bool,Char,etc.)Pref in the Reload()
+     method for your member variable and its corresponding JavaScript
+	 preference name. This should be the only way by which your 
+	 member variable is set.
+
+  2. Your Get() accessor function must call Reload() before returning 
+     the member value. This is the way by which you can be assured that
+	 the most recently set preference value
+
+  3. If you must have a Set() accessor, implement it in such a way
+     that it calls PREF_Set{Int,Bool,Char,etc.}Pref, instead of
+	 setting your member variable directly. This way, the prefs API 
+	 (and the user's preferences.js file) is properly updated. The 
+	 new value circulates back using Reload() and Get() as 
+	 described above.
+
+  If a change in your preference requires an immediate response (alert,
+  change in behavior, etc):
+
+  1. Implement the preference as described above.
+
+  2. In MSG_PrefsChangeCallback, there is a top-level parse tree (looking
+     for names beginning with "mail", "news", or "netw"). Find the clause
+	 corresponding to your preference name and add a condition with code
+	 that needs to run when your preference changes. Even if the code that
+	 runs within MSG_PrefsChangeCallback always reloads on its own, you 
+	 still want to leave a load call within Reload() in order to load 
+	 the initial value at startup time.
+
+  If you have a transaction that spans across several preference changes,
+  be sure to tell the right people so that we can someday have calls to
+  transactionalize preference changes. Currently, all we can do is respond
+  to changes to individual preferences.
+ */
+class MSG_PrefsNotify;
+class msg_StringArray;
+
+int PR_CALLBACK MSG_PrefsChangeCallback(const char *prefName, void *data);
+int PR_CALLBACK MSG_FccPrefChanged (const char *, void *msgPrefs);
+int PR_CALLBACK MSG_MailServerTypeChanged (const char *, void *msgPrefs);
+int PR_CALLBACK MSG_DraftsPrefChanged (const char *, void *msgPrefs);
+int PR_CALLBACK MSG_TemplatesPrefChanged (const char *, void *msgPrefs);
+int PR_CALLBACK MSG_UseImapSentmailPrefChanged (const char *prefName, void *msgPrefs);
+int msg_FolderPrefChanged(const char *, void *msgPrefs, uint32 flag);
+
+// Corresponds to pref("mailnews.nav_crosses_folders", 0)
+// 0=do it, don't prompt 1=prompt, 2=don't do it, don't prompt
+typedef enum {
+  MSG_NCFDoIt = 0,
+  MSG_NCFPrompt = 1,
+  MSG_NCFDont = 2
+} MSG_NCFValue;
+
+
+#define MSG_IMAP_DELETE_MODEL_UPGRADE_FLAG		0x00000001 // upgraded to imap delete model?
+#define MSG_IMAP_SPECIAL_RESERVED_UPGRADE_FLAG	0x00000002 // RESERVED.  DO NOT CHANGE THIS VALUE!
+#define MSG_IMAP_SUBSCRIBE_UPGRADE_FLAG			0x00000004 // upgraded to IMAP subscription?
+#define MSG_IMAP_DEFAULT_HOST_UPGRADE_FLAG		0x00000008 // upgraded default host to new per host prefs
+#define MSG_IMAP_CURRENT_START_FLAGS			( MSG_IMAP_DELETE_MODEL_UPGRADE_FLAG \
+												| MSG_IMAP_SUBSCRIBE_UPGRADE_FLAG \
+												| MSG_IMAP_DEFAULT_HOST_UPGRADE_FLAG)
+class MSG_Prefs : public MSG_ZapIt 
+{
+public:
+
+	MSG_Prefs(void);
+	virtual ~MSG_Prefs();
+
+	void AddNotify(MSG_PrefsNotify* notify);
+	void RemoveNotify(MSG_PrefsNotify* notify);
+
+	void        SetFolderDirectory(const char* directory);
+	const char* GetFolderDirectory();
+	const char* GetIMAPFolderDirectory();
+
+	// This preference is used to help decide when to perform one time tricks, based
+	// on the age of the current user profile.  
+
+	// The theory is:  On a fresh install (actually, the creation of a new user profile),
+	// we should never do any one-time upgrade tricks.
+	// On an install over a previous verison, we should run each of the upgrade tricks that
+	// haven't already been run, for each old profile.
+
+	// The first such example is dealing with the introduction of the imap delete messages
+	// model in 4.02.  We wanted the imap delete model to be the default out of the box but 
+	// we also wanted a painless upgrade for existing users who use the delete to trash model.
+	// The solution is to make the imap delete model the default but if you haven't run the
+	// IMAP delete model upgrade and you have a trash folder, then change the preference to the
+	// trash model.  In either case, the profile age is now changed to reflect that we have made
+	// this upgrade, by setting the appropriate bit. 
+
+	// We will do this in a bitwise manner, so that individual one-time tricks do not depend
+	// on the order in which we check for them.
+
+	// This preference should ALWAYS be written to the prefs.js file, unless the value is 0.
+	// A value of 0 indicates an upgrade from Communicator 4.0, in which no upgrades have ever
+	// been run.
+
+	// The value written out to the prefs should be the sum of all trick flags which have been run.
+	// On a fresh install, we automatically write out the following number:
+	// {sum of all flags used for an upgrade trick}
+	// We do this in config.js, in modules\libpref\src\init
+
+	// The default value (in all.js) should ALWAYS be 0.  This is because if the preference isn't
+	// present in the prefs.js file, then it means the value is implicitly 0 (because we are
+	// upgrading from 4.0, and none of the one-time tricks have been run).
+
+	// So, when a new flag is added here, you should also modify "mailnews.profile_age" in config.js
+	// to be the following number:
+	// {sum of all flags used for an upgrade trick}
+
+	// The Flags
+	// see above for #definitions
+	// 0x00000001 (reserved for the imap delete model trick)
+	// 0x00000004 (reserved for migrating to IMAP subscription)
+	// 0x00000008 MSG_IMAP_DEFAULT_HOST_UPGRADE_FLAG (upgraded default host to new per host prefs)
+	//
+	//
+	// *(The special reserved upgrade flag is purposely not used for an upgrade anywhere, except in calculating
+	//   the default value for all.js.  This is because we always want the value of "mailnews.profile_age"
+	//   written out to the prefs file -- it can NEVER take on the "default" value, or else it will be
+	//   removed from prefs.js, and this will defeat the purpose of writing out the "current" profile age.
+	//   If we were to ever upgrade, it would find the preference not written out, and assume that it is
+	//   up-to-date.
+	//   To ensure that it is always written out to the file, in the creation of the MSG_Master we will 
+	//   un-set this flag each time, so that on a fresh install, the preference will get written out.
+
+	// current total = 1+4+8 = 13 (see #define MSG_IMAP_CURRENT_START_FLAGS above)
+
+	int32		GetStartingMailNewsProfileAge();
+	void		SetMailNewsProfileAgeFlag(int32 flag, XP_Bool set = TRUE);  // call this when we perform an upgrade, to set that upgrade bit
+
+	HG97760
+	XP_Bool         GetMailServerIsIMAP4();
+	MSG_CommandType GetHeaderStyle();
+	XP_Bool         GetNoInlineAttachments();
+	XP_Bool         GetWrapLongLines();
+	XP_Bool         GetDefaultBccSelf(XP_Bool newsBcc);
+	XP_Bool         GetAutoQuoteReply();
+	const char *    GetDefaultHeaderContents(MSG_HEADER_SET header);
+	const char *    GetCopyToSentMailFolderPath();
+	//const char *    GetOnlineImapSubDir(); // online subdir for imap folders
+	int32           GetPurgeThreshhold();
+	XP_Bool         GetPurgeThreshholdEnabled();
+	void            GetCitationStyle(MSG_FONT* font, MSG_CITATION_SIZE* size, const char** color);
+	const char *    GetPopHost();
+	XP_Bool         IMAPMessageDeleteIsMoveToTrash();
+	XP_Bool			GetSearchSubFolders();
+	XP_Bool			GetSearchServer();
+
+	// Queries for things that are derived off of the preferences.
+	int32			GetNumCustomHeaders();
+	char *			GetNthCustomHeader(int offset); // caller must use XP_FREEIF on the character string returned
+
+
+	// Get the full pathname of the folder implementing the given magic type.
+	// The result must be free'd with XP_FREE().
+	char *          MagicFolderName(uint32 flag, int *pStatus = 0);
+
+	//    I believe this should be a global preference and not per server
+	XP_Bool         GetShowPrettyNames();
+
+	XP_Bool         GetNewsNotifyOn();
+	void            SetNewsNotifyOn(XP_Bool notifyOn);
+
+	MSG_NCFValue    GetNavCrossesFolders();
+	void            SetNavCrossesFolders(MSG_NCFValue navCrossesFoldersOn);
+
+	void            SetMasterForBiff(MSG_Master *masterForBiff);
+	MSG_Master *    GetMasterForBiff();
+
+	static XP_Bool	IsEmailAddressAnAliasForMe (const char *addr);
+
+	static int GetXPDirPathPref(const char *prefName, XP_Bool expectFile, char ** result);
+	static int SetXPMailFilePref(const char *prefName, char * xpPath);
+	static void PlatformFileToURLPath(const char *src, char **dest);
+	HG82309
+
+	XP_Bool			GetConfirmMoveFoldersToTrash() { Reload(); return m_confirmMoveFoldersToTrash; }
+
+protected:
+
+	XP_Bool m_dirty; // need to reload prefs at next Get() call
+
+	// m_freezeMailDirectory, if TRUE, prevents (directory) from
+	// getting a new value. We set this TRUE in order to ensure that
+	// (directory) will only get one meaningful value within a session.
+	XP_Bool m_freezeMailDirectory;
+
+    void Reload(void); // reload if dirty flag is set
+    void Notify(int16 updateCode);
+
+	// callback when javascript prefs value(s) change
+	friend int PR_CALLBACK MSG_PrefsChangeCallback(const char *prefName, void *data);
+	friend int msg_FolderPrefChanged (const char *, void *msgPrefs, uint32 flag);
+
+	XP_Bool CopyStringIfChanged(char** str, const char* newvalue);
+
+	int ConvertHeaderSetToSubscript(MSG_HEADER_SET header);
+
+	HG72142
+
+	MSG_Master *m_masterForBiff;
+
+	// Notification prefs (is this all obsolete? or should it be?)
+	MSG_PrefsNotify **m_notify;
+	int               m_numnotify;
+	XP_Bool           m_notifying; // Are we in the middle of notifying listeners?
+
+	// IMAP prefs
+	char *   m_IMAPdirectory;
+	char *   m_OnlineImapSubDir;
+	XP_Bool  m_ImapDeleteMoveToTrash;
+	XP_Bool  m_mailServerIsIMAP;
+	HG29866
+
+	// Search and Filter prefs
+	char *   m_customHeaders;  // arbitrary headers list.
+	int32    m_numberCustomHeaders;
+
+	XP_Bool  m_searchSubFolders;
+	XP_Bool  m_searchServer;  // when in online mode, search server or search locally (if false)
+
+	// Quoting prefs
+	XP_Bool           m_autoQuote;
+	MSG_FONT          m_citationFont;
+	MSG_CITATION_SIZE m_citationFontSize;
+	char *            m_citationColor;
+
+	char *  m_localMailDirectory;
+	XP_Bool m_plainText;
+	char *  m_popHost;
+	char *  m_defaultHeaders[7];
+	XP_Bool m_mailBccSelf;
+	XP_Bool m_newsBccSelf;
+	long    m_mailInputType;
+	MSG_CommandType m_headerstyle;
+	XP_Bool m_noinline;
+	XP_Bool m_wraplonglines;
+	XP_Bool m_showPrettyNames;
+	XP_Bool m_purgeThreshholdEnabled;
+	int32	m_purgeThreshhold;
+	XP_Bool m_newsNotifyOn;
+	int32	m_navCrossesFolders;
+	int32   m_startingMailNewsProfileAge;
+	XP_Bool m_confirmMoveFoldersToTrash;
+
+	static msg_StringArray *m_emailAliases;
+	static msg_StringArray *m_emailAliasesNot;
+
+	char *	m_draftsName;
+	char *	m_sentName;
+	char *	m_templatesName;
+};
+
+const char * msg_DefaultFolderName(uint32 flag);
+
+#endif /* _MsgPrefs_H_ */
diff --git a/mozilla/lib/mailto/msgprnot.h b/mozilla/lib/mailto/msgprnot.h
new file mode 100644
index 00000000000..c915c259417
--- /dev/null
+++ b/mozilla/lib/mailto/msgprnot.h
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgPrNot_H_
+#define _MsgPrNot_H_
+
+#include "msgzap.h"
+#include "rosetta.h"
+
+class MSG_Prefs;
+
+class MSG_PrefsNotify : public MSG_ZapIt {
+public:
+  // Codes to notify us that a preference item has changed.
+	enum NotifyCode {
+		Directory,
+		CitationStyle,
+		PlaintextFont,
+		PopHost,
+		AutoQuote,
+		DefaultHeader,
+		DefaultBCC,
+		MailServerType,
+		ImapOnlineDir,
+		HG62422
+		WrapLongLines,
+		ChangeIMAPDeleteModel
+	};
+
+  virtual void NotifyPrefsChange(NotifyCode code) = 0;
+
+
+};
+
+
+#endif /* _MsgPrNot_H_ */
diff --git a/mozilla/lib/mailto/msgsend.cpp b/mozilla/lib/mailto/msgsend.cpp
new file mode 100644
index 00000000000..11eefc596ba
--- /dev/null
+++ b/mozilla/lib/mailto/msgsend.cpp
@@ -0,0 +1,4886 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*   compose.c --- generation and delivery of MIME objects.
+ */
+
+#include "rosetta.h"
+#include "msg.h"
+#include "ntypes.h"
+#include "structs.h"
+#include "xlate.h"		/* Text and PostScript converters */
+#include "merrors.h"
+#include "gui.h"		/* for XP_AppCodeName */
+#include "mime.h"
+#include "xp_time.h"	/* For XP_LocalZoneOffset() */
+#include "libi18n.h"
+#include "xpgetstr.h"
+#include "prtime.h"
+#include "prtypes.h"
+#include "msgcom.h"
+#include "msgsend.h"
+#include "msgsendp.h"
+#include "msgprefs.h"
+#include "msgmast.h"
+#include "msgcpane.h"
+#include  HG02902
+#include "msgcflds.h"
+#include "prefapi.h"
+#include "abdefn.h"
+#include "secrng.h"	/* for RNG_GenerateGlobalRandomBytes() */
+#ifdef XP_MAC
+#include "errors.h"
+#endif
+#include "intl_csi.h"
+#include "msgurlq.h"
+
+#ifdef XP_MAC
+#pragma warn_unusedarg off
+#endif // XP_MAC
+
+extern "C"
+{
+	extern int MK_MSG_ASSEMBLING_MSG;
+	extern int MK_MSG_ASSEMB_DONE_MSG;
+	extern int MK_MSG_LOAD_ATTACHMNT;
+	extern int MK_MSG_LOAD_ATTACHMNTS;
+	extern int MK_MSG_DELIV_MAIL;
+	extern int MK_MSG_DELIV_MAIL_DONE;
+	extern int MK_MSG_DELIV_NEWS;
+	extern int MK_MSG_DELIV_NEWS_DONE;
+	extern int MK_MSG_QUEUEING;
+	extern int MK_MSG_WRITING_TO_FCC;
+	extern int MK_MSG_QUEUED;
+	extern int MK_MIME_ERROR_WRITING_FILE;
+	extern int MK_MIME_MULTIPART_BLURB;
+	extern int MK_MIME_NO_RECIPIENTS;
+	extern int MK_MIME_NO_SENDER;
+	extern int MK_MSG_COULDNT_OPEN_FCC_FILE;
+	extern int MK_OUT_OF_MEMORY;
+	extern int MK_UNABLE_TO_OPEN_TMP_FILE;
+	extern int MK_MSG_CANT_CREATE_FOLDER;
+	extern int MK_MSG_SAVE_DRAFT;
+	extern int MK_ADDR_BOOK_CARD;
+	extern int MK_MSG_MAC_PROMPT_UUENCODE;
+	extern int MK_MSG_SAVING_AS_DRAFT;
+	extern int MK_MSG_SAVING_AS_TEMPLATE;
+	extern int MK_MSG_UNABLE_TO_SAVE_DRAFT;
+	extern int MK_MSG_UNABLE_TO_SAVE_TEMPLATE;
+	extern int MK_UNABLE_TO_OPEN_FILE;
+	extern int MK_IMAP_UNABLE_TO_SAVE_MESSAGE;
+	extern int MK_IMAP_NO_ONLINE_FOLDER;
+}
+
+#ifdef XP_MAC
+#include "m_cvstrm.h"
+#endif
+
+#define TEN_K 10240
+#define MK_ATTACHMENT_LOAD_FAILED -666
+
+/* Asynchronous mailing of messages with attached URLs.
+
+   - If there are any attachments, start their URLs going, and write each
+     of them to a temp file.
+
+   - While writing to their files, examine the data going by and decide
+     what kind of encoding, if any, they need.  Also remember their content
+     types.
+
+   - Once that URLs has been saved to a temp file (or, if there were no
+     attachments) generate a final temp file, of the actual message:
+
+	 -  Generate a string of the headers.
+	 -  Open the final temp file.
+	 -  Write the headers.
+     -  Examine the first part, and decide whether to encode it.
+	 -  Write the first part to the file, possibly encoded.
+	 -  Write the second and subsequent parts to the file, possibly encoded.
+        (Open the first temp file and copy it to the final temp file, and so
+		on, through an encoding filter.)
+
+     - Delete the attachment temp file(s) as we finish with them.
+	 - Close the final temp file.
+	 - Open the news: url.
+	 - Send the final temp file to NNTP.
+	   If there's an error, run the callback with "failure" status.
+	 - If mail succeeded, open the mailto: url.
+	 - Send the final temp file to SMTP.
+	   If there's an error, run the callback with "failure" status.
+	 - Otherwise, run the callback with "success" status.
+	 - Free everything, delete the final temp file.
+
+  The theory behind the encoding logic:
+  =====================================
+
+  If the document is of type text/html, and the user has asked to attach it
+  as source or postscript, it will be run through the appropriate converter
+  (which will result in a document of type text/plain.)
+
+  An attachment will be encoded if:
+
+   - it is of a non-text type (in which case we will use base64); or
+   - The "use QP" option has been selected and high-bit characters exist; or
+   - any NULLs exist in the document; or
+   - any line is longer than 900 bytes.
+
+   - If we are encoding, and more than 10% of the document consists of
+     non-ASCII characters, then we always use base64 instead of QP.
+
+  We eschew quoted-printable in favor of base64 for documents which are likely
+  to always be binary (images, sound) because, on the off chance that a GIF
+  file (for example) might contain primarily bytes in the ASCII range, using
+  the quoted-printable representation might cause corruption due to the
+  translation of CR or LF to CRLF.  So, when we don't know that the document
+  has "lines", we don't use quoted-printable.
+ */
+
+
+/* It's better to send a message as news before sending it as mail, because
+   the NNTP server is more likely to reject the article (for any number of
+   reasons) than the SMTP server is. */
+#undef MAIL_BEFORE_NEWS
+
+/* Generating a message ID here is a good because it means that if a message
+   is sent to both mail and news, it will have the same ID in both places. */
+#define GENERATE_MESSAGE_ID
+
+
+/* For maximal compatibility, it helps to emit both
+      Content-Type: <type>; name="<original-file-name>"
+   as well as
+      Content-Disposition: inline; filename="<original-file-name>"
+
+  The lossage here is, RFC1341 defined the "name" parameter to Content-Type,
+  but then RFC1521 deprecated it in anticipation of RFC1806, which defines
+  Content-Type and the "filename" parameter.  But, RFC1521 is "Standards Track"
+  while RFC1806 is still "Experimental."  So, it's probably best to just
+  implement both.
+ */
+#define EMIT_NAME_IN_CONTENT_TYPE
+
+
+/* Whether the contents of the BCC header should be preserved in the FCC'ed
+   copy of a message.  See comments below, in mime_do_fcc_1().
+ */
+#define SAVE_BCC_IN_FCC_FILE
+
+
+/* When attaching an HTML document, one must indicate the original URL of
+   that document, if the receiver is to have any chance of being able to
+   retreive and display the inline images, or to click on any links in the
+   HTML.
+
+   The way we have done this in the past is by inserting a <BASE> tag as the
+   first line of all HTML documents we attach.  (This is kind of bad in that
+   we're actually modifying the document, and it really isn't our place to
+   do that.)
+
+   The sanctioned *new* way of doing this is to insert a Content-Base header
+   field on the attachment.  This is (will be) a part of the forthcoming MHTML
+   spec.
+
+   If GENERATE_CONTENT_BASE, we generate a Content-Base header.
+
+   We used to have a MANGLE_HTML_ATTACHMENTS_WITH_BASE_TAG symbol that we
+   defined, which added a BASE tag to the bodies.  We stopped doing this in
+   4.0.  */
+#define GENERATE_CONTENT_BASE
+
+
+static XP_Bool mime_use_quoted_printable_p = TRUE;
+static XP_Bool mime_headers_use_quoted_printable_p = FALSE;
+
+#ifdef XP_MAC
+
+XP_BEGIN_PROTOS
+extern OSErr my_FSSpecFromPathname(char* src_filename, FSSpec* fspec);
+extern char * mime_make_separator(const char *prefix);
+HG89984
+XP_END_PROTOS
+
+static char* NET_GetLocalFileFromURL(char *url)
+{
+	char * finalPath;
+	XP_ASSERT(strncasecomp(url, "file://", 7) == 0);
+	finalPath = (char*)XP_ALLOC(strlen(url));
+	if (finalPath == NULL)
+		return NULL;
+	strcpy(finalPath, url+6+1);
+	return finalPath;
+}
+
+static char* NET_GetURLFromLocalFile(char *filename)
+{
+    /*  file:///<path>0 */
+	char * finalPath = (char*)XP_ALLOC(strlen(filename) + 8 + 1);
+	if (finalPath == NULL)
+		return NULL;
+	finalPath[0] = 0;
+	strcat(finalPath, "file://");
+	strcat(finalPath, filename);
+	return finalPath;
+}
+
+#endif /* XP_MAC */
+
+void
+MIME_ConformToStandard (XP_Bool conform_p)
+{
+  /* 
+   * If we are conforming to mime standard no matter what we set
+   * for the headers preference when generating mime headers we should 
+   * also conform to the standard. Otherwise, depends the preference
+   * we set. For now, the headers preference is not accessible from UI.
+   */
+  if (conform_p)
+	mime_headers_use_quoted_printable_p = TRUE;
+  else
+	PREF_GetBoolPref("mail.strictly_mime_headers", 
+					 &mime_headers_use_quoted_printable_p);
+  mime_use_quoted_printable_p = conform_p;
+}
+
+MSG_SendMimeDeliveryState::MSG_SendMimeDeliveryState()
+{
+  m_pane = NULL;		/* Pane to use when loading the URLs */
+  m_fe_data = NULL;		/* passed in and passed to callback */
+  m_fields = NULL;			/* Where to send the message once it's done */
+
+  m_dont_deliver_p = FALSE;
+  m_deliver_mode = MSG_DeliverNow;
+
+  m_attachments_only_p = FALSE;
+  m_pre_snarfed_attachments_p = FALSE;
+  m_digest_p = FALSE;
+  m_be_synchronous_p = FALSE;
+  HG54689
+  m_attachment1_type = 0;
+  m_attachment1_encoding = 0;
+  m_attachment1_encoder_data = NULL;
+  m_attachment1_body = 0;
+  m_attachment1_body_length = 0;
+  m_attachment_count = 0;
+  m_attachment_pending_count = 0;
+  m_attachments = NULL;
+  m_status = 0;
+  m_message_delivery_done_callback = NULL;
+  m_attachments_done_callback = NULL;
+  m_msg_file_name = NULL;
+  m_msg_file = 0;
+  m_plaintext = NULL;
+  m_html_filename = NULL;
+
+//#ifdef MSG_SEND_MULTIPART_RELATED
+  m_related_part = NULL;
+//#endif
+}
+
+MSG_SendMimeDeliveryState::~MSG_SendMimeDeliveryState()
+{
+//#ifdef MSG_SEND_MULTIPART_RELATED
+#if 0
+  if (m_related_part)
+  {
+	  // m_related_part (if it exists) gets deleted when 
+	  // m_related_saver gets torched.
+	  delete m_related_part;
+	  m_related_part = NULL;
+  }
+#endif
+//#endif
+  FREEIF(m_msg_file_name);
+}
+
+static char *mime_mailto_stream_read_buffer = 0;
+static char *mime_mailto_stream_write_buffer = 0;
+
+static void mime_attachment_url_exit (URL_Struct *url, int status,
+									  MWContext *context);
+static void mime_text_attachment_url_exit (PrintSetup *p);
+static int mime_sanity_check_fields (const char *from,
+									 const char *reply_to,
+									 const char *to,
+									 const char *cc,
+									 const char *bcc,
+									 const char *fcc,
+									 const char *newsgroups,
+									 const char *followup_to,
+									 const char *subject,
+									 const char *references,
+									 const char *organization,
+									 const char *other_random_headers);
+static char *mime_generate_headers (MSG_CompositionFields *fields,
+									int csid, 
+									MSG_Deliver_Mode deliver_mode);
+static char *mime_generate_attachment_headers (const char *type,
+											   const char *encoding,
+											   const char *description,
+											   const char *x_mac_type,
+											   const char *x_mac_creator,
+											   const char *real_name,
+											   const char *base_url,
+											   XP_Bool digest_p,
+											   MSG_DeliverMimeAttachment *ma,
+											   int16 mail_csid);
+static char *RFC2231ParmFolding(const char *parmName, const char *charset,
+								const char *language, const char *parmValue);
+#if 0
+static XP_Bool mime_type_conversion_possible (const char *from_type,
+											  const char *to_type);
+#endif
+
+#ifdef XP_UNIX
+extern "C" void XFE_InitializePrintSetup (PrintSetup *p);
+#endif /* XP_UNIX */
+
+extern "C" char * NET_ExplainErrorDetails (int code, ...);
+
+MSG_DeliverMimeAttachment::MSG_DeliverMimeAttachment()
+{
+  m_url_string = NULL;
+  m_url = NULL;
+  m_done = FALSE;
+  m_type = NULL;
+  m_override_type = NULL;
+  m_override_encoding = NULL;
+  m_desired_type = NULL;
+  m_description = NULL;
+  m_x_mac_type = NULL;
+  m_x_mac_creator = NULL;
+  m_encoding = NULL;
+  m_real_name = NULL;
+  m_mime_delivery_state = NULL;
+  m_encoding = NULL;
+  m_already_encoded_p = FALSE;
+  m_file_name = NULL;
+  m_file = 0;
+#ifdef XP_MAC
+  m_ap_filename = NULL;
+#endif
+  HG54897
+  m_size = 0;
+  m_unprintable_count = 0;
+  m_highbit_count = 0;
+  m_ctl_count = 0;
+  m_null_count = 0;
+  m_current_column = 0;
+  m_max_column = 0;
+  m_lines = 0;
+
+  m_encoder_data = NULL;
+
+  XP_MEMSET(&m_print_setup, 0, sizeof(m_print_setup));
+  m_graph_progress_started = FALSE;
+}
+
+MSG_DeliverMimeAttachment::~MSG_DeliverMimeAttachment()
+{
+}
+
+
+extern "C" char *
+mime_make_separator(const char *prefix)
+{
+  unsigned char rand_buf[13]; 
+  RNG_GenerateGlobalRandomBytes((void *) rand_buf, 12);
+  return PR_smprintf("------------%s"
+					 "%02X%02X%02X%02X"
+					 "%02X%02X%02X%02X"
+					 "%02X%02X%02X%02X",
+					 prefix,
+					 rand_buf[0], rand_buf[1], rand_buf[2], rand_buf[3],
+					 rand_buf[4], rand_buf[5], rand_buf[6], rand_buf[7],
+					 rand_buf[8], rand_buf[9], rand_buf[10], rand_buf[11]);
+}
+
+XP_Bool
+MSG_DeliverMimeAttachment::UseUUEncode_p(void)
+{
+	XP_Bool returnVal = (m_mime_delivery_state) && 
+	  					(m_mime_delivery_state->m_pane) &&
+	  					((MSG_CompositionPane*)(m_mime_delivery_state->m_pane))->
+				  		GetCompBoolHeader(MSG_UUENCODE_BINARY_BOOL_HEADER_MASK);
+	
+	return returnVal;
+}
+
+static void msg_escape_file_name (URL_Struct *m_url) 
+{
+    XP_ASSERT (m_url->address && !XP_STRNCASECMP(m_url->address, "file:", 5));
+	if (!m_url->address ||
+		XP_STRNCASECMP(m_url->address, "file:", 5)) return;
+
+	char * new_address = NET_Escape(XP_STRCHR(m_url->address, ':')+1, 
+									URL_PATH);
+	XP_ASSERT(new_address);
+	if (!new_address) return;
+
+	XP_FREEIF(m_url->address);
+	m_url->address = PR_smprintf("file:%s", new_address);
+	XP_FREEIF(new_address);
+}
+
+// Returns a newly-allocated string containing the MIME type to be used for
+// outgoing attachments of the given document type.  The way this is determined
+// will be platform-specific, based on the real filename of the file (i.e. not the temp filename)
+// and some Mac creator info.
+// If there is no default specified in the prefs, then this returns NULL.
+static char *msg_GetMissionControlledOutgoingMIMEType(const char *filename,
+													  const char */*x_mac_type*/,
+													  const char */*x_mac_creator*/)
+{
+	if (!filename)
+		return NULL;
+
+#ifdef XP_WIN
+	char *whereDot = XP_STRRCHR(filename, '.');
+	if (whereDot)
+	{
+		char *extension = whereDot + 1;
+		if (extension)
+		{
+			char *mcOutgoingMimeType = NULL;
+			char *prefString = PR_smprintf("mime.table.extension.%s.outgoing_default_type",extension);
+
+			if (prefString)
+			{
+				PREF_CopyCharPref(prefString, &mcOutgoingMimeType);
+				XP_FREE(prefString);
+			}
+			return mcOutgoingMimeType;
+		}
+		else
+			return NULL;	// no file extension
+	}
+	else
+		return NULL;	// no file extension
+	
+#endif
+
+	return NULL;
+}
+
+
+static char *
+RFC2231ParmFolding(const char *parmName, const char *charset, 
+				   const char *language, const char *parmValue)
+{
+#define MAX_FOLDING_LEN 75			// this is to gurantee the folded line will
+								// never be greater than 78 = 75 + CRLFLWSP
+	char *foldedParm = NULL;
+	char *dupParm = NULL;
+	int32 parmNameLen = 0;
+	int32 parmValueLen = 0;
+	int32 charsetLen = 0;
+	int32 languageLen = 0;
+	XP_Bool needEscape = FALSE;
+
+	XP_ASSERT(parmName && *parmName && parmValue && *parmValue);
+	if (!parmName || !*parmName || !parmValue || !*parmValue)
+		return NULL;
+	if ((charset && *charset) || (language && *language))
+		needEscape = TRUE;
+
+	if (needEscape)
+		dupParm = NET_Escape(parmValue, URL_PATH);
+	else 
+		dupParm = XP_STRDUP(parmValue);
+
+	if (!dupParm)
+		return NULL;
+
+	parmValueLen = XP_STRLEN(dupParm);
+	parmNameLen = XP_STRLEN(parmName);
+	if (needEscape)
+		parmNameLen += 5;		// *=__'__'___ or *[0]*=__'__'__ or *[1]*=___
+	else
+		parmNameLen += 5;		// *[0]="___";
+	charsetLen = charset ? XP_STRLEN(charset) : 0;
+	languageLen = language ? XP_STRLEN(language) : 0;
+
+	if ((parmValueLen + parmNameLen + charsetLen + languageLen) <
+		MAX_FOLDING_LEN)
+	{
+		StrAllocCopy(foldedParm, parmName);
+		if (needEscape)
+		{
+			StrAllocCat(foldedParm, "*=");
+			if (charsetLen)
+				StrAllocCat(foldedParm, charset);
+			StrAllocCat(foldedParm, "'");
+			if (languageLen)
+				StrAllocCat(foldedParm, language);
+			StrAllocCat(foldedParm, "'");
+		}
+		else
+			StrAllocCat(foldedParm, "=\"");
+		StrAllocCat(foldedParm, dupParm);
+		if (!needEscape)
+			StrAllocCat(foldedParm, "\"");
+		goto done;
+	}
+	else
+	{
+		int curLineLen = 0;
+		int counter = 0;
+		char digits[32];
+		char *start = dupParm;
+		char *end = NULL;
+		char tmp = 0;
+
+		while (parmValueLen > 0)
+		{
+			curLineLen = 0;
+			if (counter == 0)
+			{
+				StrAllocCopy (foldedParm, parmName);
+			}
+			else
+			{
+				if (needEscape)
+					StrAllocCat(foldedParm, "\r\n ");
+				else
+					StrAllocCat(foldedParm, ";\r\n ");
+				StrAllocCat(foldedParm, parmName);
+			}
+			XP_SPRINTF(digits, "*%d", counter);
+			StrAllocCat(foldedParm, digits);
+			curLineLen += XP_STRLEN(digits);
+			if (needEscape)
+			{
+				StrAllocCat(foldedParm, "*=");
+				if (counter == 0)
+				{
+					if (charsetLen)
+						StrAllocCat(foldedParm, charset);
+					StrAllocCat(foldedParm, "'");
+					if (languageLen)
+						StrAllocCat(foldedParm, language);
+					StrAllocCat (foldedParm, "'");
+					curLineLen += charsetLen;
+					curLineLen += languageLen;
+				}
+			}
+			else
+			{
+				StrAllocCat(foldedParm, "=\"");
+			}
+			counter++;
+			curLineLen += parmNameLen;
+			if (parmValueLen <= MAX_FOLDING_LEN - curLineLen)
+				end = start + parmValueLen;
+			else
+				end = start + (MAX_FOLDING_LEN - curLineLen);
+
+			tmp = 0;
+			if (*end && needEscape)
+			{
+				// check to see if we are in the middle of escaped char
+				if (*end == '%')
+				{
+					tmp = '%'; *end = NULL;
+				}
+				else if (end-1 > start && *(end-1) == '%')
+				{
+					end -= 1; tmp = '%'; *end = NULL;
+				}
+				else if (end-2 > start && *(end-2) == '%')
+				{
+					end -= 2; tmp = '%'; *end = NULL;
+				}
+				else
+				{
+					tmp = *end; *end = NULL;
+				}
+			}
+			else
+			{
+				tmp = *end; *end = NULL;
+			}
+			StrAllocCat(foldedParm, start);
+			if (!needEscape)
+				StrAllocCat(foldedParm, "\"");
+
+			parmValueLen -= (end-start);
+			if (tmp)
+				*end = tmp;
+			start = end;
+		}
+	}
+
+done:
+	XP_FREEIF(dupParm);
+	return foldedParm;
+}
+
+int32
+MSG_DeliverMimeAttachment::SnarfAttachment ()
+{
+  int32 status = 0;
+  XP_ASSERT (! m_done);
+
+  m_file_name = WH_TempName (xpFileToPost, "nsmail");
+  if (! m_file_name)
+	return (MK_OUT_OF_MEMORY);
+
+  m_file = XP_FileOpen (m_file_name, xpFileToPost, XP_FILE_WRITE_BIN);
+  if (! m_file)
+	return MK_UNABLE_TO_OPEN_TMP_FILE; /* #### how do we pass file name? */
+
+  m_url->fe_data = this;
+
+  /* #### m_type is still unknown at this point.
+	 We need to find a way to make the textfe not blow
+	 up on documents that are not text/html!
+   */
+   
+#ifdef XP_MAC
+  if (NET_IsLocalFileURL(m_url->address) &&	// do we need to add IMAP: to this list? NET_IsLocalFileURL returns FALSE always for IMAP - DMB
+	  (strncasecomp(m_url->address, "mailbox:", 8) != 0))
+	{
+	  /* convert the apple file to AppleDouble first, and then patch the
+		 address in the url.
+	   */
+	  char* src_filename = NET_GetLocalFileFromURL (m_url->address);
+
+		// ### mwelch Only use appledouble if we aren't uuencoding.
+	  if(isMacFile(src_filename) && (! UseUUEncode_p()))
+		{
+
+		  char	*separator, tmp[128];
+		  NET_StreamClass *ad_encode_stream;
+
+		  separator = mime_make_separator("ad");
+		  if (!separator)
+			return MK_OUT_OF_MEMORY;
+						
+		  m_ap_filename  = WH_TempName (xpFileToPost, "nsmail");
+
+		  ad_encode_stream = (NET_StreamClass *)		/* need a prototype */
+			fe_MakeAppleDoubleEncodeStream (FO_CACHE_AND_MAIL_TO,
+											NULL,
+											m_url,
+											m_mime_delivery_state->GetContext(),
+											src_filename,
+											m_ap_filename,
+											separator);
+
+		  if (ad_encode_stream == NULL)
+			{
+			  FREEIF(separator);
+			  return MK_OUT_OF_MEMORY;
+			}
+
+		  do {
+			status = (*ad_encode_stream->put_block)
+			  ((NET_StreamClass *)ad_encode_stream->data_object, NULL, 1024);
+		  } while (status == noErr);
+
+		  if (status >= 0)
+			ad_encode_stream->complete ((NET_StreamClass *)ad_encode_stream->data_object);
+		  else
+			ad_encode_stream->abort ((NET_StreamClass *)ad_encode_stream->data_object, status);
+
+		  XP_FREE(ad_encode_stream);
+
+		  if (status < 0)
+			{
+			  FREEIF(separator);
+			  return status;
+			}
+
+		  XP_FREE(m_url->address);
+		  {
+		    char * temp = WH_FileName(m_ap_filename, xpFileToPost );
+		    m_url->address = XP_PlatformFileToURL(temp); // jrm 97/02/08
+			if (temp)
+				XP_FREE(temp);
+		  }
+		  /* and also patch the types.
+		   */
+		  if (m_type)
+			XP_FREE (m_type);
+
+		  XP_SPRINTF(tmp, MULTIPART_APPLEDOUBLE ";\r\n boundary=\"%s\"",
+					 separator);
+
+		  FREEIF(separator);
+
+		m_type = XP_STRDUP(tmp);
+		}
+	  else
+		{
+			if (isMacFile(src_filename))
+			{
+				// The only time we want to send just the data fork of a two-fork
+				// Mac file is if uuencoding has been requested.
+				XP_ASSERT(UseUUEncode_p());
+				if (!((MSG_CompositionPane *) m_mime_delivery_state->m_pane)->m_confirmed_uuencode_p)
+				{
+					XP_Bool confirmed = FE_Confirm(m_mime_delivery_state->m_pane->GetContext(), 
+													XP_GetString(MK_MSG_MAC_PROMPT_UUENCODE)); 
+
+					// only want to do this once
+					((MSG_CompositionPane *) m_mime_delivery_state->m_pane)->m_confirmed_uuencode_p = TRUE;
+					
+					if (! confirmed) // cancelled
+						return MK_INTERRUPTED;
+				}
+			}
+		  /* make sure the file type and create are set.	*/
+		  char filetype[32];
+		  FSSpec fsSpec;
+		  FInfo info;
+		  Bool 	useDefault;
+		  char	*macType, *macEncoding;
+
+		  my_FSSpecFromPathname(src_filename, &fsSpec);
+		  if (FSpGetFInfo (&fsSpec, &info) == noErr)
+			{
+			  XP_SPRINTF(filetype, "%X", info.fdType);
+			  m_x_mac_type    = XP_STRDUP(filetype);
+
+			  XP_SPRINTF(filetype, "%X", info.fdCreator);
+			  m_x_mac_creator = XP_STRDUP(filetype);
+			  if (m_type == NULL ||
+				  !strcasecomp (m_type, TEXT_PLAIN))
+				{
+# define TEXT_TYPE	0x54455854  /* the characters 'T' 'E' 'X' 'T' */
+# define text_TYPE	0x74657874  /* the characters 't' 'e' 'x' 't' */
+
+				  if (info.fdType != TEXT_TYPE && info.fdType != text_TYPE)
+					{
+					  FE_FileType(m_url->address, &useDefault,
+								  &macType, &macEncoding);
+
+					  FREEIF(m_type);
+					  m_type = macType;
+					}
+				}
+			}
+
+		  /* don't bother to set the types if we failed in getting the file
+			 info. */
+		}
+	  FREEIF(src_filename);
+	  src_filename = 0;
+	}
+#else
+
+  /* if we are attaching a local file make sure the file name are escaped
+   * properly
+   */
+  if (NET_IsLocalFileURL(m_url->address) &&
+	  XP_STRNCASECMP (m_url->address, "file:", 5) == 0) 
+  {
+	  msg_escape_file_name(m_url);
+  }
+
+#endif /* XP_MAC */
+
+  if (m_desired_type &&
+	  !strcasecomp (m_desired_type, TEXT_PLAIN) /* #### &&
+	  mime_type_conversion_possible (m_type, m_desired_type) */ )
+	{
+	  /* Conversion to plain text desired.
+	   */
+	  m_print_setup.url = m_url;
+	  m_print_setup.carg = this;
+	  m_print_setup.completion = mime_text_attachment_url_exit;
+	  m_print_setup.filename = NULL;
+	  m_print_setup.out = m_file;
+	  m_print_setup.eol = CRLF;
+
+	  int32 width = 72;
+	  PREF_GetIntPref("mailnews.wraplength", &width);
+	  if (width == 0) width = 72;
+	  else if (width < 10) width = 10;
+	  else if (width > 30000) width = 30000;
+
+	  if (m_mime_delivery_state->m_pane->GetPaneType() == MSG_COMPOSITIONPANE)
+	  {
+		  int lineWidth = ((MSG_CompositionPane *) m_mime_delivery_state->m_pane)
+			  ->GetLineWidth();
+		  if (lineWidth > width)
+			  width = lineWidth;
+	  }
+	  m_print_setup.width = width;
+
+	  m_url->savedData.FormList = 0;
+#ifdef _USRDLL
+	  if (! NDLLXL_TranslateText (m_mime_delivery_state->GetContext(), m_url,
+							&m_print_setup))
+		return MK_ATTACHMENT_LOAD_FAILED;
+#else
+	  if (! XL_TranslateText (m_mime_delivery_state->GetContext(), m_url,
+						&m_print_setup))
+		return MK_ATTACHMENT_LOAD_FAILED;
+#endif
+	  if (m_type) XP_FREE (m_type);
+	  m_type = m_desired_type;
+	  m_desired_type = 0;
+	  if (m_encoding) XP_FREE (m_encoding);
+	  m_encoding = 0;
+	}
+#ifdef XP_UNIX
+  else if (m_desired_type &&
+		   !strcasecomp (m_desired_type, APPLICATION_POSTSCRIPT) /* #### &&
+		   mime_type_conversion_possible (m_type, m_desired_type) */ )
+	{
+      SHIST_SavedData saved_data;
+
+      /* Make sure layout saves the current state of form elements. */
+      LO_SaveFormData(m_mime_delivery_state->GetContext());
+
+      /* Hold on to the saved data. */
+      XP_MEMCPY(&saved_data, &m_url->savedData, sizeof(SHIST_SavedData));
+
+	  /* Conversion to postscript desired.
+	   */
+	  XFE_InitializePrintSetup (&m_print_setup);
+	  m_print_setup.url = m_url;
+	  m_print_setup.carg = this;
+	  m_print_setup.completion = mime_text_attachment_url_exit;
+	  m_print_setup.filename = NULL;
+	  m_print_setup.out = m_file;
+	  m_print_setup.eol = CRLF;
+      XP_MEMSET (&m_url->savedData, 0, sizeof (SHIST_SavedData));
+	  XL_TranslatePostscript (m_mime_delivery_state->GetContext(),
+							  m_url, &saved_data,
+							  &m_print_setup);
+	  if (m_type) XP_FREE (m_type);
+	  m_type = m_desired_type;
+	  m_desired_type = 0;
+	  if (m_encoding) XP_FREE (m_encoding);
+	  m_encoding = 0;
+	}
+#endif /* XP_UNIX */
+  else
+	{
+	  int get_url_status;
+
+	  /* In this case, ignore the status, as that will be handled by
+		 the exit routine. */
+
+	  /* jwz && tj -> we're assuming that it is safe to return the result
+		 of this call as our status result.
+
+		 A negative result means that the exit routine was run, either
+		 because the operation completed quickly or failed.
+	   */
+	  m_url->allow_content_change = FALSE;	// don't use modified content
+	  get_url_status = NET_GetURL (m_url, FO_CACHE_AND_MAIL_TO,
+								   m_mime_delivery_state->GetContext(),
+								   mime_attachment_url_exit);
+
+	  if (get_url_status < 0)
+		return MK_ATTACHMENT_LOAD_FAILED;
+	  else
+		return 0;
+	}
+  return status;
+}
+
+
+static void
+mime_attachment_url_exit (URL_Struct *url, int status, MWContext *context)
+{
+  MSG_DeliverMimeAttachment *ma = (MSG_DeliverMimeAttachment *) url->fe_data;
+  XP_ASSERT(ma != NULL);
+  if (ma != NULL)
+	ma->UrlExit(url, status, context);
+}
+
+
+void MSG_DeliverMimeAttachment::UrlExit(URL_Struct *url, int status,
+										MWContext *context)
+{
+  char *error_msg = url->error_msg;
+  url->error_msg = 0;
+  url->fe_data = 0;
+
+  XP_ASSERT(m_mime_delivery_state != NULL);
+  XP_ASSERT(m_mime_delivery_state->GetContext() != NULL);
+  XP_ASSERT(m_url != NULL);
+
+  if (m_graph_progress_started)
+	{
+	  m_graph_progress_started = FALSE;
+	  FE_GraphProgressDestroy (m_mime_delivery_state->GetContext(), m_url,
+							   m_url->content_length, m_size);
+	}
+
+  if (status < 0)
+	/* If any of the attachment URLs fail, kill them all. */
+	NET_InterruptWindow (context);
+
+  /* Close the file, but don't delete it (or the file name.) */
+  XP_FileClose (m_file);
+  m_file = 0;
+  NET_FreeURLStruct (m_url);
+  /* I'm pretty sure m_url == url */
+  m_url = 0;
+  url = 0;
+
+
+
+  if (status < 0) {
+	  if (m_mime_delivery_state->m_status >= 0)
+		m_mime_delivery_state->m_status = status;
+	  XP_FileRemove(m_file_name, xpFileToPost);
+	  XP_FREEIF(m_file_name);
+  }
+
+  m_done = TRUE;
+
+  XP_ASSERT (m_mime_delivery_state->m_attachment_pending_count > 0);
+  m_mime_delivery_state->m_attachment_pending_count--;
+
+  if (status >= 0 && m_mime_delivery_state->m_be_synchronous_p)
+	{
+	  /* Find the next attachment which has not yet been loaded,
+		 if any, and start it going.
+	   */
+	  int32 i;
+	  MSG_DeliverMimeAttachment *next = 0;
+	  for (i = 0; i < m_mime_delivery_state->m_attachment_count; i++)
+		if (!m_mime_delivery_state->m_attachments[i].m_done)
+		  {
+			next = &m_mime_delivery_state->m_attachments[i];
+			break;
+		  }
+	  if (next)
+		{
+		  int status = next->SnarfAttachment ();
+		  if (status < 0)
+			{
+			  m_mime_delivery_state->Fail(status, 0);
+			  return;
+			}
+		}
+	}
+
+  if (m_mime_delivery_state->m_attachment_pending_count == 0)
+	{
+	  /* If this is the last attachment, then either complete the
+		 delivery (if successful) or report the error by calling
+		 the exit routine and terminating the delivery.
+	   */
+	  if (status < 0)
+		{
+		  m_mime_delivery_state->Fail(status, error_msg);
+		  error_msg = 0;
+		}
+	  else
+		{
+		  m_mime_delivery_state->GatherMimeAttachments ();
+		}
+	}
+  else
+	{
+	  /* If this is not the last attachment, but it got an error,
+		 then report that error and continue (we won't actually
+		 abort the delivery until all the other pending URLs have
+		 caught up with the NET_InterruptWindow() we did up above.)
+	   */
+	  if (status < 0 && error_msg)
+		FE_Alert (context, error_msg);
+	}
+  FREEIF (error_msg);
+}
+
+void
+MSG_DeliverMimeAttachment::AnalyzeDataChunk(const char *chunk, int32 length)
+{
+  unsigned char *s = (unsigned char *) chunk;
+  unsigned char *end = s + length;
+  for (; s < end; s++)
+	{
+	  if (*s > 126)
+		{
+		  m_highbit_count++;
+		  m_unprintable_count++;
+		}
+	  else if (*s < ' ' && *s != '\t' && *s != CR && *s != LF)
+		{
+		  m_unprintable_count++;
+		  m_ctl_count++;
+		  if (*s == 0)
+			m_null_count++;
+		}
+
+	  if (*s == CR || *s == LF)
+		{
+		  if (s+1 < end && s[0] == CR && s[1] == LF)
+			s++;
+		  if (m_max_column < m_current_column)
+			m_max_column = m_current_column;
+		  m_current_column = 0;
+		  m_lines++;
+		}
+	  else
+		{
+		  m_current_column++;
+		}
+	}
+}
+
+void
+MSG_DeliverMimeAttachment::AnalyzeSnarfedFile(void)
+{
+	char chunk[256];
+	XP_File fileHdl = NULL;
+	int32 numRead = 0;
+	
+	if (m_file_name && *m_file_name)
+	{
+		fileHdl = XP_FileOpen(m_file_name, xpFileToPost, XP_FILE_READ_BIN);
+		if (fileHdl)
+		{
+			do
+			{
+				numRead = XP_FileRead(chunk, 256, fileHdl);
+				if (numRead > 0)
+					AnalyzeDataChunk(chunk, numRead);
+			}
+			while (numRead > 0);
+			XP_FileClose(fileHdl);
+		}
+	}
+}
+
+static void
+mime_text_attachment_url_exit (PrintSetup *p)
+{
+  MSG_DeliverMimeAttachment *ma = (MSG_DeliverMimeAttachment *) p->carg;
+  XP_ASSERT (p->url == ma->m_url);
+  ma->m_url->fe_data = ma;  /* grr */
+  mime_attachment_url_exit (p->url, p->status,
+							ma->m_mime_delivery_state->GetContext());
+}
+
+
+PRIVATE unsigned int
+mime_attachment_stream_write_ready (NET_StreamClass *)
+{	
+  return MAX_WRITE_READY;
+}
+
+PRIVATE int
+mime_attachment_stream_write (NET_StreamClass *stream, const char *block, int32 length)
+{
+  MSG_DeliverMimeAttachment *ma = (MSG_DeliverMimeAttachment *) stream->data_object;
+  /*
+  const unsigned char *s;
+  const unsigned char *end;
+  */  
+
+  if (ma->m_mime_delivery_state->m_status < 0)
+	return ma->m_mime_delivery_state->m_status;
+
+  ma->m_size += length;
+
+  if (!ma->m_graph_progress_started)
+	{
+	  ma->m_graph_progress_started = TRUE;
+	  FE_GraphProgressInit (ma->m_mime_delivery_state->GetContext(), ma->m_url,
+							ma->m_url->content_length);
+	}
+
+  FE_GraphProgress (ma->m_mime_delivery_state->GetContext(), ma->m_url,
+					ma->m_size, length, ma->m_url->content_length);
+
+
+  /* Copy out the content type and encoding if we haven't already.
+   */
+  if (!ma->m_type && ma->m_url->content_type)
+	{
+	  ma->m_type = XP_STRDUP (ma->m_url->content_type);
+
+	  /* If the URL has an encoding, and it's not one of the "null" encodings,
+		 then keep it. */
+	  if (ma->m_url->content_encoding &&
+		  strcasecomp (ma->m_url->content_encoding, ENCODING_7BIT) &&
+		  strcasecomp (ma->m_url->content_encoding, ENCODING_8BIT) &&
+		  strcasecomp (ma->m_url->content_encoding, ENCODING_BINARY))
+		{
+		  if (ma->m_encoding) XP_FREE (ma->m_encoding);
+		  ma->m_encoding = XP_STRDUP (ma->m_url->content_encoding);
+		  ma->m_already_encoded_p = TRUE;
+		}
+
+	  /* Make sure there's a string in the type field.
+		 Note that UNKNOWN_CONTENT_TYPE and APPLICATION_OCTET_STREAM are
+		 different; "octet-stream" means that this document was *specified*
+		 as an anonymous binary type; "unknown" means that we will guess
+		 whether it is text or binary based on its contents.
+	   */
+	  if (!ma->m_type || !*ma->m_type)
+		StrAllocCopy (ma->m_type, UNKNOWN_CONTENT_TYPE);
+
+
+#if defined(XP_WIN) || defined(XP_OS2)
+	  /*  WinFE tends to spew out bogus internal "zz-" types for things
+		 it doesn't know, so map those to the "real" unknown type.
+	   */
+	  if (ma->m_type && !strncasecomp (ma->m_type, "zz-", 3))
+		StrAllocCopy (ma->m_type, UNKNOWN_CONTENT_TYPE);
+#endif /* XP_WIN */
+
+	  /* There are some of "magnus" types in the default
+		 mime.types file that some platforms ship in /usr/local/lib/netscape/.  These
+		 types are meaningless to the end user, and the server never returns
+		 them, but they're getting attached to local .cgi files anyway.
+		 Remove them.
+	   */
+	  if (ma->m_type && !strncasecomp (ma->m_type, "magnus-internal/", 16))
+		StrAllocCopy (ma->m_type, UNKNOWN_CONTENT_TYPE);
+
+
+	  /* kludge.
+		 Unfortunately, the URL_Struct shares the `encoding' slot
+		 amongst the Content-Encoding and Content-Transfer-Encoding headers.
+		 Content-Transfer-Encoding is required to be one of the standard
+		 MIME encodings (x- types are explicitly discourgaged.)  But
+		 Content-Encoding can be anything (it's HTTP, not MIME.)
+
+		 So, to prevent binary compressed data from getting dumped into the
+		 mail stream, we special case some things here.  If the encoding is
+		 "x-compress" or "x-gzip", then that must have come from a
+		 Content-Encoding header, So change the type to application/x-compress
+		 and allow it to be encoded in base64.
+
+		 But what if it's something we don't know?  In that case, we just
+		 dump it into the mail.  For Content-Transfer-Encodings, like for
+		 example, x-uuencode, that's appropriate.  But for Content-Encodings,
+		 like for example, x-some-brand-new-binary-compression-algorithm,
+		 that's wrong.
+	   */
+	  if (ma->m_encoding &&
+		  (!strcasecomp (ma->m_encoding, ENCODING_COMPRESS) ||
+		   !strcasecomp (ma->m_encoding, ENCODING_COMPRESS2)))
+		{
+		  StrAllocCopy (ma->m_type, APPLICATION_COMPRESS);
+		  StrAllocCopy (ma->m_encoding, ENCODING_BINARY);
+		  ma->m_already_encoded_p = FALSE;
+		}
+	  else if (ma->m_encoding &&
+			   (!strcasecomp (ma->m_encoding, ENCODING_GZIP) ||
+				!strcasecomp (ma->m_encoding, ENCODING_GZIP2)))
+		{
+		  StrAllocCopy (ma->m_type, APPLICATION_GZIP);
+		  StrAllocCopy (ma->m_encoding, ENCODING_BINARY);
+		  ma->m_already_encoded_p = FALSE;
+		}
+
+	  /* If the caller has passed in an overriding type for this URL,
+		 then ignore what the netlib guessed it to be.  This is so that
+		 we can hand it a file:/some/tmp/file and tell it that it's of
+		 type message/rfc822 without having to depend on that tmp file
+		 having some particular extension.
+	   */
+	  if (ma->m_override_type)
+		{
+		  StrAllocCopy (ma->m_type, ma->m_override_type);
+		  if (ma->m_override_encoding)
+			StrAllocCopy (ma->m_encoding, ma->m_override_encoding);
+		}
+
+	  char *mcType = msg_GetMissionControlledOutgoingMIMEType(ma->m_real_name, ma->m_x_mac_type, ma->m_x_mac_creator);	// returns an allocated string
+	  if (mcType)
+	  {
+		  FREEIF(ma->m_type);
+		  ma->m_type = mcType;
+	  }
+
+	}
+
+  /* Cumulatively examine the data that is passing through this stream,
+	 building up a histogram that will be used when deciding which encoding
+	 (if any) should be used.
+   */
+  ma->AnalyzeDataChunk(block, length); /* calling this instead of the previous 20ish lines */
+
+  /* Write it to the file.
+   */
+  while (length > 0)
+	{
+	  int32 l;
+	  l = XP_FileWrite (block, length, ma->m_file);
+	  if (l < length)
+		{
+		  ma->m_mime_delivery_state->m_status = MK_MIME_ERROR_WRITING_FILE;
+		  return ma->m_mime_delivery_state->m_status;
+		}
+	  block += l;
+	  length -= l;
+	}
+
+  return 1;
+}
+
+
+PRIVATE void
+mime_attachment_stream_complete (NET_StreamClass *)
+{	
+  /* Nothing to do here - the URL exit method does our cleanup. */
+}
+
+PRIVATE void
+mime_attachment_stream_abort (NET_StreamClass *stream, int status)
+{
+  MSG_DeliverMimeAttachment *ma = (MSG_DeliverMimeAttachment *) stream->data_object;  
+
+  if (ma->m_mime_delivery_state->m_status >= 0)
+	ma->m_mime_delivery_state->m_status = status;
+
+  /* Nothing else to do here - the URL exit method does our cleanup. */
+}
+
+
+#ifdef XP_OS2
+//DSR040297 - This looks pretty bad, but some compilers are very type
+//strict when it comes to function pointers & the like... So this must be extern & extern "C" to match.
+XP_BEGIN_PROTOS
+extern NET_StreamClass *
+mime_make_attachment_stream (int /*format_out*/, void * /*closure*/,
+							 URL_Struct *url, MWContext *context);
+XP_END_PROTOS
+extern NET_StreamClass *
+#else
+static NET_StreamClass *
+#endif
+mime_make_attachment_stream (int /*format_out*/, void * /*closure*/,
+							 URL_Struct *url, MWContext *context)
+{
+  NET_StreamClass *stream;
+
+  TRACEMSG(("Setting up attachment stream. Have URL: %s\n", url->address));
+
+  stream = XP_NEW (NET_StreamClass);
+  if (stream == NULL)
+	return (NULL);
+
+  XP_MEMSET (stream, 0, sizeof (NET_StreamClass));
+
+  stream->name           = "attachment stream";
+  stream->complete       = mime_attachment_stream_complete;
+  stream->abort          = mime_attachment_stream_abort;
+  stream->put_block      = mime_attachment_stream_write;
+  stream->is_write_ready = mime_attachment_stream_write_ready;
+  stream->data_object    = url->fe_data;
+  stream->window_id      = context;
+
+  TRACEMSG(("Returning stream from mime_make_attachment_stream"));
+
+  return stream;
+}
+
+HG55451
+
+void
+MSG_RegisterConverters (void)
+{
+  NET_RegisterContentTypeConverter ("*", FO_MAIL_TO,
+									NULL, mime_make_attachment_stream);
+  NET_RegisterContentTypeConverter ("*", FO_CACHE_AND_MAIL_TO,
+									NULL, mime_make_attachment_stream);
+
+  /* FO_MAIL_MESSAGE_TO is treated the same as FO_MAIL_TO -- this format_out
+	 just means that libmime has already gotten its hands on this document
+	 (which happens to be of type message/rfc822 or message/news) and has
+	 altered it in some way (for example, has decrypted it.) */
+  NET_RegisterContentTypeConverter ("*", FO_MAIL_MESSAGE_TO,
+									NULL, mime_make_attachment_stream);
+  NET_RegisterContentTypeConverter ("*", FO_CACHE_AND_MAIL_MESSAGE_TO,
+									NULL, mime_make_attachment_stream);
+
+  /* Attachment of mail and news messages happens slightly differently:
+	 Rather than FO_MAIL_TO going in to mime_make_attachment_stream, it
+	 goes into MIME_MessageConverter, which will then open a later stream
+	 with FO_MAIL_MESSAGE_TO -- which is how it eventually gets into
+	 mime_make_attachment_stream, after having gone through libmime.
+   */
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_MAIL_TO,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_MAIL_TO,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_CACHE_AND_MAIL_TO,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_CACHE_AND_MAIL_TO,
+									NULL, MIME_MessageConverter);
+
+  /* Decoders from mimehtml.c for message/rfc822 */
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_PRESENT,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_PRINT,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_EMBED,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_QUOTE_MESSAGE,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_QUOTE_HTML_MESSAGE,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_SAVE_AS,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_SAVE_AS_TEXT,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_INTERNAL_IMAGE,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_FONT,
+									NULL, MIME_MessageConverter);
+  
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_CMDLINE_ATTACHMENTS,
+									NULL, MIME_ToDraftConverter);
+
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_OPEN_DRAFT,
+									NULL, MIME_ToDraftConverter);
+#ifdef XP_UNIX
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_SAVE_AS_POSTSCRIPT,
+									NULL, MIME_MessageConverter);
+#endif /* XP_UNIX */
+
+  /* Decoders from mimehtml.c for message/news (same as message/rfc822) */
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_PRESENT,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_PRINT,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_EMBED,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_QUOTE_MESSAGE,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_QUOTE_HTML_MESSAGE,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_SAVE_AS,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_SAVE_AS_TEXT,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_INTERNAL_IMAGE,
+									NULL, MIME_MessageConverter);
+
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_OPEN_DRAFT,
+									NULL, MIME_ToDraftConverter);
+#ifdef XP_UNIX
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_SAVE_AS_POSTSCRIPT,
+									NULL, MIME_MessageConverter);
+#endif /* XP_UNIX */
+
+  /* Decoders from mimehtml.c for text/richtext and text/enriched */
+  NET_RegisterContentTypeConverter (TEXT_RICHTEXT, FO_PRESENT,
+									NULL, MIME_RichtextConverter);
+  NET_RegisterContentTypeConverter (TEXT_RICHTEXT, FO_PRINT,
+									NULL, MIME_RichtextConverter);
+  NET_RegisterContentTypeConverter (TEXT_ENRICHED, FO_PRESENT,
+									NULL, MIME_EnrichedTextConverter);
+  NET_RegisterContentTypeConverter (TEXT_ENRICHED, FO_PRINT,
+									NULL, MIME_EnrichedTextConverter);
+
+  /* Decoders from mimevcrd.c for text/x-vcard and text/enriched */
+  NET_RegisterContentTypeConverter (TEXT_VCARD, FO_PRESENT,
+									NULL, MIME_VCardConverter);
+  NET_RegisterContentTypeConverter (TEXT_VCARD, FO_PRINT,
+									NULL, MIME_VCardConverter);
+
+  /* Decoders from mimejul.c for text/calendar */
+#ifdef MOZ_CALENDAR
+  NET_RegisterContentTypeConverter (TEXT_CALENDAR, FO_PRESENT,
+									NULL, MIME_JulianConverter);
+  NET_RegisterContentTypeConverter (TEXT_CALENDAR, FO_PRINT,
+									NULL, MIME_JulianConverter);
+#endif
+
+
+}
+
+
+static XP_Bool
+mime_7bit_data_p (const char *string, uint32 size)
+{
+  const unsigned char *s = (const unsigned char *) string;
+  const unsigned char *end = s + size;
+  if (s)
+	for (; s < end; s++)
+	  if (*s > 0x7F)
+		return FALSE;
+  return TRUE;
+}
+
+
+static int
+mime_sanity_check_fields (const char *from,
+						  const char *reply_to,
+						  const char *to,
+						  const char *cc,
+						  const char *bcc,
+						  const char *fcc,
+						  const char *newsgroups,
+						  const char *followup_to,
+						  const char * /*subject*/,
+						  const char * /*references*/,
+						  const char * /*organization*/,
+						  const char * /*other_random_headers*/)
+{
+  if (from) while (XP_IS_SPACE (*from)) from++;
+  if (reply_to) while (XP_IS_SPACE (*reply_to)) reply_to++;
+  if (to) while (XP_IS_SPACE (*to)) to++;
+  if (cc) while (XP_IS_SPACE (*cc)) cc++;
+  if (bcc) while (XP_IS_SPACE (*bcc)) bcc++;
+  if (fcc) while (XP_IS_SPACE (*fcc)) fcc++;
+  if (newsgroups) while (XP_IS_SPACE (*newsgroups)) newsgroups++;
+  if (followup_to) while (XP_IS_SPACE (*followup_to)) followup_to++;
+
+  /* #### check other_random_headers for newline conventions */
+
+  if (!from || !*from)
+	return MK_MIME_NO_SENDER;
+  else if ((!to || !*to) &&
+		   (!cc || !*cc) &&
+		   (!bcc || !*bcc) &&
+		   (!newsgroups || !*newsgroups))
+	return MK_MIME_NO_RECIPIENTS;
+  else
+	return 0;
+}
+
+
+/* Strips whitespace, and expands newlines into newline-tab for use in
+   mail headers.  Returns a new string or 0 (if it would have been empty.)
+   If addr_p is true, the addresses will be parsed and reemitted as
+   rfc822 mailboxes.
+ */
+static char *
+mime_fix_header_1 (const char *string,
+				   XP_Bool addr_p, XP_Bool news_p)
+{
+  char *new_string;
+  const char *in;
+  char *out;
+  int32 i, old_size, new_size;
+  if (!string || !*string)
+	return 0;
+
+  if (addr_p)
+	{
+	  char *n = MSG_ReformatRFC822Addresses (string);
+	  if (n) return n;
+	}
+
+  old_size = XP_STRLEN (string);
+  new_size = old_size;
+  for (i = 0; i < old_size; i++)
+	if (string[i] == CR || string[i] == LF)
+	  new_size += 2;
+
+  new_string = (char *) XP_ALLOC (new_size + 1);
+  if (! new_string)
+	return 0;
+
+  in  = string;
+  out = new_string;
+
+  /* strip leading whitespace. */
+  while (XP_IS_SPACE (*in))
+	in++;
+
+  /* replace CR, LF, or CRLF with CRLF-TAB. */
+  while (*in)
+	{
+	  if (*in == CR || *in == LF)
+		{
+		  if (*in == CR && in[1] == LF)
+			in++;
+		  in++;
+		  *out++ = CR;
+		  *out++ = LF;
+		  *out++ = '\t';
+		}
+	  else if (news_p && *in == ',')
+		{
+		  *out++ = *in++;
+		  /* skip over all whitespace after a comma. */
+		  while (XP_IS_SPACE (*in))
+			in++;
+		}
+	  else
+		{
+		  *out++ = *in++;
+		}
+	}
+  *out = 0;
+
+  /* strip trailing whitespace. */
+  while (out > in && XP_IS_SPACE (out[-1]))
+	*out-- = 0;
+
+  /* If we ended up throwing it all away, use 0 instead of "". */
+  if (!*new_string)
+	{
+	  XP_FREE (new_string);
+	  new_string = 0;
+	}
+
+  return new_string;
+}
+
+
+static char *
+mime_fix_header (const char *string)
+{
+  return mime_fix_header_1 (string, FALSE, FALSE);
+}
+
+static char *
+mime_fix_addr_header (const char *string)
+{
+  return mime_fix_header_1 (string, TRUE, FALSE);
+}
+
+static char *
+mime_fix_news_header (const char *string)
+{
+  return mime_fix_header_1 (string, FALSE, TRUE);
+}
+
+
+#if 0
+static XP_Bool
+mime_type_conversion_possible (const char *from_type, const char *to_type)
+{
+  if (! to_type)
+	return TRUE;
+
+  if (! from_type)
+	return FALSE;
+
+  if (!strcasecomp (from_type, to_type))
+	/* Don't run text/plain through the text->html converter. */
+	return FALSE;
+
+  if ((!strcasecomp (from_type, INTERNAL_PARSER) ||
+	   !strcasecomp (from_type, TEXT_HTML) ||
+	   !strcasecomp (from_type, TEXT_MDL)) &&
+	  !strcasecomp (to_type, TEXT_PLAIN))
+	/* Don't run UNKNOWN_CONTENT_TYPE through the text->html converter
+	   (treat it as text/plain already.) */
+	return TRUE;
+
+#ifdef XP_UNIX
+  if ((!strcasecomp (from_type, INTERNAL_PARSER) ||
+	   !strcasecomp (from_type, TEXT_PLAIN) ||
+	   !strcasecomp (from_type, TEXT_HTML) ||
+	   !strcasecomp (from_type, TEXT_MDL) ||
+	   !strcasecomp (from_type, IMAGE_GIF) ||
+	   !strcasecomp (from_type, IMAGE_JPG) ||
+	   !strcasecomp (from_type, IMAGE_PJPG) ||
+	   !strcasecomp (from_type, IMAGE_XBM) ||
+	   !strcasecomp (from_type, IMAGE_XBM2) ||
+	   !strcasecomp (from_type, IMAGE_XBM3) ||
+	   /* always treat unknown content types as text/plain */
+	   !strcasecomp (from_type, UNKNOWN_CONTENT_TYPE)
+	   ) &&
+	  !strcasecomp (to_type, APPLICATION_POSTSCRIPT))
+	return TRUE;
+#endif /* XP_UNIX */
+
+  return FALSE;
+}
+#endif
+
+
+static XP_Bool
+mime_type_requires_b64_p (const char *type)
+{
+  if (!type || !strcasecomp (type, UNKNOWN_CONTENT_TYPE))
+	/* Unknown types don't necessarily require encoding.  (Note that
+	   "unknown" and "application/octet-stream" aren't the same.) */
+	return FALSE;
+
+  else if (!strncasecomp (type, "image/", 6) ||
+		   !strncasecomp (type, "audio/", 6) ||
+		   !strncasecomp (type, "video/", 6) ||
+		   !strncasecomp (type, "application/", 12))
+	{
+	  /* The following types are application/ or image/ types that are actually
+		 known to contain textual data (meaning line-based, not binary, where
+		 CRLF conversion is desired rather than disasterous.)  So, if the type
+		 is any of these, it does not *require* base64, and if we do need to
+		 encode it for other reasons, we'll probably use quoted-printable.
+		 But, if it's not one of these types, then we assume that any subtypes
+		 of the non-"text/" types are binary data, where CRLF conversion would
+		 corrupt it, so we use base64 right off the bat.
+
+		 The reason it's desirable to ship these as text instead of just using
+		 base64 all the time is mainly to preserve the readability of them for
+		 non-MIME users: if I mail a /bin/sh script to someone, it might not
+		 need to be encoded at all, so we should leave it readable if we can.
+
+		 This list of types was derived from the comp.mail.mime FAQ, section
+		 10.2.2, "List of known unregistered MIME types" on 2-Feb-96.
+	   */
+	  static const char *app_and_image_types_which_are_really_text[] = {
+		"application/mac-binhex40",		/* APPLICATION_BINHEX */
+		"application/pgp",				/* APPLICATION_PGP */
+		"application/x-pgp-message",	/* APPLICATION_PGP2 */
+		"application/postscript",		/* APPLICATION_POSTSCRIPT */
+		"application/x-uuencode",		/* APPLICATION_UUENCODE */
+		"application/x-uue",			/* APPLICATION_UUENCODE2 */
+		"application/uue",				/* APPLICATION_UUENCODE4 */
+		"application/uuencode",			/* APPLICATION_UUENCODE3 */
+		"application/sgml",
+		"application/x-csh",
+		"application/x-javascript",
+		"application/x-latex",
+		"application/x-macbinhex40",
+		"application/x-ns-proxy-autoconfig",
+		"application/x-www-form-urlencoded",
+		"application/x-perl",
+		"application/x-sh",
+		"application/x-shar",
+		"application/x-tcl",
+		"application/x-tex",
+		"application/x-texinfo",
+		"application/x-troff",
+		"application/x-troff-man",
+		"application/x-troff-me",
+		"application/x-troff-ms",
+		"application/x-troff-ms",
+		"application/x-wais-source",
+		"image/x-bitmap",
+		"image/x-pbm",
+		"image/x-pgm",
+		"image/x-portable-anymap",
+		"image/x-portable-bitmap",
+		"image/x-portable-graymap",
+		"image/x-portable-pixmap",		/* IMAGE_PPM */
+		"image/x-ppm",
+		"image/x-xbitmap",				/* IMAGE_XBM */
+		"image/x-xbm",					/* IMAGE_XBM2 */
+		"image/xbm",					/* IMAGE_XBM3 */
+		"image/x-xpixmap",
+		"image/x-xpm",
+		0 };
+	  const char **s;
+	  for (s = app_and_image_types_which_are_really_text; *s; s++)
+		if (!strcasecomp (type, *s))
+		  return FALSE;
+
+	  /* All others must be assumed to be binary formats, and need Base64. */
+	  return TRUE;
+	}
+
+  else
+	return FALSE;
+}
+
+#ifdef XP_OS2
+XP_BEGIN_PROTOS
+extern int mime_encoder_output_fn (const char *buf, int32 size, void *closure);
+XP_END_PROTOS
+#else
+static int mime_encoder_output_fn (const char *buf, int32 size, void *closure);
+#endif
+
+/* Given a content-type and some info about the contents of the document,
+   decide what encoding it should have.
+ */
+int
+MSG_DeliverMimeAttachment::PickEncoding (int16 mail_csid)
+{
+  // use the boolean so we only have to test for uuencode vs base64 once
+  XP_Bool needsB64 = FALSE;
+
+  if (m_already_encoded_p)
+	goto DONE;
+
+  if (mime_type_requires_b64_p (m_type))
+	{
+	  /* If the content-type is "image/" or something else known to be binary,
+		 always use base64 (so that we don't get confused by newline
+		 conversions.)
+	   */
+		needsB64 = TRUE;
+	}
+  else
+	{
+	  /* Otherwise, we need to pick an encoding based on the contents of
+		 the document.
+	   */
+
+	  XP_Bool encode_p;
+
+	  if (m_max_column > 900)
+		encode_p = TRUE;
+	  else if (mime_use_quoted_printable_p && m_unprintable_count)
+		encode_p = TRUE;
+
+	  else if (m_null_count)	/* If there are nulls, we must always encode,
+								   because sendmail will blow up. */
+		encode_p = TRUE;
+#if 0
+	  else if (m_ctl_count)	/* Should we encode if random other control
+								   characters are present?  Probably... */
+		encode_p = TRUE;
+#endif
+	  else
+		encode_p = FALSE;
+
+	  /* MIME requires a special case that these types never be encoded.
+	   */
+	  if (!strncasecomp (m_type, "message", 7) ||
+		  !strncasecomp (m_type, "multipart", 9))
+		{
+		  encode_p = FALSE;
+		  if (m_desired_type && !strcasecomp (m_desired_type, TEXT_PLAIN))
+			{
+			  XP_FREE (m_desired_type);
+			  m_desired_type = 0;
+			}
+		}
+	  /* If the Mail csid is CS_JIS we force it to use Base64 for attachments (bug#104255). 
+		Use 7 bit for other STATFUL ( e.g. CS_2022_KR) csid. */
+	  if ((mail_csid == CS_JIS) &&
+		  (strcasecomp(m_type, TEXT_HTML) == 0))
+         needsB64 = TRUE;
+	  else if((mail_csid & STATEFUL) &&
+         ((strcasecomp(m_type, TEXT_HTML) == 0) ||
+          (strcasecomp(m_type, TEXT_MDL) == 0) ||
+          (strcasecomp(m_type, TEXT_PLAIN) == 0) ||
+          (strcasecomp(m_type, TEXT_RICHTEXT) == 0) ||
+          (strcasecomp(m_type, TEXT_ENRICHED) == 0) ||
+          (strcasecomp(m_type, TEXT_VCARD) == 0) ||
+          (strcasecomp(m_type, TEXT_CSS) == 0) ||
+          (strcasecomp(m_type, TEXT_JSSS) == 0) ||
+          (strcasecomp(m_type, MESSAGE_RFC822) == 0) ||
+          (strcasecomp(m_type, MESSAGE_NEWS) == 0)))
+      {
+        needsB64 = TRUE;
+     }
+	  else if (encode_p &&
+			   m_size > 500 &&
+			   m_unprintable_count > (m_size / 10))
+		/* If the document contains more than 10% unprintable characters,
+		   then that seems like a good candidate for base64 instead of
+		   quoted-printable.
+		 */
+		  needsB64 = TRUE;
+	  else if (encode_p)
+		StrAllocCopy (m_encoding, ENCODING_QUOTED_PRINTABLE);
+	  else if (m_highbit_count > 0)
+		StrAllocCopy (m_encoding, ENCODING_8BIT);
+	  else
+		StrAllocCopy (m_encoding, ENCODING_7BIT);
+	}
+
+  if (needsB64)
+  {
+	  /* 
+		 ### mwelch We might have to uuencode instead of 
+		            base64 the binary data.
+	  */
+	  if (UseUUEncode_p())
+		  StrAllocCopy (m_encoding, ENCODING_UUENCODE);
+	  else
+		  StrAllocCopy (m_encoding, ENCODING_BASE64);
+  }
+
+  /* Now that we've picked an encoding, initialize the filter.
+   */
+  XP_ASSERT(!m_encoder_data);
+  if (!strcasecomp(m_encoding, ENCODING_BASE64))
+	{
+	  m_encoder_data = MimeB64EncoderInit(mime_encoder_output_fn,
+										  m_mime_delivery_state);
+	  if (!m_encoder_data) return MK_OUT_OF_MEMORY;
+	}
+  else if (!strcasecomp(m_encoding, ENCODING_UUENCODE))
+	{
+		char *tailName = NULL;
+		
+		if (m_url_string)
+		{
+		  	tailName = XP_STRRCHR(m_url_string, '/');
+		  	if (tailName)
+		  		tailName = XP_STRDUP(tailName+1);
+		}
+		
+		if (m_url && !tailName)
+		{
+			tailName = XP_STRRCHR(m_url->address, '/');
+			if (tailName)
+				tailName = XP_STRDUP(tailName+1);
+		}
+
+	  m_encoder_data = MimeUUEncoderInit(tailName ? tailName : "",
+	  									  mime_encoder_output_fn,
+										  m_mime_delivery_state);
+	  XP_FREEIF(tailName);
+	  if (!m_encoder_data) return MK_OUT_OF_MEMORY;
+	}
+  else if (!strcasecomp(m_encoding, ENCODING_QUOTED_PRINTABLE))
+	{
+	  m_encoder_data = MimeQPEncoderInit(mime_encoder_output_fn,
+										 m_mime_delivery_state);
+	  if (!m_encoder_data) return MK_OUT_OF_MEMORY;
+	}
+  else
+	{
+	  m_encoder_data = 0;
+	}
+
+
+  /* Do some cleanup for documents with unknown content type.
+
+	 There are two issues: how they look to MIME users, and how they look to
+	 non-MIME users.
+
+	 If the user attaches a "README" file, which has unknown type because it
+	 has no extension, we still need to send it with no encoding, so that it
+	 is readable to non-MIME users.
+
+	 But if the user attaches some random binary file, then base64 encoding
+	 will have been chosen for it (above), and in this case, it won't be
+	 immediately readable by non-MIME users.  However, if we type it as
+	 text/plain instead of application/octet-stream, it will show up inline
+	 in a MIME viewer, which will probably be ugly, and may possibly have
+	 bad charset things happen as well.
+
+	 So, the heuristic we use is, if the type is unknown, then the type is
+	 set to application/octet-stream for data which needs base64 (binary data)
+	 and is set to text/plain for data which didn't need base64 (unencoded or
+	 lightly encoded data.)
+   */
+ DONE:
+  if (!m_type || !*m_type || !strcasecomp(m_type, UNKNOWN_CONTENT_TYPE))
+	{
+	  if (m_already_encoded_p)
+		StrAllocCopy (m_type, APPLICATION_OCTET_STREAM);
+	  else if (m_encoding &&
+			   (!strcasecomp(m_encoding, ENCODING_BASE64) ||
+				!strcasecomp(m_encoding, ENCODING_UUENCODE)))
+		StrAllocCopy (m_type, APPLICATION_OCTET_STREAM);
+	  else
+		StrAllocCopy (m_type, TEXT_PLAIN);
+	}
+  return 0;
+}
+
+
+/* Some types should have a "charset=" parameter, and some shouldn't.
+   This is what decides. */
+XP_Bool
+mime_type_needs_charset (const char *type)
+{
+  /* Only text types should have charset. */
+  if (!type || !*type)
+	return FALSE;
+  else if (!strncasecomp (type, "text", 4))
+	return TRUE;
+  else
+	return FALSE;
+}
+
+
+char*
+mime_get_stream_write_buffer(void)
+{
+	if (!mime_mailto_stream_write_buffer) {
+		mime_mailto_stream_write_buffer = (char *) XP_ALLOC(MIME_BUFFER_SIZE);
+	}
+	return mime_mailto_stream_write_buffer;
+}
+
+#define PUSH_STRING(S) \
+ do { XP_STRCPY (buffer_tail, S); buffer_tail += XP_STRLEN (S); } while(0)
+#define PUSH_NEWLINE() \
+ do { *buffer_tail++ = CR; *buffer_tail++ = LF; *buffer_tail = '\0'; } while(0)
+
+
+/* All of the desired attachments have been written to individual temp files,
+   and we know what's in them.  Now we need to make a final temp file of the
+   actual mail message, containing all of the other files after having been
+   encoded as appropriate.
+ */
+int MSG_SendMimeDeliveryState::GatherMimeAttachments ()
+{
+  int32 status, i;
+  char *headers = 0;
+  char *separator = 0;
+  XP_File in_file = 0;
+  XP_Bool multipart_p = FALSE;
+  XP_Bool plaintext_is_mainbody_p = FALSE; // only using text converted from HTML?
+  char *buffer = 0;
+  char *buffer_tail = 0;
+  char* error_msg = 0;
+  int16 win_csid	 = INTL_DefaultWinCharSetID(GetContext());
+  XP_Bool tonews =  (m_fields && m_fields->GetNewsgroups() && *m_fields->GetNewsgroups()) ;
+	// to news is true if we have a m_field and we have a Newsgroup and it is not empty
+  INTL_MessageSendToNews(tonews);	// hack to make Korean Mail/News work correctly 
+					// Look at libi18n/doc_ccc.c for details 
+					// temp solution for bug 30725
+  int16 mail_csid 	 = tonews ?
+		INTL_DefaultNewsCharSetID(win_csid) :
+		INTL_DefaultMailCharSetID(win_csid);
+
+  MSG_SendPart* toppart = NULL;	// The very top most container of the message
+								// that we are going to send.
+  MSG_SendPart* mainbody = NULL;// The leaf node that contains the text of the
+								// message we're going to contain.
+  MSG_SendPart* maincontainer = NULL;// The direct child of toppart that will
+									 // contain the mainbody.  If mainbody is
+									 // the same as toppart, then this is
+									 // also the same.  But if mainbody is
+									 // to end up somewhere inside of a
+									 // multipart/alternative or a
+									 // multipart/related, then this is that
+									 // multipart object.
+
+  MSG_SendPart* plainpart = NULL;	// If we converted HTML into plaintext,
+  									// the message or child containing the plaintext
+  									// goes here. (Need to use this to determine
+  									// what headers to append/set to the main 
+  									// message body.)
+  char *hdrs = 0;
+  XP_Bool maincontainerISrelatedpart = FALSE;
+
+  INTL_CharSetInfo c = LO_GetDocumentCharacterSetInfo(GetContext());
+
+
+  status = m_status;
+  if (status < 0)
+	goto FAIL;
+
+  if (m_attachments_only_p)
+	{
+	  /* If we get here, we shouldn't have the "generating a message" cb. */
+	  XP_ASSERT(!m_dont_deliver_p &&
+				!m_message_delivery_done_callback);
+	  if (m_attachments_done_callback)
+		{
+		  struct MSG_AttachedFile *attachments;
+
+		  XP_ASSERT(m_attachment_count > 0);
+		  if (m_attachment_count <= 0)
+			{
+			  m_attachments_done_callback (GetContext(),
+												m_fe_data, 0, 0,
+												0);
+			  m_attachments_done_callback = 0;
+			  Clear();
+			  goto FAIL;
+			}
+
+		  attachments = (struct MSG_AttachedFile *)
+			XP_ALLOC((m_attachment_count + 1) * sizeof(*attachments));
+
+		  if (!attachments) goto FAILMEM;
+		  XP_MEMSET(attachments, 0, ((m_attachment_count + 1)
+									 * sizeof(*attachments)));
+		  for (i = 0; i < m_attachment_count; i++)
+			{
+			  MSG_DeliverMimeAttachment *ma = &m_attachments[i];
+
+#undef SNARF
+#define SNARF(x,y) do { if((y) && *(y) && !(x)) { ((x) = (y)); ((y) = 0); }} \
+				   while(0)
+			  /* Rather than copying the strings and dealing with allocation
+				 failures, we'll just "move" them into the other struct (this
+				 should be ok since this file uses FREEIF when discarding
+				 the mime_attachment objects.) */
+			  SNARF(attachments[i].orig_url, ma->m_url_string);
+			  SNARF(attachments[i].file_name, ma->m_file_name);
+			  SNARF(attachments[i].type, ma->m_type);
+			  SNARF(attachments[i].encoding, ma->m_encoding);
+			  SNARF(attachments[i].description, ma->m_description);
+			  SNARF(attachments[i].x_mac_type, ma->m_x_mac_type);
+			  SNARF(attachments[i].x_mac_creator, ma->m_x_mac_creator);
+#undef SNARF
+			  HG96484
+			  attachments[i].size = ma->m_size;
+			  attachments[i].unprintable_count = ma->m_unprintable_count;
+			  attachments[i].highbit_count = ma->m_highbit_count;
+			  attachments[i].ctl_count = ma->m_ctl_count;
+			  attachments[i].null_count = ma->m_null_count;
+			  attachments[i].max_line_length = ma->m_max_column;
+
+			  /* Doesn't really matter, but let's not lie about encoding
+				 in case it does someday. */
+			  if (attachments[i].highbit_count > 0 &&
+				  attachments[i].encoding &&
+				  !strcasecomp(attachments[i].encoding, ENCODING_7BIT))
+				StrAllocCopy (attachments[i].encoding, ENCODING_8BIT);
+			}
+
+		  /* The callback is expected to free the attachments list and all
+			 the strings in it.   It's also expected to delete the files!
+		   */
+		  m_attachments_done_callback (GetContext(),
+											m_fe_data, 0, 0,
+											attachments);
+		  m_attachments_done_callback = 0;
+		  Clear();
+		}
+	  goto FAIL;
+	}
+
+
+  /* If we get here, we're generating a message, so there shouldn't be an
+	 attachments callback. */
+  XP_ASSERT(!m_attachments_done_callback);
+
+
+  if (!m_attachment1_type) {
+	  m_attachment1_type = XP_STRDUP(TEXT_PLAIN);
+	  if (!m_attachment1_type) goto FAILMEM;
+  }
+
+  // If we have a text/html main part, and we need a plaintext attachment, then
+  // we'll do so now.  This is an asynchronous thing, so we'll kick it off and
+  // count on getting back here when it finishes.
+
+  if (m_plaintext == NULL &&
+	  (m_fields->GetForcePlainText() ||
+	   m_fields->GetUseMultipartAlternative()) &&
+	    m_attachment1_body && XP_STRCMP(m_attachment1_type, TEXT_HTML) == 0) {
+	  m_html_filename = WH_TempName (xpFileToPost, "nsmail");
+	  if (!m_html_filename) goto FAILMEM;
+	  in_file = XP_FileOpen(m_html_filename, xpFileToPost, XP_FILE_WRITE_BIN);
+	  if (!in_file) {
+		  status = MK_UNABLE_TO_OPEN_TMP_FILE;
+		  goto FAIL;
+	  }
+	  status = XP_FileWrite(m_attachment1_body, m_attachment1_body_length,
+							in_file);
+	  if (status < int(m_attachment1_body_length)) {
+		  if (status >= 0) {
+			  status = MK_MIME_ERROR_WRITING_FILE;
+		  }
+		  goto FAIL;
+	  }
+	  status = XP_FileClose(in_file);
+	  in_file = NULL;
+	  if (status < 0) goto FAIL;
+
+	  m_plaintext = new MSG_DeliverMimeAttachment;
+	  if (!m_plaintext) goto FAILMEM;
+	  m_plaintext->m_mime_delivery_state = this;
+	  char* temp = WH_FileName(m_html_filename, xpFileToPost);
+	  m_plaintext->m_url_string = XP_PlatformFileToURL(temp);
+	  if (temp) XP_FREE(temp);
+	  if (!m_plaintext->m_url_string) goto FAILMEM;
+	  m_plaintext->m_url =
+		  NET_CreateURLStruct (m_plaintext->m_url_string, NET_DONT_RELOAD);
+	  if (!m_plaintext->m_url) goto FAILMEM;
+	  StrAllocCopy(m_plaintext->m_url->content_type, TEXT_HTML);
+	  StrAllocCopy(m_plaintext->m_type, TEXT_HTML);
+	  StrAllocCopy(m_plaintext->m_desired_type, TEXT_PLAIN);
+	  m_attachment_pending_count++;
+	  status = m_plaintext->SnarfAttachment();
+	  if (status < 0) goto FAIL;
+	  if (m_attachment_pending_count > 0) return 0;
+  }
+	  
+
+  /* hack to avoid having to allocate memory... */
+  buffer = mime_get_stream_write_buffer();
+  if (! buffer) goto FAILMEM;
+
+  buffer_tail = buffer;
+
+  XP_ASSERT (m_attachment_pending_count == 0);
+
+  FE_Progress(GetContext(), XP_GetString(MK_MSG_ASSEMBLING_MSG));
+
+  /* First, open the message file.
+   */
+  m_msg_file_name = WH_TempName (xpFileToPost, "nsmail");
+  if (! m_msg_file_name) goto FAILMEM;
+  m_msg_file = XP_FileOpen (m_msg_file_name, xpFileToPost,
+								 XP_FILE_WRITE_BIN);
+  if (! m_msg_file)
+	{
+	  status = MK_UNABLE_TO_OPEN_TMP_FILE;
+	  error_msg = PR_smprintf(XP_GetString(status), m_msg_file_name);
+	  if (!error_msg) status = MK_OUT_OF_MEMORY;
+	  goto FAIL;
+	}
+
+#ifdef GENERATE_MESSAGE_ID
+  if (m_fields->GetMessageId() == NULL) {
+	m_fields->SetMessageId(msg_generate_message_id ());
+  }
+#endif /* GENERATE_MESSAGE_ID */
+
+  mainbody = new MSG_SendPart(this, mail_csid);
+  if (!mainbody) goto FAILMEM;
+  
+  mainbody->SetMainPart(TRUE);
+  mainbody->SetType(m_attachment1_type ? m_attachment1_type : TEXT_PLAIN);
+
+  XP_ASSERT(mainbody->GetBuffer() == NULL);
+  status = mainbody->SetBuffer(m_attachment1_body ? m_attachment1_body : " ");
+  if (status < 0) goto FAIL;
+
+	/*	### mwelch 
+		Determine the encoding of the main message body before we free it.
+		The proper way to do this should be to test whatever text is in mainbody
+		just before writing it out, but that will require a fix that is less safe
+		and takes more memory. */
+  if ((mail_csid & STATEFUL) || /* CS_JIS or CS_2022_KR */
+		  mime_7bit_data_p (m_attachment1_body,
+						m_attachment1_body_length))
+	StrAllocCopy (m_attachment1_encoding, ENCODING_7BIT);
+  else if (mime_use_quoted_printable_p)
+	StrAllocCopy (m_attachment1_encoding, ENCODING_QUOTED_PRINTABLE);
+  else
+	StrAllocCopy (m_attachment1_encoding, ENCODING_8BIT);
+
+  FREEIF (m_attachment1_body);
+
+  maincontainer = mainbody;
+
+  // If we were given a pre-saved collection of HTML and contained images,
+  // then we want mainbody to point to the HTML lump therein.
+  if (m_related_part)
+  {
+	  // If m_related_part is of type text/html, set both maincontainer
+	  // and mainbody to point to it. If m_related_part is multipart/related,
+	  // however, set mainbody to be the first child within m_related_part.
+
+	  // To plug a memory leak, delete the original maincontainer/mainbody.
+	  // 
+	  // NOTE: We DO NOT want to do this to the HTML or multipart/related 
+	  // MSG_SendParts because they are deleted at the end of message 
+	  // delivery by the TapeFileSystem object 
+	  // (MSG_MimeRelatedSaver / mhtmlstm.cpp).
+	  delete mainbody;
+
+	  // No matter what, maincontainer points to the outermost related part.
+	  maincontainer = m_related_part;
+	  maincontainerISrelatedpart = TRUE;
+
+	  const char *relPartType = m_related_part->GetType();
+	  if (relPartType && !strcmp(relPartType, MULTIPART_RELATED))
+		  // outer shell is m/related,
+		  // mainbody wants to be the HTML lump within
+		  mainbody = m_related_part->GetChild(0);
+	  else
+		  // outer shell is text/html, 
+		  // so mainbody wants to be the same lump
+		  mainbody = maincontainer;
+
+	  mainbody->SetMainPart(TRUE);
+  }
+
+  if (m_plaintext) {
+	  // OK.  We have a plaintext version of the main body that we want to
+	  // send instead of or with the text/html.  Put it in.
+	  
+	  plainpart = new MSG_SendPart(this, mail_csid);
+	  if (!plainpart) goto FAILMEM;
+	  status = plainpart->SetType(TEXT_PLAIN);
+	  if (status < 0) goto FAIL;
+	  status = plainpart->SetFile(m_plaintext->m_file_name, xpFileToPost);
+	  if (status < 0) goto FAIL;
+	  m_plaintext->AnalyzeSnarfedFile(); // look for 8 bit text, long lines, etc.
+	  m_plaintext->PickEncoding(mail_csid);
+	  hdrs = mime_generate_attachment_headers(m_plaintext->m_type,
+											  m_plaintext->m_encoding,
+											  m_plaintext->m_description,
+											  m_plaintext->m_x_mac_type,
+											  m_plaintext->m_x_mac_creator,
+											  m_plaintext->m_real_name, 0,
+											  m_digest_p,
+											  m_plaintext,
+											  mail_csid);
+	  if (!hdrs) goto FAILMEM;
+	  status = plainpart->SetOtherHeaders(hdrs);
+	  XP_FREE(hdrs);
+	  hdrs = NULL;
+	  if (status < 0) goto FAIL;
+
+	  
+
+	  if (m_fields->GetUseMultipartAlternative()) {
+		  MSG_SendPart* htmlpart = maincontainer;
+		  maincontainer = new MSG_SendPart(this);
+		  if (!maincontainer) goto FAILMEM;
+		  status = maincontainer->SetType(MULTIPART_ALTERNATIVE);
+		  if (status < 0) goto FAIL;
+		  status = maincontainer->AddChild(plainpart);
+		  if (status < 0) goto FAIL;
+		  status = maincontainer->AddChild(htmlpart);
+		  if (status < 0) goto FAIL;
+		  
+		  // Create the encoder for the plaintext part here,
+		  // because we aren't the main part (attachment1).
+		  // (This, along with the rest of the routine, should really
+		  // be restructured so that no special treatment is given to
+		  // the main body text that came in. Best to put attachment1_text
+		  // etc. into a MSG_SendPart, then reshuffle the parts. Sigh.)
+		  if (!XP_STRCASECMP(m_plaintext->m_encoding, ENCODING_QUOTED_PRINTABLE))
+		  {
+		  	 MimeEncoderData *plaintext_enc = MimeQPEncoderInit(mime_encoder_output_fn, this);
+		  	 if (!plaintext_enc)
+		  	 {
+		  	 	status = MK_OUT_OF_MEMORY;
+		  	 	goto FAIL;
+		  	 }
+		  	 plainpart->SetEncoderData(plaintext_enc);
+		  }
+	  } else {
+		  delete maincontainer; //### mwelch - does this cause a crash?!
+		  if (maincontainerISrelatedpart)
+			  m_related_part = NULL;
+		  maincontainer = plainpart;
+		  mainbody = maincontainer;
+		  FREEIF(m_attachment1_type);
+		  m_attachment1_type = XP_STRDUP(TEXT_PLAIN);
+		  if (!m_attachment1_type) goto FAILMEM;
+		  
+		  /* Override attachment1_encoding here. */
+	 	  FREEIF(m_attachment1_encoding);
+	 	  StrAllocCopy(m_attachment1_encoding, m_plaintext->m_encoding);
+
+		  plaintext_is_mainbody_p = TRUE; // converted plaintext is mainbody
+	  }
+  }
+
+  // ###tw  This used to be this more complicated thing, but for now, if it we
+  // have any attachments, we generate multipart.
+  //multipart_p = (m_attachment_count > 1 ||
+  //				 (m_attachment_count == 1 &&
+  //				  m_attachment1_body_length > 0));
+  multipart_p = (m_attachment_count > 0);
+
+  if (multipart_p) {
+	toppart = new MSG_SendPart(this);
+	if (!toppart) goto FAILMEM;
+	status = toppart->SetType(m_digest_p ? MULTIPART_DIGEST : MULTIPART_MIXED);
+	if (status < 0) goto FAIL;
+	status = toppart->AddChild(maincontainer);
+	if (status < 0) goto FAIL;
+    HG36459
+    { 
+	  status = toppart->SetBuffer(XP_GetString (MK_MIME_MULTIPART_BLURB));
+	  if (status < 0) goto FAIL;
+	}
+  } else {
+	toppart = maincontainer;
+  }
+
+
+  /* Write out the message headers.
+   */
+  headers = mime_generate_headers (m_fields,
+								   INTL_GetCSIWinCSID(c),
+								   m_deliver_mode);
+  if (!headers) goto FAILMEM;
+
+  // ### mwelch
+  // If we converted HTML into plaintext, the plaintext part (plainpart)
+  // already has its content-type and content-transfer-encoding
+  // ("other") headers set. 
+  // 
+  // In the specific case where such a plaintext part is the 
+  // top level message part (iff an HTML message is being sent
+  // as text only and no other attachments exist) we want to 
+  // preserve the original plainpart headers, since they
+  // contain accurate transfer encoding and Mac type/creator 
+  // information.
+  // 
+  // So, in the above case we append the main message headers, 
+  // otherwise we overwrite whatever headers may have existed.
+  // 
+  /* reordering of headers will happen in MSG_SendPart::Write */
+  if ((plainpart) && (plainpart == toppart))
+  	status = toppart->AppendOtherHeaders(headers);
+  else
+	status = toppart->SetOtherHeaders(headers);
+  XP_FREE(headers);
+  headers = NULL;
+  if (status < 0) goto FAIL;
+
+
+  /* Set up the first part (user-typed.)  For now, do it even if the first
+   * part is empty; we need to add things to skip it if this part is empty.
+   * ###tw
+   */
+
+
+  /* Set up encoder for the first part (message body.)
+   */
+  XP_ASSERT(!m_attachment1_encoder_data);
+  if (!strcasecomp(m_attachment1_encoding, ENCODING_BASE64))
+	{
+	  m_attachment1_encoder_data =
+		MimeB64EncoderInit(mime_encoder_output_fn, this);
+	  if (!m_attachment1_encoder_data) goto FAILMEM;
+	}
+  else if (!strcasecomp(m_attachment1_encoding,
+						ENCODING_QUOTED_PRINTABLE))
+	{
+	  m_attachment1_encoder_data =
+		MimeQPEncoderInit(mime_encoder_output_fn, this);
+	  if (!m_attachment1_encoder_data) goto FAILMEM;
+	}
+
+  // ### mwelch
+  // If we converted HTML into plaintext, the plaintext part
+  // already has its type/encoding headers set. So, in the specific
+  // case where such a plaintext part is the main message body
+  // (iff an HTML message is being sent as text only)
+  // we want to avoid generating type/encoding/digest headers;
+  // in all other cases, generate such headers here.
+  //
+  // We really want to set up headers as a dictionary of some sort
+  // so that we need not worry about duplicate header lines.
+  //
+  if ((!plainpart) || (plainpart != mainbody))
+  {
+	  hdrs = mime_generate_attachment_headers (m_attachment1_type,
+											   m_attachment1_encoding,
+											   0, 0, 0, 0, 0,
+											   m_digest_p,
+											   NULL, /* no "ma"! */
+											   mail_csid);
+	  if (!hdrs) goto FAILMEM;
+	  status = mainbody->AppendOtherHeaders(hdrs);
+	  if (status < 0) goto FAIL;
+  }
+
+  FREEIF(hdrs);
+
+  status = mainbody->SetEncoderData(m_attachment1_encoder_data);
+  m_attachment1_encoder_data = NULL;
+  if (status < 0) goto FAIL;
+
+
+  /* Set up the subsequent parts.
+   */
+  if (m_attachment_count > 0)
+	{
+	  char *buffer;
+
+	  /* Hack to avoid having to allocate memory... */
+	  if (! mime_mailto_stream_read_buffer)
+		mime_mailto_stream_read_buffer = (char *) XP_ALLOC (MIME_BUFFER_SIZE);
+	  buffer = mime_mailto_stream_read_buffer;
+	  if (! buffer) goto FAILMEM;
+	  buffer_tail = buffer;
+
+	  for (i = 0; i < m_attachment_count; i++)
+		{
+		  MSG_DeliverMimeAttachment *ma = &m_attachments[i];
+		  char *hdrs = 0;
+
+		  MSG_SendPart* part = NULL;
+
+		  // If at this point we *still* don't have an content-type, then
+		  // we're never going to get one.
+		  if (ma->m_type == NULL) {
+			  ma->m_type = XP_STRDUP(UNKNOWN_CONTENT_TYPE);
+			  if (ma->m_type == NULL) goto FAILMEM;
+		  }
+
+		  ma->PickEncoding (mail_csid);
+
+		  part = new MSG_SendPart(this);
+		  if (!part) goto FAILMEM;
+		  status = toppart->AddChild(part);
+		  if (status < 0) goto FAIL;
+		  status = part->SetType(ma->m_type);
+		  if (status < 0) goto FAIL;
+
+		  hdrs = mime_generate_attachment_headers (ma->m_type, ma->m_encoding,
+												   ma->m_description,
+												   ma->m_x_mac_type,
+												   ma->m_x_mac_creator,
+												   ma->m_real_name,
+												   ma->m_url_string,
+												   m_digest_p,
+												   ma,
+												   mail_csid);
+		  if (!hdrs) goto FAILMEM;
+
+		  status = part->SetOtherHeaders(hdrs);
+		  FREEIF(hdrs);
+		  if (status < 0) goto FAIL;
+		  status = part->SetFile(ma->m_file_name, xpFileToPost);
+		  if (status < 0) goto FAIL;
+		  if (ma->m_encoder_data) {
+			status = part->SetEncoderData(ma->m_encoder_data);
+			if (status < 0) goto FAIL;
+			ma->m_encoder_data = NULL;
+		  }
+
+		  ma->m_current_column = 0;
+
+		  if (ma->m_type &&
+			  (!strcasecomp (ma->m_type, MESSAGE_RFC822) ||
+			   !strcasecomp (ma->m_type, MESSAGE_NEWS))) {
+			status = part->SetStripSensitiveHeaders(TRUE);
+			if (status < 0) goto FAIL;
+		  }
+
+		}
+	}
+
+  // OK, now actually write the structure we've carefully built up.
+  status = toppart->Write();
+  if (status < 0) goto FAIL;
+
+  HG75442
+
+  if (m_msg_file)
+	XP_FileClose (m_msg_file);
+  m_msg_file = 0;
+
+  FE_Progress(GetContext(), XP_GetString(MK_MSG_ASSEMB_DONE_MSG));
+
+  if (m_dont_deliver_p &&
+	  m_message_delivery_done_callback)
+	{
+	  m_message_delivery_done_callback (GetContext(),
+											 m_fe_data, 0,
+											 XP_STRDUP (m_msg_file_name));
+	  /* Need to ditch the file name here so that we don't delete the
+		 file, since in this case, the FE needs the file itself. */
+	  FREEIF (m_msg_file_name);
+	  m_msg_file_name = 0;
+	  m_message_delivery_done_callback = 0;
+	  Clear();
+	}
+  else
+	{
+	  DeliverMessage();
+	}
+
+  // Get rid of all the encoder data and temporary files.
+  for (i = 0; i < m_attachment_count; i++) {
+	MSG_DeliverMimeAttachment *ma = &m_attachments[i];
+	if (ma->m_encoder_data) {
+	  status = MimeEncoderDestroy(ma->m_encoder_data, FALSE);
+	  ma->m_encoder_data = 0;
+	  if (status < 0) goto FAIL;
+	}
+
+	if (!m_pre_snarfed_attachments_p) {
+	  if (ma->m_file) {
+		  XP_FileClose(ma->m_file);
+		  ma->m_file = 0;
+	  }
+	  XP_FileRemove(ma->m_file_name, xpFileToPost);
+	}
+	XP_FREE (ma->m_file_name);
+	ma->m_file_name = 0;
+  }
+
+
+
+ FAIL:
+  if (toppart)
+	delete toppart;
+  toppart = NULL;
+  mainbody = NULL;
+  maincontainer = NULL;
+
+  /* Close off encoder for the first part (message body.) */
+  if (m_attachment1_encoder_data)
+	{
+	  status = MimeEncoderDestroy(m_attachment1_encoder_data, FALSE);
+	  m_attachment1_encoder_data = 0;
+	  if (status < 0) goto FAIL;
+	}
+  if (headers) XP_FREE (headers);
+  if (separator) XP_FREE (separator);
+  if (in_file) {
+	XP_FileClose (in_file);
+	in_file = NULL;
+  }
+
+  HG59731
+
+  if (status < 0)
+	{
+	  m_status = status;
+	  Fail (status, error_msg);
+	}
+  /* If status is >= 0, then the the next event coming up is posting to
+	 a "mailto:" or "news:" URL; the message_delivery_done_callback will
+	 be called from the exit routine of that URL. */
+
+
+  if (m_plaintext) {
+	  if (m_plaintext->m_file)
+		  XP_FileClose(m_plaintext->m_file);
+	  XP_FileRemove(m_plaintext->m_file_name, xpFileToPost);
+	  XP_FREE(m_plaintext->m_file_name);
+	  m_plaintext->m_file_name = NULL;
+	  delete m_plaintext;
+	  m_plaintext = NULL;
+  }
+
+  if (m_html_filename) {
+	  XP_FileRemove(m_html_filename, xpFileToPost);
+	  XP_FREE(m_html_filename);
+	  m_html_filename = NULL;
+  }
+
+  return status;
+
+FAILMEM:
+  status = MK_OUT_OF_MEMORY;
+  goto FAIL;
+}
+
+
+#if defined(XP_MAC) && defined(DEBUG)
+// Compiler runs out of registers for the debug build.
+#pragma global_optimizer on
+#pragma optimization_level 4
+#endif // XP_MAC && DEBUG
+
+static void FROB (const char *src, char *dest)
+{
+    if (src && *src && dest)
+    {
+        if (*dest) XP_STRCAT(dest, ",");
+        XP_STRCAT(dest, src);
+    }
+}
+
+HG53784
+
+#if defined(XP_MAC) && defined(DEBUG)
+#pragma global_optimizer reset
+#endif // XP_MAC && DEBUG
+
+
+int
+mime_write_message_body (MSG_SendMimeDeliveryState *state,
+						 char *buf, int32 size)
+{
+    HG56898
+	{
+	  if (int32(XP_FileWrite (buf, size, state->m_msg_file)) < size)
+	  {
+		return MK_MIME_ERROR_WRITING_FILE;
+	  }
+	  else
+	  {
+		return 0;
+	  }
+	}
+}
+
+
+#ifdef XP_OS2
+extern int
+#else
+static int
+#endif
+mime_encoder_output_fn (const char *buf, int32 size, void *closure)
+{
+  MSG_SendMimeDeliveryState *state = (MSG_SendMimeDeliveryState *) closure;
+  return mime_write_message_body (state, (char *) buf, size);
+}
+
+
+char *
+msg_generate_message_id (void)
+{
+  time_t now = XP_TIME();
+  uint32 salt = 0;
+  const char *host = 0;
+  const char *from = FE_UsersMailAddress ();
+
+  RNG_GenerateGlobalRandomBytes((void *) &salt, sizeof(salt));
+
+  if (from)
+	{
+	  host = XP_STRCHR (from, '@');
+	  if (host)
+	    {
+	      const char *s;
+	      for (s = ++host; *s; s++)
+		    if (!XP_IS_ALPHA(*s) && !XP_IS_DIGIT(*s) &&
+			    *s != '-' && *s != '_' && *s != '.')
+		      {
+			    host = 0;
+			    break;
+		      }
+	    }
+	}
+
+  if (! host)
+	/* If we couldn't find a valid host name to use, we can't generate a
+	   valid message ID, so bail, and let NNTP and SMTP generate them. */
+	return 0;
+
+  return PR_smprintf("<%lX.%lX@%s>",
+					 (unsigned long) now, (unsigned long) salt, host);
+}
+
+static char *
+mime_generate_headers (MSG_CompositionFields *fields,
+					   int csid,
+					   MSG_Deliver_Mode deliver_mode)
+{
+  int size = 0;
+  char *buffer = 0, *buffer_tail = 0;
+  XP_Bool isDraft = deliver_mode == MSG_SaveAsDraft ||
+					deliver_mode == MSG_SaveAsTemplate ||
+					deliver_mode == MSG_QueueForLater;
+
+  XP_ASSERT (fields);
+  if (!fields)
+	  return NULL;
+
+  /* Multiply by 3 here to make enough room for MimePartII conversion */
+  if (fields->GetFrom())                 size += 3 * XP_STRLEN (fields->GetFrom());
+  if (fields->GetReplyTo())             size += 3 * XP_STRLEN (fields->GetReplyTo());
+  if (fields->GetTo())                   size += 3 * XP_STRLEN (fields->GetTo());
+  if (fields->GetCc())                   size += 3 * XP_STRLEN (fields->GetCc());
+  if (fields->GetNewsgroups())           size += 3 * XP_STRLEN (fields->GetNewsgroups());
+  if (fields->GetFollowupTo())          size += 3 * XP_STRLEN (fields->GetFollowupTo());
+  if (fields->GetSubject())              size += 3 * XP_STRLEN (fields->GetSubject());
+  if (fields->GetReferences())           size += 3 * XP_STRLEN (fields->GetReferences());
+  if (fields->GetOrganization())         size += 3 * XP_STRLEN (fields->GetOrganization());
+  if (fields->GetOtherRandomHeaders()) size += 3 * XP_STRLEN (fields->GetOtherRandomHeaders());
+  if (fields->GetPriority())             size += 3 * XP_STRLEN (fields->GetPriority());
+#ifdef GENERATE_MESSAGE_ID
+  if (fields->GetMessageId())           size += XP_STRLEN (fields->GetMessageId());
+#endif /* GENERATE_MESSAGE_ID */
+
+  /* Add a bunch of space for the static parts of the headers. */
+  /* size += 2048; */
+  size += 2560;
+
+  buffer = (char *) XP_ALLOC (size);
+  if (!buffer)
+	return 0; /* MK_OUT_OF_MEMORY */
+
+  buffer_tail = buffer;
+
+#ifdef GENERATE_MESSAGE_ID
+  if (fields->GetMessageId() && *fields->GetMessageId())
+	{
+	  char *convbuf = NULL;
+	  PUSH_STRING ("Message-ID: ");
+	  PUSH_STRING (fields->GetMessageId());
+	  PUSH_NEWLINE ();
+	  /* MDN request header requires to have MessageID header presented
+	   * in the message in order to
+	   * coorelate the MDN reports to the original message. Here will be
+	   * the right place
+	   */
+	  if (fields->GetReturnReceipt() && 
+		  (fields->GetReturnReceiptType() == 2 ||
+		   fields->GetReturnReceiptType() == 3) && 
+		  (deliver_mode != MSG_SaveAsDraft &&
+					   deliver_mode != MSG_SaveAsTemplate))
+	  {
+		  int32 receipt_header_type = 0;
+
+		  PREF_GetIntPref("mail.receipt.request_header_type",
+						  &receipt_header_type);
+		  // 0 = MDN Disposition-Notification-To: ; 1 = Return-Receipt-To: ; 2 =
+		  // both MDN DNT & RRT headers
+		  if (receipt_header_type == 1)
+		  {
+		  RRT_HEADER:
+			  PUSH_STRING ("Return-Receipt-To: ");
+			  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetFrom(), csid,
+												mime_headers_use_quoted_printable_p);
+			  if (convbuf)     /* MIME-PartII conversion */
+			  {
+				  PUSH_STRING (convbuf);
+				  XP_FREEIF(convbuf);
+			  }
+			  else
+				  PUSH_STRING (fields->GetFrom());
+			  PUSH_NEWLINE ();
+		  }
+		  else 
+		  {
+			  PUSH_STRING ("Disposition-Notification-To: ");
+			  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetFrom(), csid,
+												mime_headers_use_quoted_printable_p);
+			  if (convbuf)     /* MIME-PartII conversion */
+			  {
+				  PUSH_STRING (convbuf);
+				  XP_FREEIF(convbuf);
+			  }
+			  else
+				  PUSH_STRING (fields->GetFrom());
+			  PUSH_NEWLINE ();
+			  if (receipt_header_type == 2)
+				  goto RRT_HEADER;
+		  }
+	  }
+#ifdef SUPPORT_X_TEMPLATE_NAME
+	  if (deliver_mode == MSG_SaveAsTemplate)
+	  {
+		  PUSH_STRING ("X-Template: ");
+		  if (fields->GetTemplateName())
+		  {
+			  convbuf = IntlEncodeMimePartIIStr((char *)
+									 fields->GetTemplateName(),
+									 csid,
+									 mime_headers_use_quoted_printable_p);
+			  if (convbuf)
+			  {
+				  PUSH_STRING (convbuf);
+				  XP_FREEIF(convbuf);
+			  }
+			  else
+			  {
+				  PUSH_STRING(fields->GetTemplateName());
+			  }
+		  }
+		  PUSH_NEWLINE ();
+	  }
+#endif /* SUPPORT_X_TEMPLATE_NAME */
+	}
+#endif /* GENERATE_MESSAGE_ID */
+
+  {
+#if 0
+  /* Use strftime() to format the date, then figure out what our local
+	 GMT offset it, and append that (since strftime() can't do that.)
+	 Generate four digit years as per RFC 1123 (superceding RFC 822.)
+   */
+	time_t now = time ((time_t *) 0);
+	int gmtoffset = XP_LocalZoneOffset();
+	strftime (buffer_tail, 100, "Date: %a, %d %b %Y %H:%M:%S ",
+			  localtime (&now));
+#else
+	int gmtoffset = XP_LocalZoneOffset();
+#ifndef NSPR20
+    PRTime now;
+    PR_ExplodeTime(&now, PR_Now());
+#else
+    PRExplodedTime now;
+    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
+#endif /* NSPR20 */
+
+	/* Use PR_FormatTimeUSEnglish() to format the date in US English format,
+	   then figure out what our local GMT offset is, and append it (since
+	   PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as
+	   per RFC 1123 (superceding RFC 822.)
+	 */
+	PR_FormatTimeUSEnglish(buffer_tail, 100,
+						   "Date: %a, %d %b %Y %H:%M:%S ",
+						   &now);
+#endif
+
+	buffer_tail += XP_STRLEN (buffer_tail);
+	PR_snprintf(buffer_tail, buffer + size - buffer_tail,
+				"%c%02d%02d" CRLF,
+				(gmtoffset >= 0 ? '+' : '-'),
+				((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60),
+				((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60));
+	buffer_tail += XP_STRLEN (buffer_tail);
+  }
+
+  if (fields->GetFrom() && *fields->GetFrom())
+	{
+	  char *convbuf;
+  	  PUSH_STRING ("From: ");
+	  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetFrom(), csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)     /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (fields->GetFrom());
+      PUSH_NEWLINE ();
+	}
+
+  if (fields->GetReplyTo() && *fields->GetReplyTo())
+	{
+	  char *convbuf;
+	  PUSH_STRING ("Reply-To: ");
+	  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetReplyTo(), csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)     /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (fields->GetReplyTo());
+	  PUSH_NEWLINE ();
+	}
+
+  if (fields->GetOrganization() && *fields->GetOrganization())
+	{
+	  char *convbuf;
+	  PUSH_STRING ("Organization: ");
+	  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetOrganization(), csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)     /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (fields->GetOrganization());
+	  PUSH_NEWLINE ();
+	}
+
+  // X-Sender tag
+  if (fields->GetOwner())
+  {
+	XP_Bool bUseXSender = FALSE;
+	
+	PREF_GetBoolPref("mail.use_x_sender", &bUseXSender);
+	if (bUseXSender) {
+	  char *convbuf;
+	  char tmpBuffer[256];
+	  int bufSize = 256;
+	  
+	  *tmpBuffer = 0;
+
+  	  PUSH_STRING ("X-Sender: ");
+
+	  PUSH_STRING("\"");
+
+	  PREF_GetCharPref("mail.identity.username", tmpBuffer, &bufSize);
+	  convbuf = IntlEncodeMimePartIIStr((char *)tmpBuffer, csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)     /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (tmpBuffer);
+
+	  PUSH_STRING("\" <");
+
+	  PREF_GetCharPref("mail.pop_name", tmpBuffer, &bufSize);
+	  convbuf = IntlEncodeMimePartIIStr((char *)tmpBuffer, csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)     /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (tmpBuffer);
+
+	  PUSH_STRING ("@");
+
+	  PREF_GetCharPref("network.hosts.pop_server", tmpBuffer, &bufSize);
+	  convbuf = IntlEncodeMimePartIIStr((char *)tmpBuffer, csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)     /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (tmpBuffer);
+
+	  PUSH_STRING(">");
+
+	  convbuf = IntlEncodeMimePartIIStr((char *)tmpBuffer, csid,
+										mime_headers_use_quoted_printable_p);
+
+      PUSH_NEWLINE ();
+	}
+  }
+  // X-Mozilla-Draft-Info
+  if (isDraft) {
+	  char *htmlAction = 0;
+	  char *lineWidth = 0; // force plain text hard line break info
+
+	  PUSH_STRING(X_MOZILLA_DRAFT_INFO);
+	  PUSH_STRING(": internal/draft; ");
+	  if (fields->GetAttachVCard()) {
+		  PUSH_STRING("vcard=1");
+	  }
+	  else {
+		  PUSH_STRING("vcard=0");
+	  }
+	  PUSH_STRING("; ");
+	  if (fields->GetReturnReceipt()) {
+		  char *type = PR_smprintf("%d", (int) fields->GetReturnReceiptType());
+		  if (type)
+		  {
+			  PUSH_STRING("receipt=");
+			  PUSH_STRING(type);
+			  XP_FREEIF(type);
+		  }
+	  }
+	  else {
+		  PUSH_STRING("receipt=0");
+	  }
+	  PUSH_STRING("; ");
+	  if (fields->GetBoolHeader(MSG_UUENCODE_BINARY_BOOL_HEADER_MASK)) {
+		  PUSH_STRING("uuencode=1");
+	  }
+	  else {
+		  PUSH_STRING("uuencode=0");
+	  }
+
+	  htmlAction = PR_smprintf("html=%d", 
+		  ((MSG_CompositionPane*)fields->GetOwner())->GetHTMLAction());
+	  if (htmlAction)
+	  {
+	  	PUSH_STRING("; ");
+	  	PUSH_STRING(htmlAction);
+	  	FREEIF(htmlAction);
+	  }
+
+	  lineWidth = PR_smprintf("; linewidth=%d",
+		  ((MSG_CompositionPane*)fields->GetOwner())->GetLineWidth());
+	  if (lineWidth)
+	  {
+		  PUSH_STRING(lineWidth);
+		  FREEIF(lineWidth);
+	  }
+	  PUSH_NEWLINE ();
+  }
+
+  PUSH_STRING ("X-Mailer: ");
+  PUSH_STRING (XP_AppCodeName);
+  PUSH_STRING (" ");
+  PUSH_STRING (XP_AppVersion);
+  PUSH_NEWLINE ();
+
+  /* for Netscape Server, Accept-Language data sent in Mail header */
+  char *acceptlang = INTL_GetAcceptLanguage();
+  if( (acceptlang != NULL) && ( *acceptlang != '\0') ){
+	  PUSH_STRING( "X-Accept-Language: " );
+	  PUSH_STRING( acceptlang );
+	  PUSH_NEWLINE();
+  }
+
+  PUSH_STRING ("MIME-Version: 1.0" CRLF);
+
+  if (fields->GetNewsgroups() && *fields->GetNewsgroups())
+	{
+      /* turn whitespace into a comma list
+       */
+	  char *ptr, *ptr2;
+	  char *n2;
+	  char *convbuf;
+
+	  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetNewsgroups(), csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)
+	  	n2 = XP_StripLine (convbuf);
+	  else {
+		ptr = XP_STRDUP(fields->GetNewsgroups());
+		if (!ptr)
+		  {
+			FREEIF(buffer);
+			return 0; /* MK_OUT_OF_MEMORY */
+		  }
+  	  	n2 = XP_StripLine(ptr);
+		XP_ASSERT(n2 == ptr);	/* Otherwise, the XP_FREE below is
+								   gonna choke badly. */
+	  }
+
+      for(ptr=n2; *ptr != '\0'; ptr++)
+        {
+          /* find first non white space */
+          while(!XP_IS_SPACE(*ptr) && *ptr != ',' && *ptr != '\0')
+              ptr++;
+
+          if(*ptr == '\0')
+              break;
+
+          if(*ptr != ',')
+              *ptr = ',';
+
+          /* find next non white space */
+          ptr2 = ptr+1;
+          while(XP_IS_SPACE(*ptr2))
+              ptr2++;
+
+          if(ptr2 != ptr+1)
+              XP_STRCPY(ptr+1, ptr2);
+        }
+
+	  PUSH_STRING ("Newsgroups: ");
+	  PUSH_STRING (n2);
+	  XP_FREE (n2);
+	  PUSH_NEWLINE ();
+	}
+
+  /* #### shamelessly duplicated from above */
+  if (fields->GetFollowupTo() && *fields->GetFollowupTo())
+	{
+      /* turn whitespace into a comma list
+       */
+	  char *ptr, *ptr2;
+	  char *n2;
+	  char *convbuf;
+
+	  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetFollowupTo(), csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)
+	  	n2 = XP_StripLine (convbuf);
+	  else {
+		ptr = XP_STRDUP(fields->GetFollowupTo());
+		if (!ptr)
+		  {
+			FREEIF(buffer);
+			return 0; /* MK_OUT_OF_MEMORY */
+		  }
+  	  	n2 = XP_StripLine (ptr);
+		XP_ASSERT(n2 == ptr);	/* Otherwise, the XP_FREE below is
+								   gonna choke badly. */
+	  }
+
+      for(ptr=n2; *ptr != '\0'; ptr++)
+        {
+          /* find first non white space */
+          while(!XP_IS_SPACE(*ptr) && *ptr != ',' && *ptr != '\0')
+              ptr++;
+
+          if(*ptr == '\0')
+              break;
+
+          if(*ptr != ',')
+              *ptr = ',';
+
+          /* find next non white space */
+          ptr2 = ptr+1;
+          while(XP_IS_SPACE(*ptr2))
+              ptr2++;
+
+          if(ptr2 != ptr+1)
+              XP_STRCPY(ptr+1, ptr2);
+        }
+
+	  PUSH_STRING ("Followup-To: ");
+	  PUSH_STRING (n2);
+	  XP_FREE (n2);
+	  PUSH_NEWLINE ();
+	}
+
+  if (fields->GetTo() && *fields->GetTo())
+	{
+	  char *convbuf;
+	  PUSH_STRING ("To: ");
+	  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetTo(), csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)     /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (fields->GetTo());
+
+	  PUSH_NEWLINE ();
+	}
+  if (fields->GetCc() && *fields->GetCc())
+	{
+	  char *convbuf;
+	  PUSH_STRING ("CC: ");
+	  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetCc(), csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)   /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (fields->GetCc());
+	  PUSH_NEWLINE ();
+	}
+  if (fields->GetSubject() && *fields->GetSubject())
+	{
+	  char *convbuf;
+	  PUSH_STRING ("Subject: ");
+	  convbuf = IntlEncodeMimePartIIStr((char *)fields->GetSubject(), csid,
+										mime_headers_use_quoted_printable_p);
+	  if (convbuf)  /* MIME-PartII conversion */
+	    {
+	  	  PUSH_STRING (convbuf);
+	  	  XP_FREE(convbuf);
+	    }
+	  else
+	    PUSH_STRING (fields->GetSubject());
+	  PUSH_NEWLINE ();
+	}
+  if (fields->GetPriority() && *(fields->GetPriority()))
+	{
+	  char *priority = (char *) fields->GetPriority();
+
+	  if (!strcasestr(priority, "normal"))
+	  {
+		  PUSH_STRING ("X-Priority: ");
+		  /* Important: do not change the order of the 
+		   * following if statements
+		   */
+		  if (strcasestr (priority, "highest"))
+			  PUSH_STRING("1 (");
+		  else if (strcasestr(priority, "high"))
+			  PUSH_STRING("2 (");
+		  else if (strcasestr(priority, "lowest"))
+			  PUSH_STRING("5 (");
+		  else if (strcasestr(priority, "low"))
+			  PUSH_STRING("4 (");
+
+		  PUSH_STRING (priority);
+		  PUSH_STRING(")");
+		  PUSH_NEWLINE ();
+	  }
+	}
+  if (fields->GetReferences() && *fields->GetReferences())
+	{
+	  PUSH_STRING ("References: ");
+	  PUSH_STRING (fields->GetReferences());
+	  PUSH_NEWLINE ();
+	}
+
+  if (fields->GetOtherRandomHeaders() && *fields->GetOtherRandomHeaders())
+	{
+	  /* Assume they already have the right newlines and continuations
+		 and so on. */
+	  PUSH_STRING (fields->GetOtherRandomHeaders());
+	}
+
+  if (buffer_tail > buffer + size - 1)
+	abort ();
+
+  /* realloc it smaller... */
+  buffer = (char*)XP_REALLOC (buffer, buffer_tail - buffer + 1);
+
+  return buffer;
+}
+
+
+/* Generate headers for a form post to a mailto: URL.
+   This lets the URL specify additional headers, but is careful to
+   ignore headers which would be dangerous.  It may modify the URL
+   (because of CC) so a new URL to actually post to is returned.
+ */
+int
+MIME_GenerateMailtoFormPostHeaders (const char *old_post_url,
+									const char * /*referer*/,
+									char **new_post_url_return,
+									char **headers_return)
+{
+  char *from = 0, *to = 0, *cc = 0, *body = 0, *search = 0;
+  char *extra_headers = 0;
+  char *s;
+  XP_Bool subject_p = FALSE;
+  XP_Bool sign_p = FALSE;
+  HG29292
+  char *rest;
+  int status = 0;
+  MSG_CompositionFields *fields = NULL;
+  static const char *forbidden_headers[] = {
+	"Apparently-To",
+	"BCC",
+	"Content-Encoding",
+	CONTENT_LENGTH,
+	"Content-Transfer-Encoding",
+	"Content-Type",
+	"Date",
+	"Distribution",
+	"FCC",
+	"Followup-To",
+	"From",
+	"Lines",
+	"MIME-Version",
+	"Message-ID",
+	"Newsgroups",
+	"Organization",
+	"Reply-To",
+	"Sender",
+	X_MOZILLA_STATUS,
+	X_MOZILLA_STATUS2,
+	X_MOZILLA_NEWSHOST,
+	X_UIDL,
+	"XRef",
+	0 };
+
+  from = MIME_MakeFromField ();
+  if (!from) {
+	status = MK_OUT_OF_MEMORY;
+	goto FAIL;
+  }
+
+  to = NET_ParseURL (old_post_url, GET_PATH_PART);
+  if (!to) {
+	status = MK_OUT_OF_MEMORY;
+	goto FAIL;
+  }
+
+  if (!*to)
+	{
+	  status = MK_MIME_NO_RECIPIENTS; /* rb -1; */
+	  goto FAIL;
+	}
+
+  search = NET_ParseURL (old_post_url, GET_SEARCH_PART);
+
+  rest = search;
+  if (rest && *rest == '?')
+	{
+	  /* start past the '?' */
+	  rest++;
+	  rest = XP_STRTOK (rest, "&");
+	  while (rest && *rest)
+		{
+		  char *token = rest;
+		  char *value = 0;
+		  char *eq;
+
+		  rest = XP_STRTOK (0, "&");
+
+		  eq = XP_STRCHR (token, '=');
+		  if (eq)
+			{
+			  value = eq+1;
+			  *eq = 0;
+			}
+
+		  if (!strcasecomp (token, "subject"))
+			subject_p = TRUE;
+
+		  if (value)
+			/* Don't allow newlines or control characters in the value. */
+			for (s = value; *s; s++)
+			  if (*s < ' ' && *s != '\t')
+				*s = ' ';
+
+		  if (!strcasecomp (token, "to"))
+			{
+			  if (to && *to)
+				{
+				  StrAllocCat (to, ", ");
+				  StrAllocCat (to, value);
+				}
+			  else
+				{
+				  StrAllocCopy (to, value);
+				}
+			}
+		  else if (!strcasecomp (token, "cc"))
+			{
+			  if (cc && *cc)
+				{
+				  StrAllocCat (cc, ", ");
+				  StrAllocCat (cc, value);
+				}
+			  else
+				{
+				  StrAllocCopy (cc, value);
+				}
+			}
+		  else if (!strcasecomp (token, "body"))
+			{
+			  if (body && *body)
+				{
+				  StrAllocCat (body, "\n");
+				  StrAllocCat (body, value);
+				}
+			  else
+				{
+				  StrAllocCopy (body, value);
+				}
+			}
+		  HG28926
+		  else if (!strcasecomp (token, "sign") ||
+				   !strcasecomp (token, "signed"))
+			{
+			  sign_p = (!strcasecomp(value, "true") ||
+						!strcasecomp(value, "yes"));
+			}
+		  else
+			{
+			  const char **fh = forbidden_headers;
+			  XP_Bool ok = TRUE;
+			  while (*fh)
+				if (!strcasecomp (token, *fh++))
+				  {
+					ok = FALSE;
+					break;
+				  }
+			  if (ok)
+				{
+				  XP_Bool upper_p = FALSE;
+				  char *s;
+				  for (s = token; *s; s++)
+					{
+					  if (*s >= 'A' && *s <= 'Z')
+						upper_p = TRUE;
+					  else if (*s <= ' ' || *s >= '~' || *s == ':')
+						goto NOT_OK;  /* bad character in header! */
+					}
+				  if (!upper_p && *token >= 'a' && *token <= 'z')
+					*token -= ('a' - 'A');
+
+				  StrAllocCat (extra_headers, token);
+				  StrAllocCat (extra_headers, ": ");
+				  if (value)
+					StrAllocCat (extra_headers, value);
+				  StrAllocCat (extra_headers, CRLF);
+				NOT_OK: ;
+				}
+			}
+		}
+	}
+
+  if (!subject_p)
+	{
+	  /* If the URL didn't provide a subject, we will. */
+	  StrAllocCat (extra_headers, "Subject: Form posted from ");
+	  XP_ASSERT (XP_AppCodeName);
+	  StrAllocCat (extra_headers, XP_AppCodeName);
+	  StrAllocCat (extra_headers, CRLF);
+	}
+
+  /* Note: the `sign', and `body' parameters are currently
+	 ignored in mailto form submissions. */
+
+  *new_post_url_return = 0;
+
+  fields = MSG_CreateCompositionFields(from, 0, to, cc, 0, 0, 0, 0,
+									   FE_UsersOrganization(), 0, 0,
+									   extra_headers, 0, 0, 0
+									   HG15448);
+  if (!fields)
+  {
+	  status = MK_OUT_OF_MEMORY;
+	  goto FAIL;
+  }
+
+  fields->SetDefaultBody(body);
+
+  *headers_return = mime_generate_headers (fields, 0, MSG_DeliverNow);
+  if (*headers_return == 0)
+	{
+	  status = MK_OUT_OF_MEMORY;
+	  goto FAIL;
+	}
+
+  StrAllocCat ((*new_post_url_return), "mailto:");
+  if (to)
+	StrAllocCat ((*new_post_url_return), to);
+  if (to && cc)
+	StrAllocCat ((*new_post_url_return), ",");
+  if (cc)
+	StrAllocCat ((*new_post_url_return), cc);
+
+ FAIL:
+  FREEIF (from);
+  FREEIF (to);
+  FREEIF (cc);
+  FREEIF (body);
+  FREEIF (search);
+  FREEIF (extra_headers);
+  if (fields)
+	  MSG_DestroyCompositionFields(fields);
+
+  return status;
+}
+
+
+
+static char *
+mime_generate_attachment_headers (const char *type, const char *encoding,
+								  const char *description,
+								  const char *x_mac_type,
+								  const char *x_mac_creator,
+								  const char *real_name,
+								  const char *base_url,
+								  XP_Bool /*digest_p*/,
+								  MSG_DeliverMimeAttachment * /*ma*/,
+								  int16 mail_csid)
+{
+  char *buffer = (char *) XP_ALLOC (2048);
+  char *buffer_tail = buffer;
+  char charset[30];
+
+  if (! buffer)
+	return 0; /* MK_OUT_OF_MEMORY */
+
+  XP_ASSERT (encoding);
+  charset[0] = 0;
+
+  PUSH_STRING ("Content-Type: ");
+  PUSH_STRING (type);
+
+  if (mime_type_needs_charset (type))
+	{
+
+	  /* push 7bit encoding out based on current default codeset */
+	  INTL_CharSetIDToName (mail_csid, charset);
+
+	  /* If the characters are all 7bit, then it's better (and true) to
+		 claim the charset to be US-ASCII rather than Latin1.  Should we
+		 do this all the time, for all charsets?  I'm not sure.  But we
+		 should definitely do it for Latin1. */
+	  if (encoding &&
+		  !strcasecomp (encoding, "7bit") &&
+		  !strcasecomp (charset, "iso-8859-1"))
+		XP_STRCPY (charset, "us-ascii");
+
+	  // If csid is JIS and and type is HTML
+	  // then no charset to be specified (apply base64 instead)
+	  // in order to avoid mismatch META_TAG (bug#104255).
+	  if ((mail_csid != CS_JIS) ||
+	     (strcasecomp(type, TEXT_HTML) != 0) ||
+		 (strcasecomp(encoding, ENCODING_BASE64) != 0))
+		{
+		PUSH_STRING ("; charset=");
+		PUSH_STRING (charset);
+		}
+	}
+
+  if (x_mac_type && *x_mac_type)
+	{
+	  PUSH_STRING ("; x-mac-type=\"");
+	  PUSH_STRING (x_mac_type);
+	  PUSH_STRING ("\"");
+	}
+  if (x_mac_creator && *x_mac_creator)
+	{
+	  PUSH_STRING ("; x-mac-creator=\"");
+	  PUSH_STRING (x_mac_creator);
+	  PUSH_STRING ("\"");
+	}
+
+  int32 parmFolding = 0;
+  PREF_GetIntPref("mail.strictly_mime.parm_folding", &parmFolding);
+
+#ifdef EMIT_NAME_IN_CONTENT_TYPE
+  if (real_name && *real_name)
+	{
+	  if (parmFolding == 0 || parmFolding == 1)
+	  {
+		  PUSH_STRING (";\r\n name=\"");
+		  PUSH_STRING (real_name);
+		  PUSH_STRING ("\"");
+	  }
+	  else // if (parmFolding == 2)
+	  {
+		  char *rfc2231Parm = RFC2231ParmFolding("name", charset,
+												 INTL_GetAcceptLanguage(), real_name);
+		  if (rfc2231Parm)
+		  {
+			  PUSH_STRING(";\r\n ");
+			  PUSH_STRING(rfc2231Parm);
+			  XP_FREE(rfc2231Parm);
+		  }
+	  }
+	}
+#endif /* EMIT_NAME_IN_CONTENT_TYPE */
+
+  PUSH_NEWLINE ();
+
+  PUSH_STRING ("Content-Transfer-Encoding: ");
+  PUSH_STRING (encoding);
+  PUSH_NEWLINE ();
+
+  if (description && *description)
+	{
+	  char *s = mime_fix_header (description);
+	  if (s)
+		{
+		  PUSH_STRING ("Content-Description: ");
+		  PUSH_STRING (s);
+		  PUSH_NEWLINE ();
+		  XP_FREE(s);
+		}
+	}
+
+  if (real_name && *real_name)
+	{
+	  char *period = XP_STRRCHR(real_name, '.');
+	  int32 pref_content_disposition = 0;
+
+	  PREF_GetIntPref("mail.content_disposition_type", 
+					  &pref_content_disposition);
+
+	  PUSH_STRING ("Content-Disposition: ");
+	 
+	  if (pref_content_disposition == 1)
+		PUSH_STRING ("attachment");
+	  else if (pref_content_disposition == 2 && 
+			   (!strcasecomp(type, TEXT_PLAIN) || 
+				(period && !strcasecomp(period, ".txt"))))
+		PUSH_STRING("attachment");
+	  /* If this document is an anonymous binary file or a vcard, 
+		 then always show it as an attachment, never inline. */
+	  else if (!strcasecomp(type, APPLICATION_OCTET_STREAM) || 
+		   !strcasecomp(type, vCardMimeFormat))
+	    PUSH_STRING ("attachment");
+	  else
+		PUSH_STRING ("inline");
+
+	  if (parmFolding == 0 || parmFolding == 1)
+	  {
+		  PUSH_STRING (";\r\n filename=\"");
+		  PUSH_STRING (real_name);
+		  PUSH_STRING ("\"" CRLF);
+	  }
+	  else // if (parmFolding == 2)
+	  {
+		  char *rfc2231Parm = RFC2231ParmFolding("name", charset,
+												 INTL_GetAcceptLanguage(), real_name);
+		  if (rfc2231Parm)
+		  {
+			  PUSH_STRING(";\r\n ");
+			  PUSH_STRING(rfc2231Parm);
+			  PUSH_NEWLINE ();
+			  XP_FREE(rfc2231Parm);
+		  }
+	  }
+	}
+  else if (type &&
+	       (!strcasecomp (type, MESSAGE_RFC822) ||
+			!strcasecomp (type, MESSAGE_NEWS)))
+	{
+	  PUSH_STRING ("Content-Disposition: inline" CRLF);
+	}
+  
+#ifdef GENERATE_CONTENT_BASE
+  /* If this is an HTML document, and we know the URL it originally
+	 came from, write out a Content-Base header. */
+  if (type &&
+	  (!strcasecomp (type, TEXT_HTML) ||
+	   !strcasecomp (type, TEXT_MDL)) &&
+	  base_url && *base_url)
+	{
+	  int32 col = 0;
+	  const char *s = base_url;
+	  const char *colon = XP_STRCHR (s, ':');
+    XP_Bool useContentLocation = FALSE;   /* rhp - add this  */
+
+	  if (!colon) goto GIVE_UP_ON_CONTENT_BASE;  /* malformed URL? */
+
+	  /* Don't emit a content-base that points to (or into) a news or
+		 mail message. */
+	  if (!strncasecomp (s, "news:", 5) ||
+		  !strncasecomp (s, "snews:", 6) ||
+		  !strncasecomp (s, "IMAP:", 5) ||
+		  !strncasecomp (s, "mailbox:", 8))
+		goto GIVE_UP_ON_CONTENT_BASE;
+
+    /* rhp - Put in a pref for using Content-Location instead of Content-Base.
+             This will get tweaked to default to true in 5.0
+     */
+  	PREF_GetBoolPref("mail.use_content_location_on_send", &useContentLocation);
+    
+    if (useContentLocation)
+  	  PUSH_STRING ("Content-Location: \"");
+    else
+      PUSH_STRING ("Content-Base: \"");
+    /* rhp - Pref for Content-Location usage */
+
+/* rhp: this is to work with the Content-Location stuff */
+CONTENT_LOC_HACK:
+
+	  while (*s != 0 && *s != '#')
+		{
+		  const char *ot = buffer_tail;
+
+		  /* URLs must be wrapped at 40 characters or less. */
+		  if (col >= 38)
+			{
+			  PUSH_STRING(CRLF "\t");
+			  col = 0;
+			}
+
+		  if (*s == ' ')       PUSH_STRING("%20");
+		  else if (*s == '\t') PUSH_STRING("%09");
+		  else if (*s == '\n') PUSH_STRING("%0A");
+		  else if (*s == '\r') PUSH_STRING("%0D");
+		  else
+			{
+			  *buffer_tail++ = *s;
+			  *buffer_tail = '\0';
+			}
+		  s++;
+		  col += (buffer_tail - ot);
+		}
+	  PUSH_STRING ("\"" CRLF);
+
+    /* rhp: this is to try to get around this fun problem with Content-Location */
+    if (!useContentLocation)
+    {
+      PUSH_STRING ("Content-Location: \"");
+      s = base_url;
+      col = 0;
+      useContentLocation = TRUE;
+      goto CONTENT_LOC_HACK;
+    }
+    /* rhp: this is to try to get around this fun problem with Content-Location */
+
+	GIVE_UP_ON_CONTENT_BASE:
+	  ;
+	}
+#endif /* GENERATE_CONTENT_BASE */
+
+
+  /* realloc it smaller... */
+  buffer = (char*) XP_REALLOC (buffer, buffer_tail - buffer + 1);
+
+  return buffer;
+}
+
+
+void MSG_SendMimeDeliveryState::Fail (int failure_code, char *error_msg)
+{
+  if (m_message_delivery_done_callback)
+	{
+	  if (failure_code < 0 && !error_msg)
+		error_msg = NET_ExplainErrorDetails(failure_code, 0, 0, 0, 0);
+	  m_message_delivery_done_callback (GetContext(), m_fe_data,
+										failure_code, error_msg);
+	  FREEIF(error_msg);		/* #### Is there a memory leak here?  Shouldn't
+								   this free be outside the if? */
+	}
+  else if (m_attachments_done_callback)
+	{
+	  if (failure_code < 0 && !error_msg)
+		error_msg = NET_ExplainErrorDetails(failure_code, 0, 0, 0, 0);
+
+	  /* mime_free_message_state will take care of cleaning up the
+		 attachment files and attachment structures */
+	  m_attachments_done_callback (GetContext(),
+								   m_fe_data, failure_code,
+								   error_msg, 0);
+
+	  FREEIF(error_msg);		/* #### Is there a memory leak here?  Shouldn't
+								   this free be outside the if? */
+	}
+
+  m_message_delivery_done_callback = 0;
+  m_attachments_done_callback = 0;
+
+  Clear();
+}
+
+/* Given a string, convert it to 'qtext' (quoted text) for RFC822 header purposes. */
+static char *
+msg_make_filename_qtext(const char *srcText, XP_Bool stripCRLFs)
+{
+	/* newString can be at most twice the original string (every char quoted). */
+	char *newString = (char *) XP_ALLOC(XP_STRLEN(srcText)*2 + 1);
+	if (!newString) return NULL;
+
+	const char *s = srcText;
+	const char *end = srcText + XP_STRLEN(srcText);
+	char *d = newString;
+
+	while(*s)
+	{
+		/* 	Put backslashes in front of existing backslashes, or double quote
+			characters.
+			If stripCRLFs is true, don't write out CRs or LFs. Otherwise,
+			write out a backslash followed by the CR but not
+			linear-white-space.
+			We might already have quoted pair of "\ " or "\\t" skip it. 
+			*/
+		if (*s == '\\' || *s == '"' || 
+			(!stripCRLFs && 
+			 (*s == CR && (*(s+1) != LF || 
+						   (*(s+1) == LF && (s+2) < end && !XP_IS_SPACE(*(s+2)))))))
+			*d++ = '\\';
+
+		if (*s == CR)
+		{
+			if (stripCRLFs && *(s+1) == LF && (s+2) < end && XP_IS_SPACE(*(s+2)))
+				s += 2;			// skip CRLFLWSP
+		}
+		else
+		{
+			*d++ = *s;
+		}
+		s++;
+	}
+	*d = 0;
+
+	return newString;
+}
+
+/* Rip apart the URL and extract a reasonable value for the `real_name' slot.
+ */
+static void
+msg_pick_real_name (MSG_DeliverMimeAttachment *attachment, int16 csid)
+{
+  const char *s, *s2;
+  char *s3;
+  char *url;
+
+  if (attachment->m_real_name)
+	return;
+
+  url = attachment->m_url_string;
+
+  /* Perhaps the MIME parser knows a better name than the URL itself?
+	 This can happen when one attaches a MIME part from one message
+	 directly into another message.
+	 
+	 ### mwelch Note that this function simply duplicates and returns an existing
+	 			MIME header, so we don't need to process it. */
+  attachment->m_real_name =
+	MimeGuessURLContentName(attachment->m_mime_delivery_state->GetContext(),
+							url);
+  if (attachment->m_real_name)
+	return;
+
+  /* Otherwise, extract a name from the URL. */
+
+  s = url;
+  s2 = XP_STRCHR (s, ':');
+  if (s2) s = s2 + 1;
+  /* If we know the URL doesn't have a sensible file name in it,
+	 don't bother emitting a content-disposition. */
+  if (!strncasecomp (url, "news:", 5) ||
+	  !strncasecomp (url, "snews:", 6) ||
+	  !strncasecomp (url, "IMAP:", 5) ||
+	  !strncasecomp (url, "mailbox:", 8))
+	return;
+
+  /* Take the part of the file name after the last / or \ */
+  s2 = XP_STRRCHR (s, '/');
+  if (s2) s = s2+1;
+  s2 = XP_STRRCHR (s, '\\');
+  
+  if (csid & MULTIBYTE)
+  {
+	  // We don't want to truncate the file name in case of the double
+	  // byte file name
+	  while ( s2 != NULL && 
+			  s2 > s &&
+			  INTL_IsLeadByte(csid, *(s2-1)))
+	  {
+		  s3 = (char *) s2;
+		  *s3 = 0;
+		  s2 = XP_STRRCHR(s, '\\');
+		  *s3 = '\\';
+	  }
+  }
+	  
+  if (s2) s = s2+1;
+  /* Copy it into the attachment struct. */
+  StrAllocCopy (attachment->m_real_name, s);
+  /* Now trim off any named anchors or search data. */
+  s3 = XP_STRCHR (attachment->m_real_name, '?');
+  if (s3) *s3 = 0;
+  s3 = XP_STRCHR (attachment->m_real_name, '#');
+  if (s3) *s3 = 0;
+
+  /* Now lose the %XX  */
+  NET_UnEscape (attachment->m_real_name);
+
+  int32 parmFolding = 0;
+  PREF_GetIntPref("mail.strictly_mime.parm_folding", &parmFolding);
+
+  if (parmFolding == 0 || parmFolding == 1)
+  {
+	  /* Try to MIME-2 encode the filename... */
+	  char *mime2Name = IntlEncodeMimePartIIStr(attachment->m_real_name, csid, 
+												mime_headers_use_quoted_printable_p);
+	  if (mime2Name && (mime2Name != attachment->m_real_name))
+	  {
+		  XP_FREE(attachment->m_real_name);
+		  attachment->m_real_name = mime2Name;
+	  }
+   
+	  /* ... and then put backslashes before special characters (RFC 822 tells us
+		 to). */
+
+	  char *qtextName = NULL;
+	  
+	  qtextName = msg_make_filename_qtext(attachment->m_real_name, 
+										  (parmFolding == 0 ? TRUE : FALSE));
+		  
+	  if (qtextName)
+	  {
+		  XP_FREE(attachment->m_real_name);
+		  attachment->m_real_name = qtextName;
+	  }
+  }
+  
+  /* Now a special case for attaching uuencoded files...
+
+	 If we attach a file "foo.txt.uu", we will send it out with
+	 Content-Type: text/plain; Content-Transfer-Encoding: x-uuencode.
+	 When saving such a file, a mail reader will generally decode it first
+	 (thus removing the uuencoding.)  So, let's make life a little easier by
+	 removing the indication of uuencoding from the file name itself.  (This
+	 will presumably make the file name in the Content-Disposition header be
+	 the same as the file name in the "begin" line of the uuencoded data.)
+
+	 However, since there are mailers out there (including earlier versions of
+	 Mozilla) that will use "foo.txt.uu" as the file name, we still need to
+	 cope with that; the code which copes with that is in the MIME parser, in
+	 libmime/mimei.c.
+   */
+  if (attachment->m_already_encoded_p &&
+	  attachment->m_encoding)
+	{
+	  char *result = attachment->m_real_name;
+	  int32 L = XP_STRLEN(result);
+	  const char **exts = 0;
+
+	  /* #### hack
+		 I'd like to ask the mime.types file, "what extensions correspond
+		 to obj->encoding (which happens to be "x-uuencode") but doing that
+		 in a non-sphagetti way would require brain surgery.  So, since
+		 currently uuencode is the only content-transfer-encoding which we
+		 understand which traditionally has an extension, we just special-
+		 case it here!  
+
+		 Note that it's special-cased in a similar way in libmime/mimei.c.
+	   */
+	  if (!strcasecomp(attachment->m_encoding, ENCODING_UUENCODE) ||
+		  !strcasecomp(attachment->m_encoding, ENCODING_UUENCODE2) ||
+		  !strcasecomp(attachment->m_encoding, ENCODING_UUENCODE3) ||
+		  !strcasecomp(attachment->m_encoding, ENCODING_UUENCODE4))
+		{
+		  static const char *uue_exts[] = { "uu", "uue", 0 };
+		  exts = uue_exts;
+		}
+
+	  while (exts && *exts)
+		{
+		  const char *ext = *exts;
+		  int32 L2 = XP_STRLEN(ext);
+		  if (L > L2 + 1 &&							/* long enough */
+			  result[L - L2 - 1] == '.' &&			/* '.' in right place*/
+			  !strcasecomp(ext, result + (L - L2)))	/* ext matches */
+			{
+			  result[L - L2 - 1] = 0;		/* truncate at '.' and stop. */
+			  break;
+			}
+		  exts++;
+		}
+	}
+}
+
+
+int
+MSG_SendMimeDeliveryState::HackAttachments(
+						  const struct MSG_AttachmentData *attachments,
+						  const struct MSG_AttachedFile *preloaded_attachments)
+{
+  INTL_CharSetInfo c = LO_GetDocumentCharacterSetInfo(GetContext());
+  if (preloaded_attachments) XP_ASSERT(!attachments);
+  if (attachments) XP_ASSERT(!preloaded_attachments);
+
+  if (preloaded_attachments && preloaded_attachments[0].orig_url)
+	{
+	  /* These are attachments which have already been downloaded to tmp files.
+		 We merely need to point the internal attachment data at those tmp
+		 files.
+	   */
+	  int32 i;
+
+	  m_pre_snarfed_attachments_p = TRUE;
+
+	  m_attachment_count = 0;
+	  while (preloaded_attachments[m_attachment_count].orig_url)
+		m_attachment_count++;
+
+	  m_attachments = (MSG_DeliverMimeAttachment *)
+		new MSG_DeliverMimeAttachment[m_attachment_count];
+
+	  if (! m_attachments)
+		return MK_OUT_OF_MEMORY;
+
+	  for (i = 0; i < m_attachment_count; i++)
+		{
+		  m_attachments[i].m_mime_delivery_state = this;
+		  /* These attachments are already "snarfed". */
+		  m_attachments[i].m_done = TRUE;
+		  XP_ASSERT (preloaded_attachments[i].orig_url);
+		  StrAllocCopy (m_attachments[i].m_url_string,
+						preloaded_attachments[i].orig_url);
+		  StrAllocCopy (m_attachments[i].m_type,
+						preloaded_attachments[i].type);
+		  StrAllocCopy (m_attachments[i].m_description,
+						preloaded_attachments[i].description);
+		  StrAllocCopy (m_attachments[i].m_real_name,
+						preloaded_attachments[i].real_name);
+		  StrAllocCopy (m_attachments[i].m_x_mac_type,
+						preloaded_attachments[i].x_mac_type);
+		  StrAllocCopy (m_attachments[i].m_x_mac_creator,
+						preloaded_attachments[i].x_mac_creator);
+		  StrAllocCopy (m_attachments[i].m_encoding,
+						preloaded_attachments[i].encoding);
+		  StrAllocCopy (m_attachments[i].m_file_name,
+						preloaded_attachments[i].file_name);
+
+		  m_attachments[i].m_size = preloaded_attachments[i].size;
+		  m_attachments[i].m_unprintable_count =
+			preloaded_attachments[i].unprintable_count;
+		  m_attachments[i].m_highbit_count =
+			preloaded_attachments[i].highbit_count;
+		  m_attachments[i].m_ctl_count = preloaded_attachments[i].ctl_count;
+		  m_attachments[i].m_null_count =
+			preloaded_attachments[i].null_count;
+		  m_attachments[i].m_max_column =
+			preloaded_attachments[i].max_line_length;
+
+		  /* If the attachment has an encoding, and it's not one of
+			 the "null" encodings, then keep it. */
+		  if (m_attachments[i].m_encoding &&
+			  strcasecomp (m_attachments[i].m_encoding, ENCODING_7BIT) &&
+			  strcasecomp (m_attachments[i].m_encoding, ENCODING_8BIT) &&
+			  strcasecomp (m_attachments[i].m_encoding, ENCODING_BINARY))
+			m_attachments[i].m_already_encoded_p = TRUE;
+
+		  msg_pick_real_name(&m_attachments[i], INTL_GetCSIWinCSID(c));
+		}
+	}
+  else if (attachments && attachments[0].url)
+	{
+	  /* These are attachments which have already been downloaded to tmp files.
+		 We merely need to point the internal attachment data at those tmp
+		 files.  We will delete the tmp files as we attach them.
+	   */
+	  int32 i;
+	  int mailbox_count = 0, news_count = 0;
+
+	  m_attachment_count = 0;
+	  while (attachments[m_attachment_count].url)
+		m_attachment_count++;
+
+	  m_attachments = (MSG_DeliverMimeAttachment *)
+		new MSG_DeliverMimeAttachment[m_attachment_count];
+
+	  if (! m_attachments)
+		return MK_OUT_OF_MEMORY;
+
+	  for (i = 0; i < m_attachment_count; i++)
+		{
+		  m_attachments[i].m_mime_delivery_state = this;
+		  XP_ASSERT (attachments[i].url);
+		  StrAllocCopy (m_attachments[i].m_url_string,
+						attachments[i].url);
+		  StrAllocCopy (m_attachments[i].m_override_type,
+						attachments[i].real_type);
+		  StrAllocCopy (m_attachments[i].m_override_encoding,
+						attachments[i].real_encoding);
+		  StrAllocCopy (m_attachments[i].m_desired_type,
+						attachments[i].desired_type);
+		  StrAllocCopy (m_attachments[i].m_description,
+						attachments[i].description);
+		  StrAllocCopy (m_attachments[i].m_real_name,
+						attachments[i].real_name);
+		  StrAllocCopy (m_attachments[i].m_x_mac_type,
+						attachments[i].x_mac_type);
+		  StrAllocCopy (m_attachments[i].m_x_mac_creator,
+						attachments[i].x_mac_creator);
+		  StrAllocCopy (m_attachments[i].m_encoding, "7bit");
+		  m_attachments[i].m_url =
+			NET_CreateURLStruct (m_attachments[i].m_url_string,
+								 NET_DONT_RELOAD);
+
+		  // real name is set in the case of vcard so don't change it.
+		  // m_attachments[i].m_real_name = 0;
+
+		  /* Count up attachments which are going to come from mail folders
+			 and from NNTP servers. */
+		  if (strncasecomp(m_attachments[i].m_url_string, "mailbox:",8) ||
+			  strncasecomp(m_attachments[i].m_url_string, "IMAP:",5))
+			mailbox_count++;
+		  else if (strncasecomp(m_attachments[i].m_url_string, "news:",5) ||
+				   strncasecomp(m_attachments[i].m_url_string, "snews:",6))
+			news_count++;
+
+		  msg_pick_real_name(&m_attachments[i], INTL_GetCSIWinCSID(c));
+		}
+
+	  /* If there is more than one mailbox URL, or more than one NNTP url,
+		 do the load in serial rather than parallel, for efficiency.
+	   */
+	  if (mailbox_count > 1 || news_count > 1)
+		m_be_synchronous_p = TRUE;
+
+	  m_attachment_pending_count = m_attachment_count;
+
+	  /* Start the URL attachments loading (eventually, an exit routine will
+		 call the done_callback). */
+
+	  if (m_attachment_count == 1)
+		FE_Progress(GetContext(), XP_GetString(MK_MSG_LOAD_ATTACHMNT));
+	  else
+		FE_Progress(GetContext(), XP_GetString(MK_MSG_LOAD_ATTACHMNTS));
+
+	  for (i = 0; i < m_attachment_count; i++)
+		{
+		  /* This only returns a failure code if NET_GetURL was not called
+			 (and thus no exit routine was or will be called.) */
+		  int status = m_attachments [i].SnarfAttachment ();
+		  if (status < 0)
+			return status;
+
+		  if (m_be_synchronous_p)
+			break;
+		}
+	}
+
+  if (m_attachment_pending_count <= 0)
+	/* No attachments - finish now (this will call the done_callback). */
+	GatherMimeAttachments ();
+
+  return 0;
+}
+
+
+void
+MSG_SendMimeDeliveryState::StartMessageDelivery(
+						  MSG_Pane   *pane,
+						  void       *fe_data,
+						  MSG_CompositionFields *fields,
+						  XP_Bool digest_p,
+						  XP_Bool dont_deliver_p,
+						  MSG_Deliver_Mode mode,
+						  const char *attachment1_type,
+						  const char *attachment1_body,
+						  uint32 attachment1_body_length,
+						  const struct MSG_AttachmentData *attachments,
+						  const struct MSG_AttachedFile *preloaded_attachments,
+//#ifdef MSG_SEND_MULTIPART_RELATED
+						  MSG_SendPart *relatedPart,
+//#endif
+						  void (*message_delivery_done_callback)
+						       (MWContext *context,
+								void *fe_data,
+								int status,
+								const char *error_message))
+{
+  int failure = 0;
+  MSG_SendMimeDeliveryState	*state;
+
+  if (!attachment1_body || !*attachment1_body)
+	attachment1_type = attachment1_body = 0;
+
+  state = new MSG_SendMimeDeliveryState;
+  if (! state)
+	{
+	  failure = MK_OUT_OF_MEMORY;
+	  goto FAIL;
+	}
+
+  failure = state->Init(pane, fe_data, fields, 
+						digest_p, dont_deliver_p, mode,
+						attachment1_type, attachment1_body,
+						attachment1_body_length,
+						attachments, preloaded_attachments,
+//#ifdef MSG_SEND_MULTIPART_RELATED
+						relatedPart,
+//#endif
+						message_delivery_done_callback);
+  if (failure >= 0)
+	return;
+
+FAIL:
+  char *err_msg = NET_ExplainErrorDetails (failure);
+  message_delivery_done_callback (pane->GetContext(), fe_data, failure,
+								  err_msg);
+  if (err_msg) XP_FREE (err_msg);
+  delete state;
+}
+
+int MSG_SendMimeDeliveryState::SetMimeHeader(MSG_HEADER_SET header, const char *value)
+{
+	char	*dupHeader = NULL;
+	int		ret = MK_OUT_OF_MEMORY;
+
+	if (header & (MSG_FROM_HEADER_MASK | MSG_TO_HEADER_MASK | MSG_REPLY_TO_HEADER_MASK | MSG_CC_HEADER_MASK | MSG_BCC_HEADER_MASK))
+		dupHeader = mime_fix_addr_header(value);
+	else if (header &  (MSG_NEWSGROUPS_HEADER_MASK| MSG_FOLLOWUP_TO_HEADER_MASK))
+		dupHeader = mime_fix_news_header(value);
+	else  if (header & (MSG_FCC_HEADER_MASK | MSG_ORGANIZATION_HEADER_MASK |  MSG_SUBJECT_HEADER_MASK | MSG_REFERENCES_HEADER_MASK | MSG_X_TEMPLATE_HEADER_MASK))
+		dupHeader = mime_fix_header(value);
+	else
+		XP_ASSERT(FALSE);	// unhandled header mask
+
+	if (dupHeader)
+	{
+		ret = m_fields->SetHeader(header, dupHeader);
+		XP_FREE(dupHeader);
+	}
+	return ret;
+}
+
+
+
+int
+MSG_SendMimeDeliveryState::Init(
+						  MSG_Pane *pane,
+						  void      *fe_data,
+						  MSG_CompositionFields *fields,
+						  XP_Bool digest_p,
+						  XP_Bool dont_deliver_p,
+						  MSG_Deliver_Mode mode,
+
+						  const char *attachment1_type,
+						  const char *attachment1_body,
+						  uint32 attachment1_body_length,
+						  const struct MSG_AttachmentData *attachments,
+						  const struct MSG_AttachedFile *preloaded_attachments,
+//#ifdef MSG_SEND_MULTIPART_RELATED
+						  MSG_SendPart *relatedPart,
+//#endif
+						  void (*message_delivery_done_callback)
+						       (MWContext *context,
+								void *fe_data,
+								int status,
+								const char *error_message))
+{
+  int failure = 0;
+  m_pane = pane;
+  m_fe_data = fe_data;
+  m_message_delivery_done_callback = message_delivery_done_callback;
+
+//#ifdef MSG_SEND_MULTIPART_RELATED
+  m_related_part = relatedPart;
+  if (m_related_part)
+	  m_related_part->SetMimeDeliveryState(this);
+//#endif
+
+  XP_ASSERT (fields);
+  if (!fields) return MK_OUT_OF_MEMORY; /* rb -1; */
+
+  if (m_fields)
+  {
+	  delete m_fields;
+  }
+
+  m_fields = new MSG_CompositionFields;
+  if (!m_fields)
+	  return MK_OUT_OF_MEMORY;
+
+  m_fields->SetOwner(pane);
+
+#ifdef GENERATE_MESSAGE_ID
+  if (fields->GetMessageId())
+	{
+	  m_fields->SetMessageId(XP_STRDUP(fields->GetMessageId()));
+	  /* Don't bother checking for out of memory; if it fails, then we'll just
+		 let the server generate the message-id, and suffer with the
+		 possibility of duplicate messages.*/
+	}
+#endif /* GENERATE_MESSAGE_ID */
+
+  /* Strip whitespace from beginning and end of body. */
+  if (attachment1_body)
+	{
+	  while (attachment1_body_length > 0 &&
+			 XP_IS_SPACE (*attachment1_body))
+		{
+		  attachment1_body++;
+		  attachment1_body_length--;
+		}
+	  while (attachment1_body_length > 0 &&
+			 XP_IS_SPACE (attachment1_body [attachment1_body_length - 1]))
+		{
+		  attachment1_body_length--;
+		}
+	  if (attachment1_body_length <= 0)
+		attachment1_body = 0;
+
+	  if (attachment1_body)
+		{
+		  char *newb = (char *) XP_ALLOC (attachment1_body_length + 1);
+		  if (! newb)
+			{
+			  return MK_OUT_OF_MEMORY;
+			}
+		  XP_MEMCPY (newb, attachment1_body, attachment1_body_length);
+		  newb [attachment1_body_length] = 0;
+		  m_attachment1_body = newb;
+		  m_attachment1_body_length = attachment1_body_length;
+		}
+	}
+
+  if (!fields->GetNewspostUrl() || !*fields->GetNewspostUrl())
+	fields->SetNewspostUrl("news:");
+
+  m_fields->SetNewspostUrl(fields->GetNewspostUrl());
+  m_fields->SetDefaultBody(fields->GetDefaultBody());
+  StrAllocCopy (m_attachment1_type, attachment1_type);
+  StrAllocCopy (m_attachment1_encoding, "8bit");
+
+  /* strip whitespace from and duplicate header fields. */
+
+  SetMimeHeader(MSG_FROM_HEADER_MASK, fields->GetFrom());
+
+  SetMimeHeader(MSG_REPLY_TO_HEADER_MASK, fields->GetReplyTo());
+  SetMimeHeader(MSG_TO_HEADER_MASK, (fields->GetTo()));
+  SetMimeHeader(MSG_CC_HEADER_MASK, (fields->GetCc()));
+  SetMimeHeader(MSG_FCC_HEADER_MASK, (fields->GetFcc()));
+  SetMimeHeader(MSG_BCC_HEADER_MASK, (fields->GetBcc()));
+  SetMimeHeader(MSG_NEWSGROUPS_HEADER_MASK, (fields->GetNewsgroups()));
+  SetMimeHeader(MSG_FOLLOWUP_TO_HEADER_MASK, (fields->GetFollowupTo()));
+  SetMimeHeader(MSG_ORGANIZATION_HEADER_MASK, (fields->GetOrganization()));
+  SetMimeHeader(MSG_SUBJECT_HEADER_MASK, (fields->GetSubject()));
+  SetMimeHeader(MSG_REFERENCES_HEADER_MASK, (fields->GetReferences()));
+  SetMimeHeader(MSG_X_TEMPLATE_HEADER_MASK, (fields->GetTemplateName()));
+
+  if (fields->GetOtherRandomHeaders())
+	m_fields->SetOtherRandomHeaders(fields->GetOtherRandomHeaders());
+
+  if (fields->GetPriority())
+	m_fields->SetPriority(fields->GetPriority());
+
+  int i, j = (int) MSG_LAST_BOOL_HEADER_MASK;
+  for (i = 0; i < j; i++)
+	  m_fields->SetBoolHeader((MSG_BOOL_HEADER_SET) i, 
+							  fields->GetBoolHeader((MSG_BOOL_HEADER_SET) i));
+#if 0
+  m_fields->SetReturnReceipt(fields->GetReturnReceipt());
+  HG29822
+  m_fields->SetSigned(fields->GetSigned());
+  m_fields->SetAttachVCard(fields->GetAttachVCard());
+#endif
+  m_fields->SetForcePlainText(fields->GetForcePlainText());
+  m_fields->SetUseMultipartAlternative(fields->GetUseMultipartAlternative());
+
+  if (pane && m_fields->GetReturnReceipt())
+  {
+	  if (m_fields->GetReturnReceiptType() == 1 ||
+		  m_fields->GetReturnReceiptType() == 3)
+		  pane->SetRequestForReturnReceipt(TRUE);
+	  else
+		  pane->SetRequestForReturnReceipt(FALSE);
+  }
+
+  /* Check the fields for legitimacy, and run the callback if they're not
+	 ok.  */
+  if ( mode != MSG_SaveAsDraft && mode != MSG_SaveAsTemplate )
+	failure = mime_sanity_check_fields (m_fields->GetFrom(), m_fields->GetReplyTo(),
+										m_fields->GetTo(), m_fields->GetCc(),
+										m_fields->GetBcc(), m_fields->GetFcc(),
+										m_fields->GetNewsgroups(), m_fields->GetFollowupTo(),
+										m_fields->GetSubject(), m_fields->GetReferences(),
+										m_fields->GetOrganization(),
+										m_fields->GetOtherRandomHeaders());
+  if (failure)
+	return failure;
+
+  m_digest_p = digest_p;
+  m_dont_deliver_p = dont_deliver_p;
+  m_deliver_mode = mode;
+  // m_msg_file_name = WH_TempName (xpFileToPost, "nsmail");
+
+  failure = HackAttachments(attachments, preloaded_attachments);
+  return failure;
+}
+
+
+
+/* This is the main driving function of this module.  It generates a
+   document of type message/rfc822, which contains the stuff provided.
+   The first few arguments are the standard header fields that the
+   generated document should have.
+
+   `other_random_headers' is a string of additional headers that should
+   be inserted beyond the standard ones.  If provided, it is just tacked
+   on to the end of the header block, so it should have newlines at the
+   end of each line, shouldn't have blank lines, multi-line headers
+   should be properly continued, etc.
+
+   `digest_p' says that most of the documents we are attaching are
+   themselves messages, and so we should generate a multipart/digest
+   container instead of multipart/mixed.  (It's a minor difference.)
+
+   The full text of the first attachment is provided via `attachment1_type',
+   `attachment1_body' and `attachment1_body_length'.  These may all be 0
+   if all attachments are provided externally.
+
+   Subsequent attachments are provided as URLs to load, described in the
+   MSG_AttachmentData structures.
+
+   If `dont_deliver_p' is false, then we actually deliver the message to the
+   SMTP and/or NNTP server, and the message_delivery_done_callback will be
+   invoked with the status.
+
+   If `dont_deliver_p' is true, then we just generate the message, we don't
+   actually deliver it, and the message_delivery_done_callback will be called
+   with the name of the generated file.  The callback is responsible for both
+   freeing the file name string, and deleting the file when it is done with
+   it.  If an error occurred, then `status' will be negative and
+   `error_message' may be an error message to display.  If status is non-
+   negative, then `error_message' contains the file name (this is kind of
+   a kludge...)
+ */
+extern "C" void
+MSG_StartMessageDelivery (MSG_Pane *pane,
+						  void      *fe_data,
+						  MSG_CompositionFields *fields,
+						  XP_Bool digest_p,
+						  XP_Bool dont_deliver_p,
+						  const char *attachment1_type,
+						  const char *attachment1_body,
+						  uint32 attachment1_body_length,
+						  const struct MSG_AttachmentData *attachments,
+						  void *relatedPart,
+						  void (*message_delivery_done_callback)
+						       (MWContext *context,
+								void *fe_data,
+								int status,
+								const char *error_message))
+{
+  MSG_SendMimeDeliveryState::StartMessageDelivery(pane, fe_data, fields,
+							 digest_p, dont_deliver_p,
+						     MSG_DeliverNow, /* ####??? */
+							 attachment1_type,
+							 attachment1_body, attachment1_body_length,
+							 attachments, 0, 
+						     (MSG_SendPart *) relatedPart,
+#ifdef XP_OS2
+//DSR040297 - Casting away extern "C"
+//DSR040297 - Note: this simple little cast switches the function pointers from extern "C" 
+//to non-extern "C" pointer (aka a C++ function). Don't try to change the static method, I've
+//tried it and it only gets uglier. This (for what its worth) is at least only a few casts in
+//spots where it makes sense.
+						     (void (*) (MWContext *, void *, int, const char *))
+#endif
+						     message_delivery_done_callback);
+}
+
+
+extern "C" void
+msg_StartMessageDeliveryWithAttachments (MSG_Pane *pane,
+										 void      *fe_data,
+										 MSG_CompositionFields *fields,
+										 XP_Bool digest_p,
+										 XP_Bool dont_deliver_p,
+										 MSG_Deliver_Mode mode,
+										 const char *attachment1_type,
+										 const char *attachment1_body,
+										 uint32 attachment1_body_length,
+										 const struct MSG_AttachedFile
+										   *attachments,
+//#ifdef MSG_SEND_MULTIPART_RELATED
+										 void *relatedPart,
+//#endif
+										 
+										 void (*message_delivery_done_callback)
+										      (MWContext *context,
+											   void *fe_data,
+											   int status,
+											   const char *error_message))
+{
+  MSG_SendMimeDeliveryState::StartMessageDelivery(pane, fe_data, fields,
+							  digest_p, dont_deliver_p, mode,
+							  attachment1_type, attachment1_body,
+							  attachment1_body_length,
+							  0, attachments,
+							  (MSG_SendPart *) relatedPart,
+#ifdef XP_OS2
+//DSR040297 - see comment above about 'Casting away extern "C"'
+							  (void (*) (MWContext *, void *, int, const char *))
+#endif
+							  message_delivery_done_callback);
+}
+
+
+extern "C" int
+msg_DownloadAttachments (MSG_Pane *pane,
+						 void *fe_data,
+						 const struct MSG_AttachmentData *attachments,
+						 void (*attachments_done_callback)
+						      (MWContext *context,
+							   void *fe_data,
+							   int status, const char *error_message,
+							   struct MSG_AttachedFile *attachments))
+{
+  MSG_SendMimeDeliveryState *state = 0;
+  int failure = 0;
+
+  XP_ASSERT(attachments && attachments[0].url);
+  /* if (!attachments || !attachments[0].url)
+	{
+	  failure = -1;
+	  goto FAIL;
+	} */ /* The only possible error above is out of memory and it is handled
+			in MSG_CompositionPane::DownloadAttachments() */
+  state = new MSG_SendMimeDeliveryState;
+
+  if (! state)
+	{
+	  failure = MK_OUT_OF_MEMORY;
+	  goto FAIL;
+	}
+  state->m_pane = pane;
+  state->m_fe_data = fe_data;
+  state->m_attachments_only_p = TRUE;
+  state->m_attachments_done_callback =
+#ifdef XP_OS2
+//DSR040297 - see comment above about 'Casting away extern "C"'
+					(void(*)(MWContext*,void*,int,const char*,MSG_AttachedFile*))
+#endif
+					attachments_done_callback;
+
+  failure = state->HackAttachments(attachments, 0);
+  if (failure >= 0)
+	return 0;
+
+ FAIL:
+  XP_ASSERT (failure);
+
+  /* in this case, our NET_GetURL exit routine has already freed
+	 the state */
+  if (failure != MK_ATTACHMENT_LOAD_FAILED)
+	{
+	  char *err_msg = NET_ExplainErrorDetails (failure);
+	  attachments_done_callback (state->GetContext(), fe_data, failure,
+								 err_msg, 0);
+	  if (state) delete state;
+
+	  if (err_msg) XP_FREE (err_msg);
+#ifdef XP_MAC
+		// ### mwelch The MacFE wants this error thrown as an exception.
+		//            This is because of the way that error recovery occurs
+		//            inside the compose session object.
+		if (failure == MK_INTERRUPTED)
+			failure = userCanceledErr;
+#endif
+	}
+	return failure;
+}
+
+
+void MSG_SendMimeDeliveryState::Clear()
+{
+  if (m_fields) {
+	  delete m_fields;
+	  m_fields = NULL;
+  }
+  if (m_attachment1_type)	 	XP_FREE (m_attachment1_type);
+  if (m_attachment1_encoding)	XP_FREE (m_attachment1_encoding);
+  if (m_attachment1_body)		XP_FREE (m_attachment1_body);
+
+  if (m_attachment1_encoder_data)
+	{
+	  MimeEncoderDestroy(m_attachment1_encoder_data, TRUE);
+	  m_attachment1_encoder_data = 0;
+	}
+
+/*  if (m_headers)				XP_FREE (m_headers); */
+
+  if (m_msg_file)
+	{
+	  XP_FileClose (m_msg_file);
+	  m_msg_file = 0;
+	  XP_ASSERT (m_msg_file_name);
+	}
+
+
+  if (m_msg_file_name)
+	{
+	  XP_FileRemove (m_msg_file_name, xpFileToPost);
+	  XP_FREE (m_msg_file_name);
+	  m_msg_file_name = 0;
+	}
+
+  if (m_attachments)
+	{
+	  int i;
+	  for (i = 0; i < m_attachment_count; i++)
+		{
+		  if (m_attachments [i].m_encoder_data)
+			{
+			  MimeEncoderDestroy(m_attachments [i].m_encoder_data,
+								 TRUE);
+			  m_attachments [i].m_encoder_data = 0;
+			}
+
+		  FREEIF (m_attachments [i].m_url_string);
+		  if (m_attachments [i].m_url)
+			NET_FreeURLStruct (m_attachments [i].m_url);
+		  FREEIF (m_attachments [i].m_type);
+		  FREEIF (m_attachments [i].m_override_type);
+		  FREEIF (m_attachments [i].m_override_encoding);
+		  FREEIF (m_attachments [i].m_desired_type);
+		  FREEIF (m_attachments [i].m_description);
+		  FREEIF (m_attachments [i].m_x_mac_type);
+		  FREEIF (m_attachments [i].m_x_mac_creator);
+		  FREEIF (m_attachments [i].m_real_name);
+		  FREEIF (m_attachments [i].m_encoding);
+		  if (m_attachments [i].m_file)
+			XP_FileClose (m_attachments [i].m_file);
+		  if (m_attachments [i].m_file_name)
+			{
+			  if (!m_pre_snarfed_attachments_p)
+				XP_FileRemove (m_attachments [i].m_file_name, xpFileToPost);
+			  XP_FREE (m_attachments [i].m_file_name);
+			}
+#ifdef XP_MAC
+		  /* remove the appledoubled intermediate file after we done all.
+		   */
+		  if (m_attachments [i].m_ap_filename)
+			{
+			  XP_FileRemove (m_attachments [i].m_ap_filename, xpFileToPost);
+			  XP_FREE (m_attachments [i].m_ap_filename);
+			}
+#endif /* XP_MAC */
+		}
+	  delete[] m_attachments;
+	  m_attachment_count = m_attachment_pending_count = 0;
+	  m_attachments = 0;
+	}
+}
+
+
+void
+MSG_SendMimeDeliveryState::DeliverMessage ()
+{
+  XP_Bool mail_p = ((m_fields->GetTo() && *m_fields->GetTo()) || 
+					(m_fields->GetCc() && *m_fields->GetCc()) || 
+					(m_fields->GetBcc() && *m_fields->GetBcc()));
+  XP_Bool news_p = (m_fields->GetNewsgroups() && 
+				    *(m_fields->GetNewsgroups()) ? TRUE : FALSE);
+
+  if ( m_deliver_mode != MSG_SaveAsDraft &&
+	   m_deliver_mode != MSG_SaveAsTemplate )
+	XP_ASSERT(mail_p || news_p);
+
+#if 0
+  /* Figure out how many bytes we're actually going to be writing, total.
+   */
+  m_delivery_bytes = 0;
+  m_delivery_total_bytes = 0;
+
+  if (m_fcc && *m_fcc)
+	m_delivery_total_bytes += m_msg_size;
+
+  if (m_queue_for_later_p)
+	m_delivery_total_bytes += m_msg_size;
+  else
+	{
+	  if (mail_p)
+		m_delivery_total_bytes += m_msg_size;
+	  if (news_p)
+		m_delivery_total_bytes += m_msg_size;
+	}
+#endif /* 0 */
+
+#ifdef XP_UNIX
+  {
+	int status = msg_DeliverMessageExternally(GetContext(), m_msg_file_name);
+	if (status != 0)
+	  {
+		if (status < 0)
+		  Fail (status, 0);
+		else
+		  {
+			/* The message has now been delivered successfully. */
+			MWContext *context = GetContext();
+			if (m_message_delivery_done_callback)
+			  m_message_delivery_done_callback (context,
+												m_fe_data, 0, NULL);
+			m_message_delivery_done_callback = 0;
+
+			Clear();
+
+			/* When attaching, even though the context has
+			   active_url_count == 0, XFE_AllConnectionsComplete() **is**
+			   called.  However, when not attaching, and not delivering right
+			   away, we don't actually open any URLs, so we need to destroy
+			   the window ourself.  Ugh!!
+			 */
+			if (m_attachment_count == 0)
+			  MSG_MailCompositionAllConnectionsComplete(MSG_FindPane(context,
+																 MSG_ANYPANE));
+		  }
+		return;
+	  }
+  }
+#endif /* XP_UNIX */
+
+
+#ifdef MAIL_BEFORE_NEWS
+  if (mail_p)
+	DeliverFileAsMail ();   /* May call ...as_news() next. */
+  else if (news_p)
+	DeliverFileAsNews ();
+#else  /* !MAIL_BEFORE_NEWS */
+  if (news_p)
+	DeliverFileAsNews ();   /* May call ...as_mail() next. */
+  else if (mail_p)
+	DeliverFileAsMail ();
+#endif /* !MAIL_BEFORE_NEWS */
+  else
+	abort ();
+}
+
+
+#if 0
+void
+MSG_SendMimeDeliveryState::DeliveryThermo (int32 increment)
+{
+  int32 percent;
+  m_delivery_bytes += increment;
+  XP_ASSERT(m_delivery_total_bytes > 0);
+  if (m_delivery_total_bytes <= 0) return;
+  percent = 100 * (((double) m_delivery_bytes) /
+				   ((double) m_delivery_total_bytes));
+  FE_SetProgressBarPercent (GetContext(), percent);
+#if 0
+  FE_GraphProgress (GetContext(), 0,
+					m_delivery_bytes, 0,
+					m_delivery_total_bytes);
+#endif /* 0 */
+}
+#endif /* 0 */
+
+
+static void mime_deliver_as_mail_exit (URL_Struct *, int status, MWContext *);
+static void mime_deliver_as_news_exit (URL_Struct *url, int status,
+									   MWContext *);
+
+void
+MSG_SendMimeDeliveryState::DeliverFileAsMail ()
+{
+  char *buf, *buf2;
+  URL_Struct *url;
+
+  FE_Progress (GetContext(), XP_GetString(MK_MSG_DELIV_MAIL));
+
+  buf = (char *) XP_ALLOC ((m_fields->GetTo() ? XP_STRLEN (m_fields->GetTo())  + 10 : 0) +
+						   (m_fields->GetCc() ? XP_STRLEN (m_fields->GetCc())  + 10 : 0) +
+						   (m_fields->GetBcc() ? XP_STRLEN (m_fields->GetBcc()) + 10 : 0) +
+						   10);
+  if (! buf)
+	{
+	  Fail (MK_OUT_OF_MEMORY, 0);
+	  return;
+	}
+  XP_STRCPY (buf, "mailto:");
+  buf2 = buf + XP_STRLEN (buf);
+  if (m_fields->GetTo())
+	{
+	  XP_STRCAT (buf2, m_fields->GetTo());
+	}
+  if (m_fields->GetCc())
+	{
+	  if (*buf2) XP_STRCAT (buf2, ",");
+	  XP_STRCAT (buf2, m_fields->GetCc());
+	}
+  if (m_fields->GetBcc())
+	{
+	  if (*buf2) XP_STRCAT (buf2, ",");
+	  XP_STRCAT (buf2, m_fields->GetBcc());
+	}
+
+  url = NET_CreateURLStruct (buf, NET_DONT_RELOAD);
+  XP_FREE (buf);
+  if (! url)
+	{
+	  Fail (MK_OUT_OF_MEMORY, 0);
+	  return;
+	}
+
+  /* put the filename of the message into the post data field and set a flag
+	 in the URL struct to specify that it is a file
+   */
+  url->post_data = XP_STRDUP(m_msg_file_name);
+  url->post_data_size = XP_STRLEN(url->post_data);
+  url->post_data_is_file = TRUE;
+  url->method = URL_POST_METHOD;
+  url->fe_data = this;
+  url->internal_url = TRUE;
+
+  url->msg_pane = m_pane;
+
+  /* We can ignore the return value of NET_GetURL() because we have
+	 handled the error in mime_deliver_as_mail_exit(). */
+  
+  MSG_UrlQueue::AddUrlToPane(url, mime_deliver_as_mail_exit, m_pane, TRUE);
+}
+
+
+void
+MSG_SendMimeDeliveryState::DeliverFileAsNews ()
+{
+  URL_Struct *url = NET_CreateURLStruct (m_fields->GetNewspostUrl(), NET_DONT_RELOAD);
+  if (! url)
+	{
+	  Fail (MK_OUT_OF_MEMORY, 0);
+	  return;
+	}
+
+  FE_Progress (GetContext(), XP_GetString(MK_MSG_DELIV_NEWS));
+
+  /*  put the filename of the message into the post data field and set a flag
+	  in the URL struct to specify that it is a file.
+   */
+ 
+  url->post_data = XP_STRDUP(m_msg_file_name);
+  url->post_data_size = XP_STRLEN(url->post_data);
+  url->post_data_is_file = TRUE;
+  url->method = URL_POST_METHOD;
+
+  url->fe_data = this;
+  url->internal_url = TRUE;
+
+  url->msg_pane = m_pane;
+
+  /* We can ignore the return value of NET_GetURL() because we have
+	 handled the error in mime_deliver_as_news_exit(). */
+
+  MSG_UrlQueue::AddUrlToPane (url, mime_deliver_as_news_exit, m_pane, TRUE);
+}
+
+static void
+mime_deliver_as_mail_exit (URL_Struct *url, int status,
+						   MWContext * /*context*/)
+{
+  MSG_SendMimeDeliveryState *state =
+	(MSG_SendMimeDeliveryState *) url->fe_data;
+
+  state->DeliverAsMailExit(url, status);
+}
+
+void
+MSG_SendMimeDeliveryState::DeliverAsMailExit(URL_Struct *url, int status)
+{
+  char *error_msg = 0;
+
+  url->fe_data = 0;
+  if (status < 0 && url->error_msg)
+    {
+	  error_msg = url->error_msg;
+	  url->error_msg = 0;
+    }
+//  NET_FreeURLStruct (url);
+
+  if (status < 0)
+	{
+	  Fail (status, error_msg);
+	}
+#ifdef MAIL_BEFORE_NEWS
+  else if (m_newsgroups)
+	{
+	  /* If we're sending this mail message to news as well, start it now.
+		 Completion and further errors will be handled there.
+	   */
+	  DeliverFileAsNews ();
+	}
+#endif /* MAIL_BEFORE_NEWS */
+  else
+	{
+	  /* The message has now been sent successfully! */
+
+	  FE_Progress (GetContext(), XP_GetString(MK_MSG_DELIV_MAIL_DONE));
+	  if (m_message_delivery_done_callback)
+		m_message_delivery_done_callback (GetContext(),
+										  m_fe_data, 0, NULL);
+	  m_message_delivery_done_callback = 0;
+	  Clear();
+	  delete this;
+	}
+}
+
+static void
+mime_deliver_as_news_exit (URL_Struct *url, int status,
+						   MWContext * /*context*/)
+{
+  MSG_SendMimeDeliveryState *state =
+	(MSG_SendMimeDeliveryState *) url->fe_data;
+  state->DeliverAsNewsExit(url, status);
+}
+
+void
+MSG_SendMimeDeliveryState::DeliverAsNewsExit(URL_Struct *url, int status)
+{
+  char *error_msg = 0;
+
+  url->fe_data = 0;
+  if (status < 0 && url->error_msg)
+    {
+	  error_msg = url->error_msg;
+	  url->error_msg = 0;
+    }
+//  NET_FreeURLStruct (url);
+
+  if (status < 0)
+	{
+	  Fail (status, error_msg);
+	}
+#ifndef MAIL_BEFORE_NEWS
+  else if ((m_fields->GetTo() && *m_fields->GetTo()) || 
+		   (m_fields->GetCc() && *m_fields->GetCc()) || 
+		   (m_fields->GetBcc() && *m_fields->GetBcc()))
+	{
+	  /* If we're sending this news message to mail as well, start it now.
+		 Completion and further errors will be handled there.
+	   */
+	  DeliverFileAsMail ();
+	}
+#endif /* !MAIL_BEFORE_NEWS */
+  else
+	{
+	  /* The message has now been sent successfully! */
+
+	  FE_Progress (GetContext(), XP_GetString(MK_MSG_DELIV_NEWS_DONE));
+	  if (m_message_delivery_done_callback)
+		m_message_delivery_done_callback (GetContext(),
+										  m_fe_data, 0, NULL);
+	  m_message_delivery_done_callback = 0;
+	  Clear();
+	  delete this;
+	}
+}
+
+#ifdef _USRDLL
+
+PUBLIC void
+NET_RegisterDLLContentConverters()
+{
+
+  NET_RegisterContentTypeConverter ("*", FO_MAIL_TO,
+										NULL, mime_make_attachment_stream);
+  NET_RegisterContentTypeConverter ("*", FO_CACHE_AND_MAIL_TO,
+										NULL, mime_make_attachment_stream);
+
+  /* #### What is this function for?
+	 Is this right?  I've cloned this stuff from MSG_RegisterConverters()
+	 above.  --jwz */
+
+  NET_RegisterContentTypeConverter ("*", FO_MAIL_MESSAGE_TO,
+									NULL, mime_make_attachment_stream);
+  NET_RegisterContentTypeConverter ("*", FO_CACHE_AND_MAIL_MESSAGE_TO,
+									NULL, mime_make_attachment_stream);
+
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_MAIL_MESSAGE_TO,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS, FO_MAIL_MESSAGE_TO,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_RFC822,
+									FO_CACHE_AND_MAIL_MESSAGE_TO,
+									NULL, MIME_MessageConverter);
+  NET_RegisterContentTypeConverter (MESSAGE_NEWS,
+									FO_CACHE_AND_MAIL_MESSAGE_TO,
+									NULL, MIME_MessageConverter);
+}
+
+#endif
diff --git a/mozilla/lib/mailto/msgsend.h b/mozilla/lib/mailto/msgsend.h
new file mode 100644
index 00000000000..13728024b78
--- /dev/null
+++ b/mozilla/lib/mailto/msgsend.h
@@ -0,0 +1,252 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef __MSGSEND_H__
+#define __MSGSEND_H__
+
+#include "msgpane.h"
+#include "mimeenc.h"	/* For base64/QP encoder */
+#include "mhtmlstm.h"
+#include "rosetta.h"
+
+class MSG_DeliverMimeAttachment;
+class ParseOutgoingMessage;
+class MailDB;
+
+#define MIME_BUFFER_SIZE 4096
+
+class MSG_SendMimeDeliveryState
+{
+public:
+  MSG_SendMimeDeliveryState();
+  ~MSG_SendMimeDeliveryState();
+
+  static void	StartMessageDelivery(MSG_Pane *pane,
+									 void      *fe_data,
+									 MSG_CompositionFields *fields,
+									 XP_Bool digest_p,
+									 XP_Bool dont_deliver_p,
+									 MSG_Deliver_Mode mode,
+									 const char *attachment1_type,
+									 const char *attachment1_body,
+									 uint32 attachment1_body_length,
+									 const struct MSG_AttachmentData
+									   *attachments,
+									 const struct MSG_AttachedFile
+									   *preloaded_attachments,
+//#ifdef MSG_SEND_MULTIPART_RELATED
+									 MSG_SendPart *relatedPart,
+//#endif
+									 void (*message_delivery_done_callback)
+									      (MWContext *context,
+										   void *fe_data,
+										   int status,
+										   const char *error_message));
+
+  int	Init(MSG_Pane *pane,
+			 void      *fe_data,
+			 MSG_CompositionFields *fields,
+			 XP_Bool digest_p,
+			 XP_Bool dont_deliver_p,
+			 MSG_Deliver_Mode mode,
+			 const char *attachment1_type,
+			 const char *attachment1_body,
+			 uint32 attachment1_body_length,
+			 const struct MSG_AttachmentData *attachments,
+			 const struct MSG_AttachedFile *preloaded_attachments,
+//#ifdef MSG_SEND_MULTIPART_RELATED
+			 MSG_SendPart *relatedPart,
+//#endif
+			 void (*message_delivery_done_callback)
+			 (MWContext *context,
+			  void *fe_data,
+			  int status,
+			  const char *error_message));
+
+  void	StartMessageDelivery();
+  int	GatherMimeAttachments();
+  void	DeliverMessage();
+
+  int HackAttachments(const struct MSG_AttachmentData *attachments,
+					  const struct MSG_AttachedFile *preloaded_attachments);
+
+  void	DeliverFileAsMail();
+  void	DeliverFileAsNews();
+  void	DeliverAsMailExit(URL_Struct *url, int status);
+  void	DeliverAsNewsExit(URL_Struct *url, int status);
+  void	Fail(int failure_code, char *error_msg);
+  void	Clear();
+
+  // Callback from msgsendp.cpp into msgsend.cpp.
+  HG89377
+  MWContext *GetContext() { return m_pane->GetContext(); }
+
+  int SetMimeHeader(MSG_HEADER_SET header, const char *value);
+
+  MSG_Pane *m_pane;			/* Pane to use when loading the URLs */
+  void *m_fe_data;			/* passed in and passed to callback */
+  MSG_CompositionFields *m_fields;
+
+  XP_Bool m_dont_deliver_p;	/* If set, we just return the name of the file
+							   we created, instead of actually delivering
+							   this message. */
+
+  MSG_Deliver_Mode m_deliver_mode; /* MSG_DeliverNow, MSG_QueueForLater,
+									  MSG_SaveAsDraft, MSG_SaveAsTemplate
+									*/
+
+  XP_Bool m_attachments_only_p;	/* If set, then we don't construct a complete
+								   MIME message; instead, we just retrieve the
+								   attachments from the network, store them in
+								   tmp files, and return a list of
+								   MSG_AttachedFile structs which describe
+								   them. */
+
+  XP_Bool m_pre_snarfed_attachments_p;	/* If true, then the attachments were
+										   loaded by msg_DownloadAttachments()
+										   and therefore we shouldn't delete
+										   the tmp files (but should leave
+										   that to the caller.) */
+
+  XP_Bool m_digest_p;			/* Whether to be multipart/digest instead of
+								   multipart/mixed. */
+
+  XP_Bool m_be_synchronous_p;	/* If true, we will load one URL after another,
+								   rather than starting all URLs going at once
+								   and letting them load in parallel.  This is
+								   more efficient if (for example) all URLs are
+								   known to be coming from the same news server
+								   or mailbox: loading them in parallel would
+								   cause multiple connections to the news
+								   server to be opened, or would cause much
+								   seek()ing.
+								 */
+
+  HG83623
+
+  /* The first attachment, if any (typed in by the user.)
+   */
+  char *m_attachment1_type;
+  char *m_attachment1_encoding;
+  MimeEncoderData *m_attachment1_encoder_data;
+  char *m_attachment1_body;
+  uint32 m_attachment1_body_length;
+
+  // The plaintext form of the first attachment, if needed.
+  MSG_DeliverMimeAttachment* m_plaintext;
+
+//#ifdef MSG_SEND_MULTIPART_RELATED
+	// The multipart/related save object for HTML text.
+  MSG_SendPart *m_related_part;
+//#endif
+
+  // File where we stored our HTML so that we could make the plaintext form.
+  char* m_html_filename;
+
+  /* Subsequent attachments, if any.
+   */
+  int32 m_attachment_count;
+  int32 m_attachment_pending_count;
+  MSG_DeliverMimeAttachment *m_attachments;
+  int32 m_status; /* in case some attachments fail but not all */
+
+  /* The caller's `exit' method. */
+  void (*m_message_delivery_done_callback) (MWContext *context,
+											void * fe_data, int status,
+											const char * error_msg);
+
+  /* The exit method used when downloading attachments only. */
+  void (*m_attachments_done_callback) (MWContext *context,
+									   void * fe_data, int status,
+									   const char * error_msg,
+									   struct MSG_AttachedFile *attachments);
+
+  char *m_msg_file_name;				/* Our temporary file */
+  XP_File m_msg_file;
+};
+
+class MSG_DeliverMimeAttachment
+{
+public:
+
+  MSG_DeliverMimeAttachment();
+  ~MSG_DeliverMimeAttachment();
+
+  void	UrlExit(URL_Struct *url, int status, MWContext *context);
+  int32	SnarfAttachment ();
+  void  AnalyzeDataChunk (const char *chunk, int32 chunkSize);
+  void  AnalyzeSnarfedFile ();      /* Analyze a previously-snarfed file.
+  									   (Currently only used for plaintext
+  									   converted from HTML.) */
+  int	PickEncoding (int16 mail_csid);
+  
+  XP_Bool UseUUEncode_p(void);
+
+  char *m_url_string;
+  URL_Struct *m_url;
+  XP_Bool m_done;
+
+  MSG_SendMimeDeliveryState		*m_mime_delivery_state;
+
+  char *m_type;						/* The real type, once we know it. */
+  char *m_override_type;			/* The type we should assume it to be
+									   or 0, if we should get it from the
+									   URL_Struct (from the server) */
+  char *m_override_encoding;		/* Goes along with override_type */
+
+  char *m_desired_type;				/* The type it should be converted to. */
+  char *m_description;				/* For Content-Description header */
+  char *m_x_mac_type, *m_x_mac_creator; /* Mac file type/creator. */
+  char *m_real_name;				/* The name for the headers, if different
+									   from the URL. */
+  char *m_encoding;					/* The encoding, once we've decided. */
+  XP_Bool m_already_encoded_p;		/* If we attach a document that is already
+									   encoded, we just pass it through. */
+
+  char *m_file_name;					/* The temp file to which we save it */
+  XP_File m_file;
+
+#ifdef XP_MAC
+  char *m_ap_filename;				/* The temp file holds the appledouble
+									   encoding of the file we want to post. */
+#endif
+
+  HG93873
+  uint32 m_size;					/* Some state used while filtering it */
+  uint32 m_unprintable_count;
+  uint32 m_highbit_count;
+  uint32 m_ctl_count;
+  uint32 m_null_count;
+  uint32 m_current_column;
+  uint32 m_max_column;
+  uint32 m_lines;
+
+  MimeEncoderData *m_encoder_data;  /* Opaque state for base64/qp encoder. */
+
+  XP_Bool m_graph_progress_started;
+
+  PrintSetup m_print_setup;			/* Used by HTML->Text and HTML->PS */
+};
+// These routines should only be used by the MSG_SendPart class.
+
+extern XP_Bool mime_type_needs_charset (const char *type);
+extern int mime_write_message_body(MSG_SendMimeDeliveryState *state,
+								   char *buf, int32 size);
+extern char* mime_get_stream_write_buffer(void);
+
+#endif /*  __MSGSEND_H__ */
diff --git a/mozilla/lib/mailto/msgsendp.cpp b/mozilla/lib/mailto/msgsendp.cpp
new file mode 100644
index 00000000000..b98038890bc
--- /dev/null
+++ b/mozilla/lib/mailto/msgsendp.cpp
@@ -0,0 +1,768 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "msg.h"
+#include "ntypes.h"
+#include "xlate.h"				// Needed to compile msgsend.h
+#include "msgsend.h"
+#include "msgsendp.h"
+#include "libi18n.h"
+
+extern "C"
+{
+	extern int MK_OUT_OF_MEMORY;
+}
+
+static char *mime_mailto_stream_read_buffer = 0;
+
+int32 MSG_SendPart::M_counter = 0;
+
+MSG_SendPart::MSG_SendPart(MSG_SendMimeDeliveryState* state, int16 part_csid)
+{
+	m_csid = part_csid;
+	SetMimeDeliveryState(state);
+}
+
+
+MSG_SendPart::~MSG_SendPart()
+{
+	if (m_encoder_data) {
+		MimeEncoderDestroy(m_encoder_data, FALSE);
+		m_encoder_data = NULL;
+	}
+	for (int i=0 ; i<m_numchildren ; i++) {
+		delete m_children[i];
+	}
+	delete [] m_children;
+    delete [] m_buffer;
+    delete [] m_other;
+	if (m_filename) delete [] m_filename;
+	FREEIF(m_type);
+}
+
+int MSG_SendPart::CopyString(char** dest, const char* src)
+{
+    XP_ASSERT(src);
+    if (!src) src = "";
+    delete [] *dest;
+    *dest = new char [XP_STRLEN(src) + 1];
+    if (!*dest) return MK_OUT_OF_MEMORY;
+    XP_STRCPY(*dest, src);
+    return 0;
+}
+
+
+int MSG_SendPart::SetFile(const char* filename, XP_FileType type)
+{
+    XP_ASSERT(m_buffer == NULL);
+    int status = CopyString(&m_filename, filename);
+    if (status < 0) return status;
+    m_filetype = type;
+    return status;
+}
+
+
+int MSG_SendPart::SetBuffer(const char* buffer)
+{
+    XP_ASSERT(m_filename == NULL);
+    return CopyString(&m_buffer, buffer);
+}
+
+
+int MSG_SendPart::SetType(const char* type)
+{
+	FREEIF(m_type);
+    m_type = XP_STRDUP(type);
+	return m_type ? 0 : MK_OUT_OF_MEMORY;
+}
+
+
+int MSG_SendPart::SetOtherHeaders(const char* other)
+{
+    return CopyString(&m_other, other);
+}
+
+int MSG_SendPart::SetMimeDeliveryState(MSG_SendMimeDeliveryState *state)
+{
+	m_state = state;
+	if (GetNumChildren() > 0)
+	{
+		for(int i = 0; i < GetNumChildren(); i++)
+		{
+			MSG_SendPart *part = GetChild(i);
+			if (part) 
+				part->SetMimeDeliveryState(state);
+		}
+	}
+	return 0;
+}
+
+int MSG_SendPart::AppendOtherHeaders(const char* more)
+{
+	if (!m_other) return SetOtherHeaders(more);
+	if (!more || !*more) return 0;
+	char* tmp = new char[XP_STRLEN(m_other) + XP_STRLEN(more) + 2];
+	if (!tmp) return MK_OUT_OF_MEMORY;
+	XP_STRCPY(tmp, m_other);
+	XP_STRCAT(tmp, more);
+	delete [] m_other;
+	m_other = tmp;
+	return 0;
+}
+
+
+int MSG_SendPart::SetEncoderData(MimeEncoderData* data)
+{
+	m_encoder_data = data;
+	return 0;
+}
+
+int MSG_SendPart::SetMainPart(XP_Bool value)
+{
+	m_mainpart = value;
+	return 0;
+}
+
+int MSG_SendPart::AddChild(MSG_SendPart* child)
+{
+    m_numchildren++;
+    MSG_SendPart** tmp = new MSG_SendPart* [m_numchildren];
+    if (tmp == NULL) return MK_OUT_OF_MEMORY;
+    for (int i=0 ; i<m_numchildren-1 ; i++) {
+		tmp[i] = m_children[i];
+    }
+    delete [] m_children;
+    m_children = tmp;
+	m_children[m_numchildren - 1] = child;
+	child->m_parent = this;
+    return 0;
+}
+
+MSG_SendPart *
+MSG_SendPart::DetachChild(int32 whichOne)
+{
+	MSG_SendPart *returnValue = NULL;
+
+    XP_ASSERT(whichOne >= 0 && whichOne < m_numchildren);
+    if (whichOne >= 0 && whichOne < m_numchildren) 
+	{
+		returnValue = m_children[whichOne];
+
+		if (m_numchildren > 1)
+		{
+			MSG_SendPart** tmp = new MSG_SendPart* [m_numchildren-1];
+			if (tmp != NULL) 
+			{
+				// move all the other kids over
+				for (int i=0 ; i<m_numchildren-1 ; i++) 
+				{
+					if (i >= whichOne)
+						tmp[i] = m_children[i+1];
+					else
+						tmp[i] = m_children[i];
+				}
+				delete [] m_children;
+				m_children = tmp;
+				m_numchildren--;
+			}
+		}
+		else 
+		{
+			delete [] m_children;
+			m_children = NULL;
+			m_numchildren = 0;
+		}
+    }
+
+	if (returnValue)
+		returnValue->m_parent = NULL;
+
+    return returnValue;
+}
+
+MSG_SendPart* MSG_SendPart::GetChild(int32 which)
+{
+    XP_ASSERT(which >= 0 && which < m_numchildren);
+    if (which >= 0 && which < m_numchildren) {
+	return m_children[which];
+    }
+    return NULL;
+}
+
+
+
+int MSG_SendPart::PushBody(char* buffer, int32 length)
+{
+	int status = 0;
+	char* encoded_data = buffer;
+
+	/* if this is the first block, create the conversion object
+	 */
+	if (m_firstBlock) {
+		if (m_needIntlConversion) {
+			m_intlDocToMailConverter =
+				INTL_CreateDocToMailConverter(m_state->GetContext(),
+											  (!strcasecomp(m_type,
+															TEXT_HTML)),
+											  (unsigned char*) buffer,
+											  length);
+
+			// No conversion is done when mail_csid (ToCSID for the converter) is JIS 
+			// and type is HTML (usually csid is SJIS or EUC for Japanese HTML)
+			// in order to avoid mismatch META_TAG (bug#104255).
+			if (m_intlDocToMailConverter != NULL) {
+				XP_Bool Base64HtmlNoChconv = ((INTL_GetCCCToCSID(m_intlDocToMailConverter) == CS_JIS) &&
+							!strcasecomp(m_type, TEXT_HTML) &&
+							(m_encoder_data != NULL));
+				if (Base64HtmlNoChconv) {
+					INTL_DestroyCharCodeConverter(m_intlDocToMailConverter);
+					m_intlDocToMailConverter = NULL;
+				}
+			}
+		}
+		m_firstBlock = FALSE;		/* No longer the first block */
+	}
+
+	if (m_intlDocToMailConverter) {
+		encoded_data =
+			(char*)INTL_CallCharCodeConverter(m_intlDocToMailConverter,
+											  (unsigned char*)buffer,
+											  length);
+		/* the return buffer is different from the */
+		/* origional one.  The size needs to be change */
+		if(encoded_data && encoded_data != buffer) {
+			length = XP_STRLEN(encoded_data);
+		}
+	}
+
+	if (m_encoder_data) {
+		status = MimeEncoderWrite(m_encoder_data, encoded_data, length);
+	} else {
+		// Merely translate all linebreaks to CRLF.
+		int status = 0;
+		const char *in = encoded_data;
+		const char *end = in + length;
+		char *buffer, *out;
+		
+
+		buffer = mime_get_stream_write_buffer();
+		if (!buffer) return MK_OUT_OF_MEMORY;
+
+		XP_ASSERT(encoded_data != buffer);
+		out = buffer;
+
+		for (; in < end; in++) {
+			if (m_just_hit_CR) {
+				m_just_hit_CR = FALSE;
+				if (*in == LF) {
+					// The last thing we wrote was a CRLF from hitting a CR.
+					// So, we don't want to do anything from a following LF;
+					// we want to ignore it.
+					continue;
+				}
+			}
+			if (*in == CR || *in == LF) {
+				/* Write out the newline. */
+				*out++ = CR;
+				*out++ = LF;
+
+				status = mime_write_message_body(m_state, buffer,
+												 out - buffer);
+				if (status < 0) return status;
+				out = buffer;
+
+				if (*in == CR) {
+					m_just_hit_CR = TRUE;
+				}
+
+				out = buffer;
+			} else {
+				
+				/* 	Fix for bug #95985. We can't assume that all lines are shorter
+					than 4096 chars (MIME_BUFFER_SIZE), so we need to test
+					for this here. sfraser.
+				*/
+				if (out - buffer >= MIME_BUFFER_SIZE)
+				{
+					status = mime_write_message_body(m_state, buffer, out - buffer);
+					if (status < 0) return status;
+					
+					out = buffer;
+				}
+				
+				*out++ = *in;
+			}
+		}
+
+		/* Flush the last line. */
+		if (out > buffer) {
+			status = mime_write_message_body(m_state, buffer, out - buffer);
+			if (status < 0) return status;
+			out = buffer;
+		}
+	}
+
+	if (encoded_data && encoded_data != buffer) {
+		XP_FREE(encoded_data);
+	}
+
+	return status;
+}
+
+
+/* Partition the headers into those which apply to the message as a whole;
+   those which apply to the message's contents; and the Content-Type header
+   itself.  (This relies on the fact that all body-related headers begin with
+   "Content-".)
+
+   (How many header parsers are in this program now?)
+ */
+static int divide_content_headers(const char *headers,
+								  char **message_headers,
+								  char **content_headers,
+								  char **content_type_header)
+{
+  const char *tail;
+  char *message_tail, *content_tail, *type_tail;
+  int L = 0;
+  if (headers)
+	  L = XP_STRLEN(headers);
+
+  if (L == 0)
+	return 0;
+
+  *message_headers = (char *)XP_ALLOC(L+1);
+  if (!*message_headers)
+	return MK_OUT_OF_MEMORY;
+
+  *content_headers = (char *)XP_ALLOC(L+1);
+  if (!*content_headers)
+	{
+	  XP_FREE(*message_headers);
+	  return MK_OUT_OF_MEMORY;
+	}
+
+  *content_type_header = (char *)XP_ALLOC(L+1);
+  if (!*content_type_header)
+	{
+	  XP_FREE(*message_headers);
+	  XP_FREE(*content_headers);
+	  return MK_OUT_OF_MEMORY;
+	}
+
+  message_tail = *message_headers;
+  content_tail = *content_headers;
+  type_tail    = *content_type_header;
+  tail = headers;
+
+  while (*tail)
+	{
+	  const char *head = tail;
+	  char **out;
+	  while(1)
+		{
+		  /* Loop until we reach a newline that is not followed by whitespace.
+		   */
+		  if (tail[0] == 0 ||
+			  ((tail[0] == CR || tail[0] == LF) &&
+			   !(tail[1] == ' ' || tail[1] == '\t' || tail[1] == LF)))
+			{
+			  /* Swallow the whole newline. */
+			  if (tail[0] == CR && tail[1] == LF)
+				tail++;
+			  if (*tail)
+				tail++;
+			  break;
+			}
+		  tail++;
+		}
+
+	  /* Decide which block this header goes into.
+	   */
+	  if (!strncasecomp(head, "Content-Type:", 13))
+		out = &type_tail;
+	  else if (!strncasecomp(head, "Content-", 8))
+		out = &content_tail;
+	  else
+		out = &message_tail;
+
+	  XP_MEMCPY(*out, head, (tail-head));
+	  *out += (tail-head);
+	}
+
+  *message_tail = 0;
+  *content_tail = 0;
+  *type_tail = 0;
+
+  if (!**message_headers)
+	{
+	  XP_FREE(*message_headers);
+	  *message_headers = 0;
+	}
+
+  if (!**content_headers)
+	{
+	  XP_FREE(*content_headers);
+	  *content_headers = 0;
+	}
+
+  if (!**content_type_header)
+	{
+	  XP_FREE(*content_type_header);
+	  *content_type_header = 0;
+	}
+
+#ifdef DEBUG
+  // ### mwelch	Because of the extreme difficulty we've had with
+  //			duplicate part headers, I'm going to put in an
+  //			ASSERT here which makes sure that no duplicate
+  //			Content-Type or Content-Transfer-Encoding headers
+  //			leave here undetected.
+  const char* tmp;
+  if (*content_type_header)
+  {
+		tmp = XP_STRSTR(*content_type_header, "Content-Type");
+		if (tmp)
+		{
+			tmp++; // get past the first occurrence
+	  		XP_ASSERT(!XP_STRSTR(tmp, "Content-Type"));
+		}
+  }
+
+  if (*content_headers)
+  {
+		tmp = XP_STRSTR(*content_headers, "Content-Transfer-Encoding");
+		if (tmp)
+	 	{
+	  		tmp++; // get past the first occurrence
+	  		XP_ASSERT(!XP_STRSTR(tmp, "Content-Transfer-Encoding"));
+		}
+  }
+#endif // DEBUG
+  
+  return 0;
+}
+
+extern "C" {
+extern char *mime_make_separator(const char *prefix);
+}
+
+int MSG_SendPart::Write()
+{
+    int status = 0;
+    char *separator = 0;
+    XP_File file = NULL;
+
+#define PUSHLEN(str, length)									\
+    do {														\
+		status = mime_write_message_body(m_state, str, length);	\
+		if (status < 0) goto FAIL;								\
+    } while (0)													\
+
+#define PUSH(str) PUSHLEN(str, XP_STRLEN(str))
+
+    if (m_mainpart && m_type && XP_STRCMP(m_type, TEXT_HTML) == 0) {		  
+		if (m_filename) {
+			// The "insert HTML links" code requires a memory buffer,
+			// so read the file into memory.
+			XP_ASSERT(m_buffer == NULL);
+			XP_StatStruct st;
+			st.st_size = 0;
+			XP_Stat (m_filename, &st, m_filetype);
+			int32 length = st.st_size;
+			m_buffer = new char[length + 1];
+			if (m_buffer) {
+				file = XP_FileOpen(m_filename, m_filetype, XP_FILE_READ_BIN);
+				if (file) {
+					XP_FileRead(m_buffer, length, file);
+					XP_FileClose(file);
+					m_buffer[length] = '\0';
+					file = NULL;
+					if (m_filename) delete [] m_filename;
+					m_filename = NULL;
+				} else {
+					delete [] m_buffer;
+					m_buffer = NULL;
+				}
+			}
+		}
+		if (m_buffer) {
+			char* tmp = NET_ScanHTMLForURLs(m_buffer);
+			if (tmp) {
+				SetBuffer(tmp);
+				XP_FREE(tmp);
+			}
+		}
+	}
+
+    if (m_parent && m_parent->m_type &&
+		!strcasecomp(m_parent->m_type, MULTIPART_DIGEST) &&
+		m_type &&
+		(!strcasecomp(m_type, MESSAGE_RFC822) ||
+		 !strcasecomp(m_type, MESSAGE_NEWS))) {
+		/* If we're in a multipart/digest, and this document is of type
+		   message/rfc822, then it's appropriate to emit no
+		   headers.
+		   */
+	} else {
+	    char *message_headers = 0;
+		char *content_headers = 0;
+		char *content_type_header = 0;
+		status = divide_content_headers(m_other,
+										&message_headers,
+										&content_headers,
+										&content_type_header);
+		if (status < 0)
+		  goto FAIL;
+
+		  /* First, write out all of the headers that refer to the message
+			 itself (From, Subject, MIME-Version, etc.)
+		   */
+		  if (message_headers)
+			{
+			  PUSH(message_headers);
+			  XP_FREE(message_headers);
+			  message_headers = 0;
+			}
+
+		  if (!m_parent)
+			{
+              HG78478
+			  if (status < 0) goto FAIL;
+			}
+		  
+		  /* Now make sure there's a Content-Type header.
+		   */
+		  if (!content_type_header)
+			{
+			  XP_ASSERT(m_type && *m_type);
+			  XP_Bool needsCharset = mime_type_needs_charset(m_type ? m_type : TEXT_PLAIN);
+			  if (needsCharset)
+			  {
+			  	  char tmpCSName[64];
+			  	  tmpCSName[0] = '\0';
+			  	  INTL_CharSetIDToName(m_csid, tmpCSName);
+				  content_type_header =
+					PR_smprintf("Content-Type: %s; charset=%s" CRLF,
+								(m_type ? m_type : TEXT_PLAIN), tmpCSName);
+			  }
+			  else
+				  content_type_header =
+					PR_smprintf("Content-Type: %s" CRLF,
+								(m_type ? m_type : TEXT_PLAIN));
+			  if (!content_type_header)
+				{
+				  if (content_headers)
+					XP_FREE(content_headers);
+				  status = MK_OUT_OF_MEMORY;
+				  goto FAIL;
+				}
+			}
+
+		  /* If this is a compound object, tack a boundary string onto the
+			 Content-Type header.
+		   */
+		  if (m_numchildren > 0)
+			{
+			  int L;
+			  char *ct2;
+			  XP_ASSERT(m_type);
+			  if (!separator)
+				{
+				  separator = mime_make_separator("");
+				  if (!separator)
+					{
+					  status = MK_OUT_OF_MEMORY;
+					  goto FAIL;
+					}
+				}
+			  L = XP_STRLEN(content_type_header);
+
+			  if (content_type_header[L-1] == LF)
+				content_type_header[--L] = 0;
+			  if (content_type_header[L-1] == CR)
+				content_type_header[--L] = 0;
+
+			  ct2 = PR_smprintf("%s;\r\n boundary=\"%s\"" CRLF,
+								content_type_header, separator);
+			  XP_FREE(content_type_header);
+			  if (!ct2)
+				{
+				  if (content_headers)
+					XP_FREE(content_headers);
+				  status = MK_OUT_OF_MEMORY;
+				  goto FAIL;
+				}
+
+			  content_type_header = ct2;
+			}
+
+		  /* Now write out the Content-Type header...
+		   */
+		  XP_ASSERT(content_type_header && *content_type_header);
+		  PUSH(content_type_header);
+		  XP_FREE(content_type_header);
+		  content_type_header = 0;
+
+		  /* ...followed by all of the other headers that refer to the body of
+			 the message (Content-Transfer-Encoding, Content-Dispositon, etc.)
+		   */
+		  if (content_headers)
+			{
+			  PUSH(content_headers);
+			  XP_FREE(content_headers);
+			  content_headers = 0;
+			}
+	}
+
+	PUSH(CRLF);					// A blank line, to mark the end of headers.
+	
+	m_firstBlock = TRUE;
+	/* only convert if we need to tag charset */
+	m_needIntlConversion = mime_type_needs_charset(m_type);
+	m_intlDocToMailConverter = NULL;
+
+
+	if (m_buffer) {
+		XP_ASSERT(!m_filename);
+		status = PushBody(m_buffer, XP_STRLEN(m_buffer));
+		if (status < 0) goto FAIL;
+	} else if (m_filename) {
+		file = XP_FileOpen(m_filename, m_filetype, XP_FILE_READ_BIN);
+		if (!file) {
+		  status = -1;			// ### Better error code for a temp file
+								// mysteriously disappearing?
+		  goto FAIL;
+		}
+		/* Hack to avoid having to allocate memory... */
+		if (!mime_mailto_stream_read_buffer) {
+			mime_mailto_stream_read_buffer = (char *)
+				XP_ALLOC(MIME_BUFFER_SIZE);
+			if (!mime_mailto_stream_read_buffer)
+			  {
+				status = MK_OUT_OF_MEMORY;
+				goto FAIL;
+			  }
+		}
+		char* buffer = mime_mailto_stream_read_buffer;
+	
+		if (m_strip_sensitive_headers) {
+			/* We are attaching a message, so we should be careful to
+			   strip out certain sensitive internal header fields.
+			   */
+			XP_Bool skipping = FALSE;
+			XP_ASSERT(MIME_BUFFER_SIZE > 1000); /* SMTP (RFC821) limit */
+
+			while (1) {
+				char *line = XP_FileReadLine(buffer, MIME_BUFFER_SIZE-3, file);
+				if (!line) break;  /* EOF */
+
+				if (skipping) {
+					if (*line == ' ' || *line == '\t') {
+						continue;
+					} else {
+						skipping = FALSE;
+					}
+				}
+
+				int hdrLen = XP_STRLEN(buffer);
+				if ((hdrLen < 2) || (buffer[hdrLen-2] != CR)) // if the line doesn't end with CRLF,
+				{
+					// ... make it end with CRLF.
+					if ( (hdrLen == 0) 
+						|| ((buffer[hdrLen-1] != CR) && (buffer[hdrLen-1] != LF)) )
+						hdrLen++;
+					buffer[hdrLen-1] = '\015';
+					buffer[hdrLen] = '\012';
+					buffer[hdrLen+1] = '\0';
+				}
+
+				if (!strncasecomp(line, "BCC:", 4) ||
+					!strncasecomp(line, "FCC:", 4) ||
+					!strncasecomp(line, CONTENT_LENGTH ":",
+								  CONTENT_LENGTH_LEN + 1) ||
+					!strncasecomp(line, "Lines:", 6) ||
+					!strncasecomp(line, "Status:", 7) ||
+					!strncasecomp(line, X_MOZILLA_STATUS ":",
+								  X_MOZILLA_STATUS_LEN+1) ||
+					!strncasecomp(line, X_MOZILLA_NEWSHOST ":",
+								  X_MOZILLA_NEWSHOST_LEN+1) ||
+					!strncasecomp(line, X_UIDL ":", X_UIDL_LEN+1) ||
+					!strncasecomp(line, "X-VM-", 5))
+					{
+						skipping = TRUE;
+						continue;
+					}
+
+				PUSH(line);
+
+				if (*line == CR || *line == LF) {
+					break;	// Now can do normal reads for the body.
+				}
+			}
+		}
+
+
+		while (1) {
+			status = XP_FileRead(buffer, MIME_BUFFER_SIZE, file);
+			if (status < 0) {
+				goto FAIL;
+			} else if (status == 0) {
+				break;
+			}
+
+			status = PushBody(buffer, status);
+			if (status < 0) goto FAIL;
+		}
+	}
+
+	if (m_encoder_data) {
+		status = MimeEncoderDestroy(m_encoder_data, FALSE);
+		m_encoder_data = NULL;
+		if (status < 0) goto FAIL;
+	}
+
+	if (m_numchildren > 0) {
+	  XP_ASSERT(separator);
+		for (int i=0 ; i<m_numchildren ; i++) {
+			PUSH(CRLF);
+			PUSH("--");
+			PUSH(separator);
+			PUSH(CRLF);
+			status = m_children[i]->Write();
+			if (status < 0) goto FAIL;
+		}
+		PUSH(CRLF);
+		PUSH("--");
+		PUSH(separator);
+		PUSH("--");
+		PUSH(CRLF);
+	}	
+
+
+
+FAIL:
+	FREEIF(separator);
+    if (file) XP_FileClose(file);
+	if (m_intlDocToMailConverter) {
+		INTL_DestroyCharCodeConverter(m_intlDocToMailConverter);
+		m_intlDocToMailConverter = NULL;
+	}
+    return status;
+
+}
diff --git a/mozilla/lib/mailto/msgsendp.h b/mozilla/lib/mailto/msgsendp.h
new file mode 100644
index 00000000000..d5cf255af95
--- /dev/null
+++ b/mozilla/lib/mailto/msgsendp.h
@@ -0,0 +1,112 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef MSG_SENDP_H
+#define MSG_SENDP_H
+
+
+#include "msgzap.h"
+#include "mimeenc.h"
+
+class MSG_SendMimeDeliveryState;
+
+typedef int (*MSG_SendPartWriteFunc)(const char* line, int32 size,
+									 XP_Bool isheader, void* closure);
+
+
+class MSG_SendPart : public MSG_ZapIt {
+public:
+    MSG_SendPart(MSG_SendMimeDeliveryState* state, int16 part_csid = 0);
+    virtual ~MSG_SendPart();	// Note that the destructor also destroys
+								// any children that were added.
+
+    virtual int Write();
+
+    virtual int SetFile(const char* filename, XP_FileType filetype);
+    const char* GetFilename() {return m_filename;}
+	XP_FileType GetFiletype() {return m_filetype;}
+
+    virtual int SetBuffer(const char* buffer);
+    const char* GetBuffer() {return m_buffer;}
+
+    virtual int SetType(const char* type);
+    const char* GetType() {return m_type;}
+    
+    int16 GetCSID() { return m_csid; }
+
+    virtual int SetOtherHeaders(const char* other);
+    const char* SetOtherHeaders() {return m_other;}
+	virtual int AppendOtherHeaders(const char* moreother);
+
+	virtual int SetMimeDeliveryState(MSG_SendMimeDeliveryState* state);
+
+	// Note that the MSG_SendPart class will take over ownership of the
+	// MimeEncoderData* object, deleting it when it chooses.  (This is
+	// necessary because deleting these objects is the only current way to
+	// flush out the data in them.)
+	int SetEncoderData(MimeEncoderData* data);
+	MimeEncoderData *GetEncoderData() {return m_encoder_data;}
+
+	int SetStripSensitiveHeaders(XP_Bool value) {
+		m_strip_sensitive_headers = value;
+		return 0;
+	}
+	XP_Bool GetStripSensitiveHeaders() {return m_strip_sensitive_headers;}
+
+    virtual int AddChild(MSG_SendPart* child);
+
+	int32 GetNumChildren() {return m_numchildren;}
+	MSG_SendPart* GetChild(int32 which);
+	MSG_SendPart* DetachChild(int32 which);
+
+	virtual int SetMainPart(XP_Bool value);
+	XP_Bool IsMainPart() {return m_mainpart;}
+
+
+protected:
+	int CopyString(char** dest, const char* src);
+	int PushBody(char* buffer, int32 length);
+
+	MSG_SendMimeDeliveryState* m_state;
+	MSG_SendPart* m_parent;
+    char* m_filename;
+	XP_FileType m_filetype;
+	char* m_buffer;
+    char* m_type;
+    char* m_other;
+	int16 m_csid;	// charset ID associated with this part
+	XP_Bool m_strip_sensitive_headers;
+	MimeEncoderData *m_encoder_data;  /* Opaque state for base64/qp encoder. */
+
+	MSG_SendPart** m_children;
+	int32 m_numchildren;
+
+	// Data used while actually writing.
+    XP_Bool m_firstBlock;
+    XP_Bool m_needIntlConversion;
+    CCCDataObject m_intlDocToMailConverter;
+
+	XP_Bool m_mainpart;
+
+	XP_Bool m_just_hit_CR;
+
+	static int32 M_counter;
+};
+
+
+
+#endif /* MSG_SENDP_H */
diff --git a/mozilla/lib/mailto/msgurlq.cpp b/mozilla/lib/mailto/msgurlq.cpp
new file mode 100644
index 00000000000..5c60cc76cda
--- /dev/null
+++ b/mozilla/lib/mailto/msgurlq.cpp
@@ -0,0 +1,502 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+//
+
+#include "msg.h"
+#include "msgurlq.h"
+#include "msgpane.h"
+
+
+MSG_UrlQueueElement::MSG_UrlQueueElement (const char *url, MSG_UrlQueue *queue, Net_GetUrlExitFunc *exitFunction, MSG_Pane *pane, NET_ReloadMethod reloadMethod, FO_Present_Types outputFormat)
+{
+	m_queue = queue;
+	m_pane = pane;
+	m_urlString = XP_STRDUP(url);
+	m_exitFunction = exitFunction;
+	m_reloadMethod = reloadMethod;
+	m_url = NULL;
+	m_callGetURLDirectly = FALSE;
+	m_outputFormat = outputFormat;
+}
+
+MSG_UrlQueueElement::MSG_UrlQueueElement (URL_Struct *url, MSG_UrlQueue *queue, Net_GetUrlExitFunc *exitFunction, MSG_Pane *pane, XP_Bool skipFE, FO_Present_Types outputFormat)
+{
+	m_queue = queue;
+	m_pane = pane;
+	m_urlString = XP_STRDUP(url->address);
+	m_exitFunction = exitFunction;
+	m_reloadMethod = url->force_reload;
+	m_url = url;
+	m_callGetURLDirectly = skipFE;
+	m_outputFormat = outputFormat;
+}
+
+MSG_UrlQueueElement::MSG_UrlQueueElement (URL_Struct *urls, MSG_UrlQueue *q)
+{
+	m_queue = q;
+	m_pane = urls->msg_pane;
+	m_urlString = XP_STRDUP(urls->address);;
+	m_url = urls;
+	m_exitFunction = NULL;
+	m_reloadMethod = NET_DONT_RELOAD;
+	m_callGetURLDirectly = FALSE;
+	m_outputFormat = FO_CACHE_AND_PRESENT;
+}
+
+MSG_UrlQueueElement::~MSG_UrlQueueElement()
+{
+	FREEIF(m_urlString);
+//	if (m_url && m_callGetURLDirectly)
+//		NET_FreeURLStruct(m_url);	// Tempting, but not our job 
+}
+
+void MSG_UrlQueueElement::PrepareToRun()
+{
+	// nothing we have to do right now for queue elements.
+	return;
+}
+
+char* MSG_UrlQueueElement::GetURLString()
+{
+	if (m_urlString)
+		return m_urlString;
+	if (m_url)
+		return(m_url->address);
+	return(NULL);
+}
+
+URL_Struct* MSG_UrlQueueElement::GetURLStruct()
+{
+	if (!m_url)
+		m_url = NET_CreateURLStruct( m_urlString, NET_DONT_RELOAD);
+	return(m_url);
+}
+
+
+MSG_UrlLocalMsgCopyQueueElement::MSG_UrlLocalMsgCopyQueueElement(MessageCopyInfo * info, const char * url, MSG_UrlQueue * q, 
+													  Net_GetUrlExitFunc * func, MSG_Pane * pane, NET_ReloadMethod reloadMethod)
+  : MSG_UrlQueueElement (url, q, func, pane, reloadMethod)
+{
+	m_copyInfo = info;
+}
+
+MSG_UrlLocalMsgCopyQueueElement::MSG_UrlLocalMsgCopyQueueElement(MessageCopyInfo * info, URL_Struct * url, MSG_UrlQueue * q, 
+													   Net_GetUrlExitFunc * func, MSG_Pane * pane, XP_Bool skipFE)
+   : MSG_UrlQueueElement (url, q, func, pane, skipFE)
+{
+	m_copyInfo = info;
+}
+
+MSG_UrlLocalMsgCopyQueueElement::MSG_UrlLocalMsgCopyQueueElement (MessageCopyInfo * info, URL_Struct * urls, MSG_UrlQueue * q)
+	: MSG_UrlQueueElement(urls, q)
+{
+	m_copyInfo = info;
+}
+
+MSG_UrlLocalMsgCopyQueueElement::~MSG_UrlLocalMsgCopyQueueElement()
+{
+	// should we delete the copy info? I don't think so!! 
+	// when copy was finished, a call to MSG_FolderInfo::CleanUpCopy deletes
+	// the copy info in the current context. Assuming our queue element isn't deleted before
+	// it is executed upon......we don't need to delete it.
+}
+
+void MSG_UrlLocalMsgCopyQueueElement::PrepareToRun()
+{
+	MWContext * context = m_pane->GetContext();
+	MessageCopyInfo * victim = NULL;
+	if (context) 
+	{
+		victim = context->msgCopyInfo;
+		XP_ASSERT(!victim);   // we actually should never have a victim....but if we do:
+		// the last copy info is done.
+		if (victim)
+			XP_FREEIF(victim);  // local copies never have copy info chains, don't have to worry about nextCopyInfo
+
+		context->msgCopyInfo = m_copyInfo;  // set ourselves up as the next copy info
+	}
+}
+
+//*****************************************************************************
+// MSG_UrlQueue -- Intended to be a general purpose way to chain several
+//                 URLs together using the exit functions
+//*****************************************************************************
+
+const int MSG_UrlQueue::kNoSpecialIndex = -1;
+
+MSG_UrlQueue::MSG_UrlQueue (MSG_Pane *pane)
+{
+#ifdef DEBUG
+	MSG_UrlQueue *existingQueue = FindQueue(pane);
+	if (existingQueue)
+	{
+		MSG_UrlQueueElement *elem = existingQueue->GetAt (existingQueue->m_runningUrl);
+		if (elem)
+			XP_Trace("trying to create queue while %s is running\n", elem->m_urlString);
+	}
+	XP_ASSERT(!existingQueue);
+#endif
+
+	m_pane = pane;
+	m_runningUrl = -1;
+	m_IndexOfNextUrl = kNoSpecialIndex;
+	m_inExitFunc = FALSE;
+	GetQueueArray()->Add (this);
+}
+
+
+MSG_UrlQueue::~MSG_UrlQueue ()
+{
+	GetQueueArray()->Remove(this);
+
+	for (int i = 0; i < GetSize (); i++)
+	{
+		MSG_UrlQueueElement *e = GetAt(i);
+		delete e;
+	}
+}
+
+XPPtrArray *
+MSG_UrlQueue::GetQueueArray()
+{
+	if (!m_queueArray)
+		m_queueArray = new XPPtrArray();
+	return m_queueArray;
+}
+
+XP_Bool MSG_UrlQueue::IsIMAPLoadFolderUrlQueue()
+{
+	return FALSE;
+}
+
+void MSG_UrlQueue::AddUrl (const char *url, Net_GetUrlExitFunc *exitFunction, MSG_Pane *pane, NET_ReloadMethod reloadMethod)
+{
+	MSG_UrlQueueElement *elem = NULL;
+	
+	if (!pane)
+		pane = m_pane;
+	elem = new MSG_UrlQueueElement (url, this, exitFunction, pane, reloadMethod);
+	if (elem)
+		Add(elem);
+}
+
+void MSG_UrlQueue::AddUrl (URL_Struct *url, Net_GetUrlExitFunc *exitFunction, MSG_Pane *pane, XP_Bool skipFE, FO_Present_Types outputFormat)
+{
+	MSG_UrlQueueElement * elem = NULL;
+	if (!pane)
+		pane = m_pane;
+	elem = new MSG_UrlQueueElement(url, this, exitFunction, pane, skipFE, outputFormat);
+	if (elem)
+		Add(elem);
+}
+
+void MSG_UrlQueue::AddLocalMsgCopyUrl(MessageCopyInfo * info, const char *url, Net_GetUrlExitFunc *exitFunction, MSG_Pane * pane, NET_ReloadMethod reloadMethod)
+{
+	MSG_UrlLocalMsgCopyQueueElement *elem = NULL;
+
+	if (!pane)
+		pane = m_pane;
+	elem = new MSG_UrlLocalMsgCopyQueueElement (info, url, this, exitFunction, pane, reloadMethod);
+	if (elem)
+		Add(elem);
+}
+
+/* static */ MSG_UrlQueue * MSG_UrlQueue::FindQueueWithSameContext(MSG_Pane *pane)
+{
+	MSG_UrlQueue * q = NULL;
+
+	XP_ASSERT(pane);
+	if (pane)
+	{
+		q = MSG_UrlQueue::FindQueue(pane);
+		MSG_Pane *QPane = pane->GetFirstPaneForContext(pane->GetContext());
+		while (!q && QPane)
+		{
+			q = MSG_UrlQueue::FindQueue(QPane);
+			if (!q)
+				QPane = pane->GetNextPaneForContext(QPane, pane->GetContext());
+		}
+#ifdef DEBUG_bienvenu
+		if (q && QPane != pane)
+			XP_Trace("found queue for different pane with same context!\n");
+#endif
+	}
+	return q;
+}
+
+/* static */ MSG_UrlQueue * MSG_UrlQueue::GetOrCreateUrlQueue (MSG_Pane * pane, XP_Bool * newQueue)
+// The following code appeared in just about every AddUrl method or variant thereof. I've generalized it in this single
+// routine. 
+// Returns: pointer to the queue for the pane. If we had to create the queue, then newQueue is set to TRUE;
+{
+	*newQueue = FALSE;
+	MSG_UrlQueue *q = FindQueueWithSameContext(pane);
+	if (!q) 
+	{
+		q = new MSG_UrlQueue(pane);
+		*newQueue = TRUE;
+	}
+	// we seem to get in this state where we're not running a url but the queue
+	// thinks we are.
+	if (! (q->m_inExitFunc || q->m_runningUrl == -1 || XP_IsContextBusy(pane->GetContext())))
+	{
+#ifdef DEBUG
+		MSG_UrlQueueElement *runningElement = q->GetAt(q->m_runningUrl);
+		if (runningElement)
+			XP_Trace("q was running url %s\n", runningElement->GetURLString());
+		XP_ASSERT(FALSE);
+#endif
+	}
+	return q;
+}
+
+
+/* static */ MSG_UrlQueue * MSG_UrlQueue::AddUrlToPane (const char *url, Net_GetUrlExitFunc *exitFunction, MSG_Pane *pane, NET_ReloadMethod reloadMethod)
+{
+	MSG_UrlQueue *q;
+	MSG_UrlQueueElement *elem = NULL;
+	XP_Bool newQ = FALSE;
+	
+	q = GetOrCreateUrlQueue(pane, &newQ);
+	if (q)
+	{
+		elem = new MSG_UrlQueueElement (url, q, exitFunction, pane, reloadMethod);
+		if (elem)
+			q->Add(elem);
+		if (newQ)
+			q->GetNextUrl();
+	}
+	return q;
+}
+
+/* static*/ MSG_UrlQueue *MSG_UrlQueue::AddLocalMsgCopyUrlToPane (MessageCopyInfo * info, const char *url, Net_GetUrlExitFunc *exitFunction, MSG_Pane *pane, NET_ReloadMethod reloadMethod)
+{
+	MSG_UrlQueue *q;
+	MSG_UrlLocalMsgCopyQueueElement *elem = NULL;
+	XP_Bool newQ = FALSE;
+
+	q = GetOrCreateUrlQueue(pane, &newQ);
+
+	if (q)
+	{
+		elem = new MSG_UrlLocalMsgCopyQueueElement (info, url, q, exitFunction, pane, reloadMethod);
+		if (elem)
+			q->Add(elem);
+		if (newQ)
+			q->GetNextUrl();
+	}
+	return q;
+}
+
+/* static */ MSG_UrlQueue *MSG_UrlQueue::AddUrlToPane (URL_Struct *url, Net_GetUrlExitFunc *exitFunction, MSG_Pane *pane, XP_Bool skipFE, FO_Present_Types outputFormat)
+{
+	MSG_UrlQueue *q;
+	MSG_UrlQueueElement *elem = NULL;
+	XP_Bool newQ = FALSE;
+	
+	q = GetOrCreateUrlQueue(pane, &newQ);
+	if (q)
+	{
+		elem = new MSG_UrlQueueElement (url, q, exitFunction, pane, skipFE, outputFormat);
+		if (elem)
+			q->Add(elem);
+		if (newQ)
+			q->GetNextUrl();
+	}
+	return q;
+}
+
+/* static */ MSG_UrlQueue *MSG_UrlQueue::AddLocalMsgCopyUrlToPane(MessageCopyInfo * info, URL_Struct * url, Net_GetUrlExitFunc * exitFunction, MSG_Pane * pane, XP_Bool skipFE)
+{
+	MSG_UrlQueue *q;
+	MSG_UrlLocalMsgCopyQueueElement *elem = NULL;
+	XP_Bool newQ = FALSE;
+
+	q = GetOrCreateUrlQueue(pane, &newQ);
+	if (q)
+	{
+		elem = new MSG_UrlLocalMsgCopyQueueElement (info, url, q, exitFunction, pane, skipFE);
+		if (elem)
+			q->Add(elem);
+		if (newQ)
+			q->GetNextUrl();
+	}
+	return q;
+}
+
+
+void MSG_UrlQueue::AddUrlAt (int where, const char *url, Net_GetUrlExitFunc *exitFunction, MSG_Pane *pane, NET_ReloadMethod reloadMethod)
+{
+	if (!pane)
+		pane = m_pane;
+
+	MSG_UrlQueueElement *elem = new MSG_UrlQueueElement (url, this, exitFunction, pane, reloadMethod);
+	if (elem)
+		InsertAt (where, elem);
+}
+
+void MSG_UrlQueue::AddLocalMsgCopyUrlAt (MessageCopyInfo * info, int where, const char * url, Net_GetUrlExitFunc * exitFunction, MSG_Pane * pane, NET_ReloadMethod reloadMethod)
+{
+	if (!pane)
+		pane = m_pane;
+
+	MSG_UrlLocalMsgCopyQueueElement *elem = new MSG_UrlLocalMsgCopyQueueElement (info, url, this, exitFunction, pane, reloadMethod);
+	if (elem)
+		InsertAt (where, elem);
+}
+
+
+void MSG_UrlQueue::GetNextUrl()
+{
+	int err = 0;
+	
+	MSG_UrlQueueElement *elem = GetAt(++m_runningUrl);
+	XP_ASSERT(elem);
+	if (elem)
+	{
+		// we need to make sure the queue element is ready to be run!!!
+		elem->PrepareToRun();
+
+		if (!elem->m_url)
+		{
+			elem->m_url = NET_CreateURLStruct (elem->m_urlString, elem->m_reloadMethod);
+			if (!elem->m_url)
+				return; //  (MsgERR) MK_OUT_OF_MEMORY;
+		}
+		if (elem->m_url && XP_STRLEN(elem->m_url->address) > 0)
+		{
+			elem->m_url->internal_url = TRUE;
+			elem->m_url->pre_exit_fn = &MSG_UrlQueue::ExitFunction;
+			if (elem->m_callGetURLDirectly)
+			{
+				elem->m_url->pre_exit_fn = NULL;
+				err = NET_GetURL(elem->m_url, elem->m_outputFormat, elem->m_pane->GetContext(), MSG_UrlQueue::ExitFunction);
+			} else
+			{
+#ifdef MOZ_MAIL_NEWS
+				err = elem->m_pane->GetURL (elem->m_url, FALSE);
+#else /* MOZ_MAIL_NEWS */
+                XP_ASSERT(0);
+#endif /* MOZ_MAIL_NEWS */
+			}
+		}
+		else
+		{
+			elem->m_url->msg_pane = m_pane;
+			CallExitAndChain(elem->m_url, 0, elem->m_pane->GetContext());
+		}
+	}
+}
+
+void MSG_UrlQueue::HandleUrlQueueInterrupt(URL_Struct * URL_s, int status, MWContext * window_id)
+{
+	for (int i = 0; i <  m_interruptCallbacks.GetSize(); i++)
+	{
+		MSG_UrlQueueInterruptFunc *exitFunc = (MSG_UrlQueueInterruptFunc *) m_interruptCallbacks.GetAt(i);
+		if (exitFunc)
+			(*exitFunc) (this, URL_s, status, window_id);
+	}
+	// default is to do nothing
+}
+
+/*static*/ XPPtrArray *MSG_UrlQueue::m_queueArray = NULL;
+
+
+/*static*/ MSG_UrlQueue *MSG_UrlQueue::FindQueue (const char *url, MWContext *context)
+{
+	for (int i = 0; i < GetQueueArray()->GetSize(); i++)
+	{
+		MSG_UrlQueue *queue = (MSG_UrlQueue*)(GetQueueArray()->GetAt(i));
+		for (int j = 0; j < queue->GetSize(); j++)
+		{
+			MSG_UrlQueueElement *elem = queue->GetAt(j);
+
+			// pane has been deleted - remove element from queue
+			if (!MSG_Pane::PaneInMasterList(elem->m_pane))
+			{
+#ifdef DEBUG_akkana
+				printf("FindQueue: Removing deleted pane\n");
+#endif /* DEBUG */
+				queue->RemoveAt(j--);
+				delete elem;
+			}
+			else if (elem->m_pane->GetContext() == context)
+			{
+				if (elem->m_urlString && !XP_STRCMP(elem->m_urlString, url))
+					return queue;
+			}
+		}
+	}
+	return NULL;
+}
+
+
+/*static*/ MSG_UrlQueue *MSG_UrlQueue::FindQueue (MSG_Pane *pane)
+{
+	for (int i = 0; i < GetQueueArray()->GetSize (); i++)
+	{
+		MSG_UrlQueue *queue = (MSG_UrlQueue*)(GetQueueArray()->GetAt(i));
+		if (queue->m_pane == pane)
+			return queue;
+	}
+	return NULL;
+}
+
+/*static*/ void MSG_UrlQueue::ExitFunction (URL_Struct *URL_s, int status, MWContext *window_id)
+{
+	MSG_UrlQueue *queue = FindQueue (URL_s->address, window_id);
+	XP_ASSERT(queue);
+	if (queue)
+		queue->CallExitAndChain(URL_s, status, window_id);
+}
+
+// Note that this can delete itself if at the end of its list.
+void MSG_UrlQueue::CallExitAndChain(URL_Struct *URL_s, int status, MWContext *window_id)
+{
+	MSG_UrlQueueElement *elem = GetAt (m_runningUrl);
+	if (elem->m_exitFunction)
+	{
+		m_inExitFunc = TRUE;
+		elem->m_exitFunction (URL_s, status, window_id);
+		m_inExitFunc = FALSE;
+	}
+	if ((m_runningUrl >= GetSize() - 1) || status == MK_INTERRUPTED)
+	{
+if (status == MK_INTERRUPTED)
+			HandleUrlQueueInterrupt(URL_s, status, window_id);
+		delete this;
+	}
+	else
+		GetNextUrl();
+}
+
+
+extern "C" int MSG_GetUrlQueueSize (const char *url, MWContext *context)
+{
+	MSG_UrlQueue *queue = MSG_UrlQueue::FindQueue (url, context);
+	if (queue)
+		return queue->GetSize();
+	return 0;
+}
+
+void MSG_UrlQueue::AddInterruptCallback(MSG_UrlQueueInterruptFunc *interruptFunc)
+{
+	m_interruptCallbacks.Add((void *) interruptFunc);
+}
+
+
diff --git a/mozilla/lib/mailto/msgurlq.h b/mozilla/lib/mailto/msgurlq.h
new file mode 100644
index 00000000000..a6ab4866254
--- /dev/null
+++ b/mozilla/lib/mailto/msgurlq.h
@@ -0,0 +1,206 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+//
+// 
+// 
+
+#ifndef _MSGURLQ_H_
+#define _MSGURLQ_H_
+
+#include "ptrarray.h"
+#include "net.h"
+
+class MSG_Pane;
+class ABook;
+class MSG_UrlQueue;
+
+
+/********************************************************************************************************************
+Notes: Each URL in a MSG_UrlQueue is represented by a queue element for any instance data it 
+	needs. Since a pane can have one and only one URL queue, it would be nice to be able to have queue elements
+	for different types of URLs (local copy message urls, LDAP to AB, etc.) To support this effort, it will be common
+	practice to subclass MSG_UrlQueueElement with a queue element capable of handling your new type of url. In addition,
+	your new subclass should support a virtual method called PrepareToRun() if you need to make any specific changes to
+	things like the current context for your new url before it is run. MSG_UrlQueue will always call the element's 
+	PrepareToRun method before actually running that URL in the queue. You will also need to modify MSG_UrlQueue to 
+	add methods for adding urls of your new type. 
+
+*********************************************************************************************************************/
+
+//*****************************************************************************
+// MSG_UrlQueueElement -- Each URL in a MSG_UrlQueue is represented by a
+//                        MSG_UrlQueueElement for any instance data it needs
+//*****************************************************************************
+
+class MSG_UrlQueueElement
+{
+	friend MSG_UrlQueue;
+
+public:
+	MSG_UrlQueueElement (const char *, MSG_UrlQueue *, Net_GetUrlExitFunc *, MSG_Pane *, NET_ReloadMethod reloadMethod = NET_DONT_RELOAD, FO_Present_Types outputFormat = FO_CACHE_AND_PRESENT);
+	MSG_UrlQueueElement (URL_Struct *, MSG_UrlQueue *, Net_GetUrlExitFunc *, MSG_Pane *, XP_Bool skipFE = FALSE, FO_Present_Types outputFormat = FO_CACHE_AND_PRESENT);
+	MSG_UrlQueueElement (URL_Struct * urls, MSG_UrlQueue *q);
+	virtual ~MSG_UrlQueueElement ();
+	virtual URL_Struct* GetURLStruct();
+	virtual char* GetURLString();
+
+	virtual void PrepareToRun();   // the queue element is about to be run....(added in particular for subclasses)
+
+protected:
+	char *m_urlString;
+	XP_Bool m_callGetURLDirectly;
+	MSG_Pane *m_pane;
+	URL_Struct *m_url;
+	MSG_UrlQueue *m_queue;
+	Net_GetUrlExitFunc *m_exitFunction;
+	NET_ReloadMethod	m_reloadMethod;
+	FO_Present_Types m_outputFormat;
+};
+
+
+//************************************************************************************
+// MSG_UrlLocalMsgCopyQueueElement - we want a queue element type which can handle
+//									 LOCAL message copy urls. Don't try this with IMAP
+//									 copy URLs.
+//************************************************************************************
+
+class MSG_UrlLocalMsgCopyQueueElement : public MSG_UrlQueueElement
+{
+public:
+	MSG_UrlLocalMsgCopyQueueElement (MessageCopyInfo *, const char *, MSG_UrlQueue *, Net_GetUrlExitFunc *, 
+		MSG_Pane *, NET_ReloadMethod reloadMethod = NET_DONT_RELOAD);
+	MSG_UrlLocalMsgCopyQueueElement (MessageCopyInfo *, URL_Struct *, MSG_UrlQueue *, Net_GetUrlExitFunc *, 
+		MSG_Pane *, XP_Bool skipFE = FALSE);
+	MSG_UrlLocalMsgCopyQueueElement (MessageCopyInfo *, URL_Struct * urls, MSG_UrlQueue * q);
+	
+	virtual ~MSG_UrlLocalMsgCopyQueueElement();
+	virtual void PrepareToRun();	// element is about to be run, we need to clobber context's copy info and replace with ours
+
+protected:
+	MessageCopyInfo * m_copyInfo;
+};
+
+
+//******************************************************************************************************
+// MSG_UrlQueue -- Handles a queue of URLs which get fired in serial. This is
+//                 a stopgap measure to compensate for the lack of multiple running
+//                 URLs per MWContext
+//
+// Note: Must always call the queue element's PrepareToRun method before running a URL for that element.
+//*******************************************************************************************************
+
+typedef void MSG_UrlQueueInterruptFunc (MSG_UrlQueue *queue, URL_Struct *URL_s, int status, MWContext *window_id);
+
+
+class MSG_UrlQueue : public XPPtrArray
+{
+public:
+	MSG_UrlQueue (MSG_Pane *pane);
+	virtual ~MSG_UrlQueue ();
+	
+	// it would be nice to use signature overloading for adding urls. Later, we might want to do this!!!
+	
+	// Use this for regular add-to-tail functionality
+	static MSG_UrlQueue *AddUrlToPane (const char *url, Net_GetUrlExitFunc *exitFunction = NULL, MSG_Pane *pane = NULL, NET_ReloadMethod reloadMethod = NET_DONT_RELOAD);
+	static MSG_UrlQueue * AddLocalMsgCopyUrlToPane (MessageCopyInfo * info, const char *url, Net_GetUrlExitFunc *exitFunction = NULL, MSG_Pane *pane = NULL, NET_ReloadMethod reloadMethod = NET_DONT_RELOAD);
+
+	// Use this for regular add-to-tail functionality with URL_Struct filled in
+	static MSG_UrlQueue * AddUrlToPane (URL_Struct *url, Net_GetUrlExitFunc *exitFunction = NULL, MSG_Pane *pane = NULL, XP_Bool skipFE = FALSE, FO_Present_Types outputFormat = FO_CACHE_AND_PRESENT);
+	static MSG_UrlQueue * AddLocalMsgCopyUrlToPane (MessageCopyInfo * info, URL_Struct * url, Net_GetUrlExitFunc * exitFunction = NULL, MSG_Pane * pane = NULL, XP_Bool skipFE = FALSE);
+
+	void AddUrl (const char *url, Net_GetUrlExitFunc *exitFunction = NULL, MSG_Pane *pane = NULL, NET_ReloadMethod reloadMethod = NET_DONT_RELOAD);
+	void AddUrl(URL_Struct *url, Net_GetUrlExitFunc *exitFunction = NULL, MSG_Pane *pane = NULL, XP_Bool skipFE = FALSE, FO_Present_Types outputFormat = FO_CACHE_AND_PRESENT);
+	void AddLocalMsgCopyUrl(MessageCopyInfo * info, const char *url, Net_GetUrlExitFunc *exitFunction = NULL, MSG_Pane * pane = NULL, NET_ReloadMethod reloadMethod = NET_DONT_RELOAD);
+
+	// Use this if you need to insert a URL in the middle of the queue
+	virtual void AddUrlAt (int where, const char *url, Net_GetUrlExitFunc *exitFunction = NULL, MSG_Pane *pane = NULL, NET_ReloadMethod reloadMethod = NET_DONT_RELOAD);
+	virtual void AddLocalMsgCopyUrlAt (MessageCopyInfo * info, int where, const char * url, Net_GetUrlExitFunc * exitFunction = NULL, MSG_Pane * pane = NULL, NET_ReloadMethod reloadmethod = NET_DONT_RELOAD);
+
+	// Use this if you need to know which URL is running
+	virtual int GetCursor () { return m_runningUrl; }
+
+	// start the queue by calling this
+	virtual void GetNextUrl ();
+	
+	// which pane is this queue running url's in?
+	virtual MSG_Pane* GetPane() { return m_pane; }
+
+	// Use this if you need to know which queue a URL is on
+	static MSG_UrlQueue *FindQueue (const char *url, MWContext *context);
+	static MSG_UrlQueue *FindQueue (MSG_Pane *pane);
+	static MSG_UrlQueue *FindQueueWithSameContext(MSG_Pane *pane);
+	
+	// Use this if you need to know the queue for a pane
+	static MSG_UrlQueue *FindQueue (const char *url, MSG_Pane *pane);
+	// used by subclasses who are designed to use other meta data for ordering urls.
+	// an example is MSG_ImapLoadFolderUrlQueue
+	static const int kNoSpecialIndex;
+	void	SetSpecialIndexOfNextUrl(int index) { m_IndexOfNextUrl = index; }
+	virtual XP_Bool IsIMAPLoadFolderUrlQueue();
+	static void		HandleFolderLoadInterrupt(MSG_UrlQueue *queue, URL_Struct *URL_s, int status, MWContext *window_id);
+	virtual void AddInterruptCallback(MSG_UrlQueueInterruptFunc *interruptFunc);
+protected:
+
+	MSG_UrlQueueElement *GetAt(int i) { return (MSG_UrlQueueElement*) XPPtrArray::GetAt(i); }
+
+	// called if ExitFunction status == MK_INTERRUPTED
+	virtual void HandleUrlQueueInterrupt(URL_Struct *URL_s, int status, MWContext *window_id);
+	
+	static void ExitFunction (URL_Struct *URL_s, int status, MWContext *window_id);
+	void CallExitAndChain (URL_Struct *URL_s, int status, MWContext *window_id);
+
+	static MSG_UrlQueue * GetOrCreateUrlQueue (MSG_Pane * pane, XP_Bool * newQueue);
+
+	int m_runningUrl;
+	MSG_Pane *m_pane;
+	static XPPtrArray *m_queueArray;
+	int	m_IndexOfNextUrl;
+	XP_Bool			m_inExitFunc;
+	XPPtrArray		m_interruptCallbacks;
+	static XPPtrArray *GetQueueArray();
+};
+
+
+class MSG_AddLdapToAddressBookQueue : public MSG_UrlQueue
+{
+public:
+
+	MSG_AddLdapToAddressBookQueue (MSG_Pane *);
+
+	virtual void GetNextUrl ();
+
+	ABook *m_addressBook;
+};
+
+
+class MSG_ImapLoadFolderUrlQueue : public MSG_UrlQueue
+{
+public:
+	MSG_ImapLoadFolderUrlQueue(MSG_Pane *pane);
+	
+	// Use this for regular add-to-tail functionality, or use the index of it has been set.
+	// Used to ensure ordering of message copy urls when going offline
+	virtual void AddUrl (const char *url, Net_GetUrlExitFunc *exitFunction = NULL, MSG_Pane *pane = NULL, NET_ReloadMethod reloadMethod = NET_DONT_RELOAD);
+	virtual XP_Bool IsIMAPLoadFolderUrlQueue();
+protected:
+	// called if ExitFunction status == MK_INTERRUPTED
+//	virtual void HandleUrlQueueInterrupt(URL_Struct *URL_s, int status, MWContext *window_id);
+	
+};
+
+#endif
diff --git a/mozilla/lib/mailto/msgutils.c b/mozilla/lib/mailto/msgutils.c
new file mode 100644
index 00000000000..2abcf7a009f
--- /dev/null
+++ b/mozilla/lib/mailto/msgutils.c
@@ -0,0 +1,852 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*   msgutils.c --- various and sundry
+ */
+
+#include "msg.h"
+#include "xp_time.h"
+#include "xpgetstr.h"
+#include "xplocale.h"
+#include "htmldlgs.h"
+#include "prefapi.h"
+#include "xp_qsort.h"
+
+extern int MK_OUT_OF_MEMORY;
+extern int MK_MSG_NON_MAIL_FILE_WRITE_QUESTION;
+extern int MK_MSG_HTML_DOMAINS_DIALOG;
+extern int MK_MSG_HTML_DOMAINS_DIALOG_TITLE;
+
+#ifdef XP_MAC
+#pragma warn_unusedarg off
+#endif
+
+int
+msg_GetURL(MWContext* context, URL_Struct* url, XP_Bool issafe)
+{
+  XP_ASSERT(context);
+
+  /* phil & bienvenu think issafe means "allowed to start another URL even if
+     one is already runing". e.g. delete from msgPane, and load next msg */
+  if (!issafe)
+	msg_InterruptContext (context, TRUE);
+  
+  url->internal_url = TRUE;
+  if (!url->open_new_window_specified)
+  {
+	  url->open_new_window_specified = TRUE;
+	  url->open_new_window = FALSE;
+  }
+
+  return FE_GetURL(context, url);
+}
+
+
+void
+msg_InterruptContext(MWContext* context, XP_Bool safetoo)
+{
+  XP_InterruptContext(context);
+
+
+#ifdef NOTDEF					/* ###tw */
+
+  struct MSG_Frame *msg_frame;  
+  if (!context) return;
+  if (safetoo || !context->msgframe ||  
+	  !context->msgframe->safe_background_activity) {
+	/* save msg_frame in case context gets deleted on interruption */
+	msg_frame = context->msgframe;
+	XP_InterruptContext(context);
+	if (msg_frame) {  
+	  msg_frame->safe_background_activity = FALSE;
+	}  
+  }
+#endif
+}
+
+
+XP_Bool
+MSG_RequiresComposeWindow (const char *url)
+{
+  if (!url) return FALSE;
+  if (!strncasecomp (url, "mailto:", 7))
+	{
+	  return TRUE;
+	}
+  return FALSE;
+}
+
+
+XP_Bool
+MSG_RequiresBrowserWindow (const char *url)
+{
+  if (!url) return FALSE;
+  if (MSG_RequiresNewsWindow (url) ||
+	  MSG_RequiresMailWindow (url) ||
+	  !strncasecomp (url, "about:", 6) ||
+	  !strncasecomp (url, "addbook:", 8) ||
+	  !strncasecomp (url, "addbook-ldap", 12) || /* no colon so addbook-ldap and addbook-ldaps both match */
+	  !strncasecomp (url, "mailto:", 7) ||
+	  !strncasecomp (url, "view-source:", 12) ||
+	  !strncasecomp (url, "internal-callback-handler:", 26) ||
+	  !strncasecomp (url, "internal-panel-handler", 22) ||
+	  !strncasecomp (url, "internal-dialog-handler", 23))
+	return FALSE;
+
+  else if (!strncasecomp (url, "news:", 5) ||
+		   !strncasecomp (url, "snews:", 6) ||
+		   !strncasecomp (url, "mailbox:", 8) ||
+		   !strncasecomp (url, "IMAP:", 5))
+	{
+	  /* Mail and news messages themselves don't require browser windows,
+		 but their attachments do. */
+	  if (XP_STRSTR(url, "?part=") || XP_STRSTR(url, "&part="))
+		return TRUE;
+	  else
+		return FALSE;
+	}
+  else
+	return TRUE;
+}
+
+
+
+/* If we're in a mail window, and clicking on a link which will itself
+   require a mail window, then don't allow this to show up in a different
+   window - since there can only be one mail window.
+ */
+XP_Bool
+MSG_NewWindowProhibited (MWContext *context, const char *url)
+{
+  if (!context) return FALSE;
+  if ((context->type == MWContextMail &&
+       MSG_RequiresMailWindow (url)) ||
+      (context->type == MWContextNews &&
+       MSG_RequiresNewsWindow (url)) ||
+      (MSG_RequiresComposeWindow (url)))
+    return TRUE;
+  else
+    return FALSE;
+}
+
+
+char *
+MSG_ConvertToQuotation (const char *string)
+{
+  int32 column = 0;
+  int32 newlines = 0;
+  int32 chars = 0;
+  const char *in;
+  char *out;
+  char *new_string;
+
+  if (! string) return 0;
+
+  /* First, count up the lines in the string. */
+  for (in = string; *in; in++)
+    {
+	  chars++;
+      if (*in == CR || *in == LF)
+		{
+		  if (in[0] == CR && in[1] == LF) {
+		 	 in++;
+		 	 chars++;
+		  }
+		  newlines++;
+		  column = 0;
+		}
+      else
+		{
+		  column++;
+		}
+    }
+  /* If the last line doesn't end in a newline, pretend it does. */
+  if (column != 0)
+    newlines++;
+
+  /* 2 characters for each '> ', +1 for '\0', and + potential linebreak */
+  new_string = (char *) XP_ALLOC (chars + (newlines * 2) + 1 + LINEBREAK_LEN);
+  if (! new_string)
+	return 0;
+
+  column = 0;
+  out = new_string;
+
+  /* Now copy. */
+  for (in = string; *in; in++)
+    {
+	  if (column == 0)
+		{
+		  *out++ = '>';
+		  *out++ = ' ';
+		}
+		
+	  *out++ = *in;
+      if (*in == CR || *in == LF)
+		{
+		  if (in[0] == CR && in[1] == LF)
+			*out++ = *++in;
+		  newlines++;
+		  column = 0;
+		}
+      else
+		{
+		  column++;
+		}
+    }
+
+ /* If the last line doesn't end in a newline, add one. */
+	if (column != 0)
+  	{
+		XP_STRCPY (out, LINEBREAK);
+		out += LINEBREAK_LEN;
+  	}
+  
+ 	*out = 0;
+
+  return new_string;
+}
+
+
+
+/* Given a string and a length, removes any "Re:" strings from the front.
+   It also deals with that "Re[2]:" thing that some mailers do.
+
+   Returns TRUE if it made a change, FALSE otherwise.
+
+   The string is not altered: the pointer to its head is merely advanced,
+   and the length correspondingly decreased.
+ */
+XP_Bool
+msg_StripRE(const char **stringP, uint32 *lengthP)
+{
+  const char *s, *s_end;
+  const char *last;
+  uint32 L;
+  XP_Bool result = FALSE;
+  XP_ASSERT(stringP);
+  if (!stringP) return FALSE;
+  s = *stringP;
+  L = lengthP ? *lengthP : XP_STRLEN(s);
+
+  s_end = s + L;
+  last = s;
+
+ AGAIN:
+
+  while (s < s_end && XP_IS_SPACE(*s))
+	s++;
+
+  if (s < (s_end-2) &&
+	  (s[0] == 'r' || s[0] == 'R') &&
+	  (s[1] == 'e' || s[1] == 'E'))
+	{
+	  if (s[2] == ':')
+		{
+		  s = s+3;			/* Skip over "Re:" */
+		  result = TRUE;	/* Yes, we stripped it. */
+		  goto AGAIN;		/* Skip whitespace and try again. */
+		}
+	  else if (s[2] == '[' || s[2] == '(')
+		{
+		  const char *s2 = s+3;		/* Skip over "Re[" */
+
+		  /* Skip forward over digits after the "[". */
+		  while (s2 < (s_end-2) && XP_IS_DIGIT(*s2))
+			s2++;
+
+		  /* Now ensure that the following thing is "]:"
+			 Only if it is do we alter `s'.
+		   */
+		  if ((s2[0] == ']' || s2[0] == ')') && s2[1] == ':')
+			{
+			  s = s2+2;			/* Skip over "]:" */
+			  result = TRUE;	/* Yes, we stripped it. */
+			  goto AGAIN;		/* Skip whitespace and try again. */
+			}
+		}
+	}
+
+  /* Decrease length by difference between current ptr and original ptr.
+	 Then store the current ptr back into the caller. */
+  if (lengthP) *lengthP -= (s - (*stringP));
+  *stringP = s;
+
+  return result;
+}
+
+
+
+
+char*
+msg_GetDummyEnvelope(void)
+{
+  static char result[75];
+  char *ct;
+  time_t now = time ((time_t *) 0);
+#if defined (XP_WIN)
+  if (now < 0 || now > 0x7FFFFFFF)
+	  now = 0x7FFFFFFF;
+#endif
+  ct = ctime(&now);
+  XP_ASSERT(ct[24] == CR || ct[24] == LF);
+  ct[24] = 0;
+  /* This value must be in ctime() format, with English abbreviations.
+	 strftime("... %c ...") is no good, because it is localized. */
+  XP_STRCPY(result, "From - ");
+  XP_STRCPY(result + 7, ct);
+  XP_STRCPY(result + 7 + 24, LINEBREAK);
+  return result;
+}
+
+/* #define STRICT_ENVELOPE */
+
+XP_Bool
+msg_IsEnvelopeLine(const char *buf, int32 buf_size)
+{
+#ifdef STRICT_ENVELOPE
+  /* The required format is
+	   From jwz  Fri Jul  1 09:13:09 1994
+	 But we should also allow at least:
+	   From jwz  Fri, Jul 01 09:13:09 1994
+	   From jwz  Fri Jul  1 09:13:09 1994 PST
+	   From jwz  Fri Jul  1 09:13:09 1994 (+0700)
+
+	 We can't easily call XP_ParseTimeString() because the string is not
+	 null terminated (ok, we could copy it after a quick check...) but
+	 XP_ParseTimeString() may be too lenient for our purposes.
+
+	 DANGER!!  The released version of 2.0b1 was (on some systems,
+	 some Unix, some NT, possibly others) writing out envelope lines
+	 like "From - 10/13/95 11:22:33" which STRICT_ENVELOPE will reject!
+   */
+  const char *date, *end;
+
+  if (buf_size < 29) return FALSE;
+  if (*buf != 'F') return FALSE;
+  if (XP_STRNCMP(buf, "From ", 5)) return FALSE;
+
+  end = buf + buf_size;
+  date = buf + 5;
+
+  /* Skip horizontal whitespace between "From " and user name. */
+  while ((*date == ' ' || *date == '\t') && date < end)
+	date++;
+
+  /* If at the end, it doesn't match. */
+  if (XP_IS_SPACE(*date) || date == end)
+	return FALSE;
+
+  /* Skip over user name. */
+  while (!XP_IS_SPACE(*date) && date < end)
+	date++;
+
+  /* Skip horizontal whitespace between user name and date. */
+  while ((*date == ' ' || *date == '\t') && date < end)
+	date++;
+
+  /* Don't want this to be localized. */
+# define TMP_ISALPHA(x) (((x) >= 'A' && (x) <= 'Z') || \
+						 ((x) >= 'a' && (x) <= 'z'))
+
+  /* take off day-of-the-week. */
+  if (date >= end - 3)
+	return FALSE;
+  if (!TMP_ISALPHA(date[0]) || !TMP_ISALPHA(date[1]) || !TMP_ISALPHA(date[2]))
+	return FALSE;
+  date += 3;
+  /* Skip horizontal whitespace (and commas) between dotw and month. */
+  if (*date != ' ' && *date != '\t' && *date != ',')
+	return FALSE;
+  while ((*date == ' ' || *date == '\t' || *date == ',') && date < end)
+	date++;
+
+  /* take off month. */
+  if (date >= end - 3)
+	return FALSE;
+  if (!TMP_ISALPHA(date[0]) || !TMP_ISALPHA(date[1]) || !TMP_ISALPHA(date[2]))
+	return FALSE;
+  date += 3;
+  /* Skip horizontal whitespace between month and dotm. */
+  if (date == end || (*date != ' ' && *date != '\t'))
+	return FALSE;
+  while ((*date == ' ' || *date == '\t') && date < end)
+	date++;
+
+  /* Skip over digits and whitespace. */
+  while (((*date >= '0' && *date <= '9') || *date == ' ' || *date == '\t') &&
+		 date < end)
+	date++;
+  /* Next character should be a colon. */
+  if (date >= end || *date != ':')
+	return FALSE;
+
+  /* Ok, that ought to be enough... */
+
+# undef TMP_ISALPHA
+
+#else  /* !STRICT_ENVELOPE */
+
+  if (buf_size < 5) return FALSE;
+  if (*buf != 'F') return FALSE;
+  if (XP_STRNCMP(buf, "From ", 5)) return FALSE;
+
+#endif /* !STRICT_ENVELOPE */
+
+  return TRUE;
+}
+
+
+
+XP_Bool
+msg_ConfirmMailFile (MWContext *context, const char *file_name)
+{
+  XP_File in = XP_FileOpen (file_name, xpMailFolder, XP_FILE_READ_BIN);
+  char buf[100];
+  char *s = buf;
+  int L;
+  if (!in) return TRUE;
+  L = XP_FileRead(buf, sizeof(buf)-2, in);
+  XP_FileClose (in);
+  if (L < 1) return TRUE;
+  buf[L] = 0;
+  while (XP_IS_SPACE(*s))
+	s++, L--;
+  if (L > 5 && msg_IsEnvelopeLine(s, L))
+	return TRUE;
+  PR_snprintf (buf, sizeof(buf),
+			   XP_GetString (MK_MSG_NON_MAIL_FILE_WRITE_QUESTION), file_name);
+  return FE_Confirm (context, buf);
+}
+
+
+void msg_ClearMessageArea(MWContext* context)
+{
+  /* ###tw  This needs to be replaced by stuff that notifies FE's the
+	 right way */
+#ifndef _USRDLL
+  /* hack.  Open a stream to layout, give it
+	 whitespace (it needs something) and then close it
+	 right away.  This has the effect of getting the front end to
+	 clear out the HTML display area.
+   */
+	NET_StreamClass *stream;
+	static PA_InitData data;
+	URL_Struct *url;
+	if (!context)
+		return;
+
+	data.output_func = LO_ProcessTag;
+	url = NET_CreateURLStruct ("", NET_NORMAL_RELOAD);
+	if (!url) return;
+	stream = PA_BeginParseMDL (FO_PRESENT, &data, url, context);
+	if (stream)
+	{
+		char buf[] = "<BODY></BODY>";
+		int status = (*stream->put_block) (stream, buf, 13);
+		if (status < 0)
+			(*stream->abort) (stream, status);
+		else
+			(*stream->complete) (stream);
+		XP_FREE (stream);
+	}
+	NET_FreeURLStruct (url);
+	FE_SetProgressBarPercent (context, 0);
+#endif
+/* MSG_LoadMessage, with MSG_MESSAGEKEYNONE calls msg_ClearMessageArea, which 
+// has a bug (drawing the background in grey).  So I just changed MSG_LoadMessage() to 
+// do nothing for XP_MAC except set its m_Key to MSG_MESSAGEKEYNONE and exit.  This transfers 
+// the responsibility for clearing the message area to the front end.  So far, so good. 
+// 
+// Now, it's no good just painting the area, because the next refresh will redraw using the 
+// existing history entry.  So somehow we have to remove the history entry. 
+// There's no API for doing this, except calling SHIST_AddDocument with an entry whose 
+// address string is null or empty. 
+// 
+// If this state of affairs changes, this code will break, but I put in asserts to 
+// notify us about it. 98/01/21 
+// --------------------------------------------------------------------------- 
+*/
+#if 0
+	/* It would be nice to do it this way, but we need to cause a refresh in the fe */
+	URL_Struct* url = NET_CreateURLStruct("", NET_NORMAL_RELOAD);
+	History_entry* newEntry; 
+	LO_DiscardDocument(context);
+	XP_ASSERT(url);
+	newEntry = SHIST_CreateHistoryEntry(url, "Nobody Home");
+	XP_FREEIF(url);
+	XP_ASSERT(newEntry);
+	/* Using an empty address string will cause "AddDocument" to do a removal of the old entry,
+	 // then delete the new entry, and exit.
+ */
+	SHIST_AddDocument(context, newEntry);
+#endif
+}
+
+static MSG_HEADER_SET standard_header_set[] = {
+    MSG_TO_HEADER_MASK,
+    MSG_REPLY_TO_HEADER_MASK,
+    MSG_CC_HEADER_MASK,
+    MSG_BCC_HEADER_MASK,
+    MSG_NEWSGROUPS_HEADER_MASK,
+    MSG_FOLLOWUP_TO_HEADER_MASK
+    };
+
+#define TOTAL_HEADERS (sizeof(standard_header_set)/sizeof(MSG_HEADER_SET))
+
+extern int MSG_ExplodeHeaderField(MSG_HEADER_SET msg_header, const char * field, MSG_HeaderEntry ** return_list)
+{
+  XP_ASSERT(return_list);
+  *return_list = NULL;
+  if (field && strlen(field)) {
+    MSG_HeaderEntry *list=NULL;
+    char * name;
+    char * address ;
+    int count;
+
+    count = MSG_ParseRFC822Addresses (field, &name, &address);
+    if (count > 0) {
+      char * address_start = address;
+      char * name_start = name;
+      int i;
+
+      list = (MSG_HeaderEntry*)XP_ALLOC(sizeof(MSG_HeaderEntry)*count);
+      if (!list)
+        return(-1);
+
+      for (i=0; i<count; i++) {
+        list[i].header_type = msg_header;
+        list[i].header_value = XP_STRDUP(address);
+        if (name && strlen(name))
+          list[i].header_value = PR_smprintf("%s <%s>", name, address);
+        else
+          list[i].header_value = XP_STRDUP(address);
+        while (*address != '\0')
+          address++;
+        address++;
+        while (*name != '\0')
+          name++;
+        name++;
+      }
+      if (name)
+        XP_FREE(name_start);
+      if (address)
+        XP_FREE(address_start);
+    }
+    *return_list = list;
+    return count;
+  }
+  return(0);
+}
+
+extern int MSG_CompressHeaderEntries( MSG_HeaderEntry * in_list, int list_size, MSG_HeaderEntry ** return_list)
+{
+  int total = 0;
+  *return_list = NULL;
+  if (in_list != NULL && list_size > 0) {
+    MSG_HeaderEntry * list = NULL;
+    char * new_header_value;
+    int i,j;
+
+    for (i=0; i<TOTAL_HEADERS; i++) {
+      new_header_value = NULL;
+      for (j=0; j<list_size; j++) {
+	    if (in_list[j].header_type == standard_header_set[i]) {
+		  XP_Bool zero_init = FALSE;
+		  int header_length = 0;
+		  if (!new_header_value)
+		    zero_init = TRUE;
+          else
+		    header_length = XP_STRLEN(new_header_value)+1;
+          if (XP_STRLEN(in_list[j].header_value) == 0)
+              continue;
+		  new_header_value = (char*)XP_REALLOC(
+		    new_header_value,
+            header_length+XP_STRLEN(in_list[j].header_value)+XP_STRLEN(",")+1);
+		  if (new_header_value == NULL) {
+		    if (list != NULL) 
+			  XP_FREE(list);
+              /* don't forget to free up previous header_value entries */
+            return(-1);
+          }
+          if (zero_init)
+            new_header_value[0]='\0';
+          if (new_header_value && XP_STRLEN(new_header_value))
+		    XP_STRCAT(new_header_value,",");
+          XP_STRCAT(new_header_value,in_list[j].header_value);
+        }
+      }
+      if (new_header_value) {
+        total++;
+        list = (MSG_HeaderEntry *)XP_REALLOC(list,total*sizeof(MSG_HeaderEntry));
+	    if (list==NULL) {
+	      if (new_header_value)
+	       XP_FREE(new_header_value);
+          return(-1);
+        }
+        list[total-1].header_type = standard_header_set[i];
+        list[total-1].header_value = new_header_value;
+      }
+    }
+    *return_list = list;
+  }
+  return(total);
+}
+
+
+
+static int
+msg_qsort_domains(const void* a, const void* b)
+{
+	return XP_STRCMP(*((const char**) a), *((const char**) b));
+}
+
+
+static int
+msg_generate_domains_list(char* domainlist, int* numfound, char*** returnlist)
+{
+	int num;
+	int i;
+	int j;
+	char* ptr;
+	char* endptr;
+	char** list = NULL;
+	for (num=0 , ptr = domainlist ; ptr ; num++, ptr = endptr) {
+		endptr = XP_STRCHR(ptr, ',');
+		if (endptr) endptr++;
+	}
+	if (num > 0) {
+		list = (char**) XP_CALLOC(num, sizeof(char*));
+		if (!list) return MK_OUT_OF_MEMORY;
+		for (i=0 , ptr = domainlist ; ptr ; i++, ptr = endptr) {
+			endptr = XP_STRCHR(ptr, ',');
+			if (endptr) *endptr++ = '\0';
+			XP_ASSERT(i < num);
+			if (i < num) list[i] = ptr;
+		}
+		XP_QSORT(list, num, sizeof(char*), msg_qsort_domains);
+		/* Now, remove any empty entries or duplicates. */
+		for (i=0, j=0 ; i<num ; i++) {
+			ptr = list[i];
+			if (ptr && (j == 0 || XP_STRCMP(ptr, list[j - 1]) != 0)) {
+				list[j++] = ptr;
+			}
+		}
+		num = j;
+	}
+	*numfound = num;
+	*returnlist = list;
+	return 0;
+}
+
+
+static PRBool
+HTMLDomainsDialogDone(XPDialogState* state, char** argv, int argc,
+					  unsigned int button)
+{
+	char* domainlist = NULL;
+	char* gone;
+	char* ptr;
+	char* endptr;
+	char** list = NULL;
+	int num;
+	int i;
+	int status;
+
+	if (button != XP_DIALOG_OK_BUTTON) return PR_FALSE;
+	PREF_CopyCharPref("mail.htmldomains", &domainlist);
+	if (!domainlist || !*domainlist) return PR_FALSE;
+	gone = XP_FindValueInArgs("gone", argv, argc);
+	XP_ASSERT(gone);
+	if (!gone || !*gone) return PR_FALSE;
+
+	status = msg_generate_domains_list(domainlist, &num, &list);
+	if (status < 0) goto FAIL;
+
+	for (ptr = gone ; ptr ; ptr = endptr) {
+		endptr = XP_STRCHR(ptr, ',');
+		if (endptr) *endptr++ = '\0';
+		if (*ptr) {
+			i = atoi(ptr);
+			XP_ASSERT(i >= 0 && i < num);
+			if (i >= 0 && i < num) {
+				XP_ASSERT(list[i]);
+				list[i] = NULL;
+			}
+		}
+	}
+	ptr = NULL;
+	for (i=0 ; i<num ; i++) {
+		if (list[i]) {
+			if (ptr) StrAllocCat(ptr, ",");
+			StrAllocCat(ptr, list[i]);
+		}
+	}
+	PREF_SetCharPref("mail.htmldomains", ptr ? ptr : "");
+	PREF_SavePrefFile();
+	FREEIF(ptr);
+
+FAIL:
+	FREEIF(list);
+	FREEIF(domainlist);
+	
+	return PR_FALSE;
+}
+
+
+int
+MSG_DisplayHTMLDomainsDialog(MWContext* context)
+{
+	static XPDialogInfo dialogInfo = {
+		XP_DIALOG_OK_BUTTON | XP_DIALOG_CANCEL_BUTTON,
+		HTMLDomainsDialogDone,
+		600,
+		440
+	};
+	int status = 0;
+	char* domainlist;
+	char* list = NULL;
+	char* tmp;
+	XPDialogStrings* strings;
+	int i;
+	int num = 0;
+	char** array = NULL;
+
+	PREF_CopyCharPref("mail.htmldomains", &domainlist);
+
+	status = msg_generate_domains_list(domainlist, &num, &array);
+	if (status < 0) goto FAIL;
+
+	for (i=0 ; i<num ; i++) {
+		tmp = PR_smprintf("<option value=%d>%s\n", i, array[i]);
+		if (!tmp) {
+			status = MK_OUT_OF_MEMORY;
+			goto FAIL;
+		}
+		StrAllocCat(list, tmp);
+		XP_FREE(tmp);
+	}
+
+	strings = XP_GetDialogStrings(MK_MSG_HTML_DOMAINS_DIALOG);
+	if (!strings) {
+		status = MK_OUT_OF_MEMORY;
+		goto FAIL;
+	}
+	XP_CopyDialogString(strings, 0, list ? list : "");
+	XP_MakeHTMLDialog(context, &dialogInfo, MK_MSG_HTML_DOMAINS_DIALOG_TITLE,
+					  strings, NULL,PR_FALSE);
+
+
+FAIL:
+	FREEIF(array);
+	FREEIF(domainlist);
+	FREEIF(list);
+	return status;
+}
+
+/* 
+ * Does in-place modification of input param to conform with son-of-1036 rules
+ *
+ * A newsgroup component is one portion of the newsgroup name, separated by
+ * dots. So mcom.dev.fouroh has three newsgroup components. This function is
+ * only concerned with one component because that's what we need for virtual
+ * newsgroups.
+ */
+void msg_MakeLegalNewsgroupComponent (char *name)
+{
+	int i = 0;
+	char ch;
+
+	while ((ch = name[i]) != '\0')
+	{
+		/* legal chars are 0-9,a-z, and +,-,_ */
+
+		if (!(ch >= '0' && ch <= '9'))
+			if (!(ch >= 'a' && ch <= 'z'))
+				if (!(ch == '+' || ch == '-' || ch == '_'))
+				{
+					/* ch is illegal. We can lowercase an uppercase letter
+					 * but everything else goes to some legal char, like '_'
+					 */
+					if (ch >= 'A' && ch <= 'Z')
+						name[i] += 32;
+					else
+						name[i] = '_';
+				}
+		i++;
+
+		/* a newsgroup component is limited to 14 chars */
+		if (i > 13)
+		{
+			name[i] = '\0';
+			break;
+		}
+	}
+}
+
+void MSG_SetPercentProgress(MWContext *context, int32 numerator, int32 denominator)
+{
+	XP_ASSERT(numerator <= denominator && numerator >= 0 && denominator > 0);
+	if (numerator > denominator || numerator < 0 || denominator < 0)
+	{
+		FE_SetProgressBarPercent(context, -1);
+	}
+	else if (denominator > 0)
+	{
+		int32 percent;
+		if (denominator > 100L)
+			percent = (numerator / (denominator / 100L));
+		else
+			percent = (100L * numerator) / denominator;
+		FE_SetProgressBarPercent (context, percent);
+	}
+}
+
+const char* MSG_FormatDateFromContext(MWContext *context, time_t date) 
+{
+  /* fix i18n.  Well, maybe.  Isn't strftime() supposed to be i18n? */
+  /* ftong- Well.... strftime() in Mac and Window is not really i18n 		*/
+  /* We need to use XP_StrfTime instead of strftime 						*/
+  static char result[40];	/* 30 probably not enough */
+  time_t now = time ((time_t *) 0);
+
+  int32 offset = XP_LocalZoneOffset() * 60L; /* Number of seconds between
+											 local and GMT. */
+
+  int32 secsperday = 24L * 60L * 60L;
+
+  int32 nowday = (now + offset) / secsperday;
+  int32 day = (date + offset) / secsperday;
+
+  if (day == nowday) {
+	XP_StrfTime(context, result, sizeof(result), XP_TIME_FORMAT,
+				localtime(&date));
+  } else if (day < nowday && day > nowday - 7) {
+	XP_StrfTime(context, result, sizeof(result), XP_WEEKDAY_TIME_FORMAT,
+				localtime(&date));
+  } else {
+#if defined (XP_WIN)
+  if (date < 0 || date > 0x7FFFFFFF)
+	date = 0x7FFFFFFF;
+#endif
+  XP_StrfTime(context, result, sizeof(result), XP_DATE_TIME_FORMAT,
+				localtime(&date));
+  }
+
+  return result;
+}
+
diff --git a/mozilla/lib/mailto/msgutils.h b/mozilla/lib/mailto/msgutils.h
new file mode 100644
index 00000000000..eaaef343e0c
--- /dev/null
+++ b/mozilla/lib/mailto/msgutils.h
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*   msgutils.h --- various and sundry
+ */
+
+XP_BEGIN_PROTOS
+
+/* Interface to FE_GetURL, which should never be called directly by anything
+   else in libmsg.  The "issafe" argument is TRUE if this is a URL which we
+   consider very safe, and will never screw up or be screwed by any activity
+   going on in the foreground.  Be very very sure of yourself before ever
+   passing TRUE to the "issafe" argument. */
+
+extern int msg_GetURL(MWContext* context, URL_Struct* url, XP_Bool issafe);
+
+
+/* Interface to XP_InterruptContext(), which should never be called directly
+   by anything else in libmsg.  The "safetoo" argument is TRUE if we really
+   want to interrupt everything, even "safe" background streams.  In most
+   cases, it should be False.*/
+
+extern void msg_InterruptContext(MWContext* context, XP_Bool safetoo);
+
+
+
+extern int msg_GrowBuffer (uint32 desired_size,
+						   uint32 element_size, uint32 quantum,
+						   char **buffer, uint32 *size);
+
+extern int msg_LineBuffer (const char *net_buffer, int32 net_buffer_size,
+						   char **bufferP, uint32 *buffer_sizeP,
+						   uint32 *buffer_fpP,
+						   XP_Bool convert_newlines_p,
+						   int32 (*per_line_fn) (char *line, uint32
+												 line_length, void *closure),
+						   void *closure);
+						   
+extern int msg_ReBuffer (const char *net_buffer, int32 net_buffer_size,
+						 uint32 desired_buffer_size,
+						 char **bufferP, uint32 *buffer_sizeP,
+						 uint32 *buffer_fpP,
+						 int32 (*per_buffer_fn) (char *buffer,
+												 uint32 buffer_size,
+												 void *closure),
+						 void *closure);
+
+extern NET_StreamClass *msg_MakeRebufferingStream (NET_StreamClass *next,
+												   URL_Struct *url,
+												   MWContext *context);
+
+/* Given a string and a length, removes any "Re:" strings from the front.
+   (If the length is not given, then XP_STRLEN() is used on the string.)
+   It also deals with that "Re[2]:" thing that some mailers do.
+
+   Returns TRUE if it made a change, FALSE otherwise.
+
+   The string is not altered: the pointer to its head is merely advanced,
+   and the length correspondingly decreased.
+ */
+extern XP_Bool msg_StripRE(const char **stringP, uint32 *lengthP);
+
+/* 
+ * Does in-place modification of input param to conform with son-of-1036 rules
+ */
+extern void msg_MakeLegalNewsgroupComponent (char *name);
+
+extern void MSG_SetPercentProgress(MWContext *context, int32 numerator, int32 denominator);
+
+XP_END_PROTOS
diff --git a/mozilla/lib/mailto/msgzap.cpp b/mozilla/lib/mailto/msgzap.cpp
new file mode 100644
index 00000000000..bd36c72c964
--- /dev/null
+++ b/mozilla/lib/mailto/msgzap.cpp
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "msg.h"
+#include "xp_mcom.h"
+#include "msgzap.h"
+
+#if defined(XP_OS2) && defined(__DEBUG_ALLOC__)
+void* MSG_ZapIt::operator new(size_t size, const char *file, size_t line) {
+  void* rv = ::operator new(size, file, line);
+  if (rv) {
+    XP_MEMSET(rv, 0, size);
+  }
+  return rv;
+}
+#else
+void* MSG_ZapIt::operator new(size_t size) {
+  void* rv = ::operator new(size);
+  if (rv) {
+    XP_MEMSET(rv, 0, size);
+  }
+  return rv;
+}
+
+#endif
diff --git a/mozilla/lib/mailto/msgzap.h b/mozilla/lib/mailto/msgzap.h
new file mode 100644
index 00000000000..0ddcc77a9dc
--- /dev/null
+++ b/mozilla/lib/mailto/msgzap.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _MsgZap_H_
+#define _MsgZap_H_
+
+// The whole purpose of this class is to redefine operator new for any subclass
+// so that it will automatically zero out the whole class for me; thanks.
+
+class MSG_ZapIt {
+public:
+#if defined(XP_OS2) && defined(__DEBUG_ALLOC__)
+  static void* operator new(size_t size, const char *file, size_t line);
+#else
+  static void* operator new(size_t size);
+#endif
+};
+
+
+
+#endif /* _MsgZap_H_ */
diff --git a/mozilla/lib/mailto/ptrarray.cpp b/mozilla/lib/mailto/ptrarray.cpp
new file mode 100644
index 00000000000..7b8ea17b4fb
--- /dev/null
+++ b/mozilla/lib/mailto/ptrarray.cpp
@@ -0,0 +1,525 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "msg.h"
+#include "xp.h"
+#include "ptrarray.h"
+#include "xp_qsort.h"
+
+#ifdef XP_WIN16
+#define SIZE_T_MAX    0xFF80		            // Maximum allocation size
+#define MAX_ARR_ELEMS SIZE_T_MAX/sizeof(void *)
+#endif
+
+
+XPPtrArray::XPPtrArray()
+{
+	m_nSize = 0;
+	m_nMaxSize = 0;
+	m_pData = NULL;
+}
+
+XPPtrArray::~XPPtrArray()
+{
+	SetSize(0);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+int XPPtrArray::GetSize() const
+{
+	return m_nSize;
+}
+
+XP_Bool XPPtrArray::IsValidIndex(int32 nIndex)
+{
+	return (nIndex < GetSize() && nIndex >= 0);
+}
+
+XP_Bool XPPtrArray::SetSize(int nSize)
+{
+	XP_ASSERT(nSize >= 0);
+#ifdef MAX_ARR_ELEMS
+	if (nSize > MAX_ARR_ELEMS);
+	{
+		XP_ASSERT(nSize <= MAX_ARR_ELEMS); // Will fail
+		return FALSE;
+	}
+#endif
+
+	if (nSize == 0)
+	{
+		// Remove all elements
+		XP_FREE(m_pData);
+		m_nSize = 0;
+		m_nMaxSize = 0;
+		m_pData = NULL;
+	}
+	else if (m_pData == NULL)
+	{
+		// Create a new array
+		m_nMaxSize = MAX(8, nSize);
+		m_pData = (void **)XP_CALLOC(1, m_nMaxSize * sizeof(void *));
+		if (m_pData)
+			m_nSize = nSize;
+		else
+			m_nSize = m_nMaxSize = 0;
+	}
+	else if (nSize <= m_nMaxSize)
+	{
+		// The new size is within the current maximum size, make sure new
+		// elements are initialized to zero
+		if (nSize > m_nSize)
+			XP_MEMSET(&m_pData[m_nSize], 0, (nSize - m_nSize) * sizeof(void *));
+
+		m_nSize = nSize;
+	}
+	else
+	{
+		// The array needs to grow, figure out how much
+		int nGrowBy, nMaxSize;
+		nGrowBy  = MIN(1024, MAX(8, m_nSize / 8));
+		nMaxSize = MAX(nSize, m_nMaxSize + nGrowBy);
+#ifdef MAX_ARR_ELEMS
+		nMaxSize = MIN(MAX_ARR_ELEMS, nMaxSize);
+#endif
+
+		void **pNewData = (void **)XP_ALLOC(nMaxSize * sizeof(void *));
+		if (pNewData)
+		{
+			// Copy the data from the old array to the new one
+			XP_MEMCPY(pNewData, m_pData, m_nSize * sizeof(void *));
+
+			// Zero out the remaining elements
+			XP_MEMSET(&pNewData[m_nSize], 0, (nSize - m_nSize) * sizeof(void *));
+			m_nSize = nSize;
+			m_nMaxSize = nMaxSize;
+
+			// Free the old array
+			XP_FREE(m_pData);
+			m_pData = pNewData;
+		}
+	}
+
+	return nSize == m_nSize;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void*& XPPtrArray::ElementAt(int nIndex)
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	return m_pData[nIndex];
+}
+
+int XPPtrArray::FindIndex (int nStartIndex, void *pToFind) const
+{
+	for (int i = nStartIndex; i < GetSize(); i++)
+		if (m_pData[i] == pToFind)
+			return i;
+	return -1;
+}
+
+int XPPtrArray::FindIndexUsing(int nStartIndex, void* pToFind, XPCompareFunc* compare) const
+{
+	for (int i = nStartIndex; i < GetSize(); i++)
+		if (compare(&m_pData[i], &pToFind) == 0)
+			return i;
+	return -1;
+}
+
+void *XPPtrArray::GetAt(int nIndex) const
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	return m_pData[nIndex];
+}
+
+void XPPtrArray::SetAt(int nIndex, void *newElement)
+{
+	XP_ASSERT(nIndex >= 0 && nIndex < m_nSize);
+	m_pData[nIndex] = newElement;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+int XPPtrArray::Add(void *newElement)
+{
+	int nIndex = m_nSize;
+
+#ifdef MAX_ARR_ELEMS
+	if (nIndex >= MAX_ARR_ELEMS) 
+		return -1;	     
+#endif			
+
+	SetAtGrow(nIndex, newElement);
+	return nIndex;
+}
+
+void XPPtrArray::InsertAt(int nIndex, void *newElement, int nCount)
+{
+	XP_ASSERT(nIndex >= 0);
+	XP_ASSERT(nCount > 0);
+
+	if (nIndex >= m_nSize)
+	{
+		// If the new element is after the end of the array, grow the array
+		SetSize(nIndex + nCount);
+	}
+	else
+	{
+		// The element is being insert inside the array
+		int nOldSize = m_nSize;
+		SetSize(m_nSize + nCount);
+
+		// Move the data after the insertion point
+		XP_MEMMOVE(&m_pData[nIndex + nCount], &m_pData[nIndex],
+			       (nOldSize - nIndex) * sizeof(void *));
+	}
+
+	// Insert the new elements
+	XP_ASSERT(nIndex + nCount <= m_nSize);
+	while (nCount--)
+		m_pData[nIndex++] = newElement;
+}
+
+void XPPtrArray::InsertAt(int nStartIndex, const XPPtrArray *pNewArray)
+{
+	XP_ASSERT(nStartIndex >= 0);
+	XP_ASSERT(pNewArray != NULL);
+
+	if (pNewArray->GetSize() > 0)
+	{
+		InsertAt(nStartIndex, pNewArray->GetAt(0), pNewArray->GetSize());
+		for (int i = 1; i < pNewArray->GetSize(); i++)
+			m_pData[nStartIndex + i] = pNewArray->GetAt(i);
+	}
+}
+
+XP_Bool XPPtrArray::Remove(void *pToRemove)
+{
+	int index = FindIndex(0, pToRemove);
+	if (index != -1)
+	{
+		RemoveAt(index);
+		return TRUE;
+	}
+	else
+		return FALSE;
+}
+
+void XPPtrArray::RemoveAll()
+{
+	SetSize(0);
+}
+
+void XPPtrArray::RemoveAt(int nIndex, int nCount)
+{
+	XP_ASSERT(nIndex >= 0);
+	XP_ASSERT(nIndex + nCount <= m_nSize);
+
+	if (nCount > 0)
+	{
+		// Make sure not to overstep the end of the array
+		int nMoveCount = m_nSize - (nIndex + nCount);
+		if (nCount && nMoveCount)
+			XP_MEMMOVE(&m_pData[nIndex], &m_pData[nIndex + nCount],
+		               nMoveCount * sizeof(void*));
+
+		m_nSize -= nCount;
+	}
+}
+
+void XPPtrArray::RemoveAt(int nStartIndex, const XPPtrArray *pArray)
+{
+	XP_ASSERT(nStartIndex >= 0);
+	XP_ASSERT(pArray != NULL);
+
+	for (int i = 0; i < pArray->GetSize(); i++)
+	{
+		int index = FindIndex(nStartIndex, pArray->GetAt(i));
+		if (index >= 0)
+			RemoveAt(index);
+	}
+}
+
+void XPPtrArray::SetAtGrow(int nIndex, void *newElement)
+{
+	XP_ASSERT(nIndex >= 0);
+
+	if (nIndex >= m_nSize)
+		SetSize(nIndex+1);
+	m_pData[nIndex] = newElement;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+int XPPtrArray::InsertBinary(void *newElement, int ( *compare )(const void *elem1, const void *elem2))
+{
+	int		current = 0;
+	int		left = 0;
+	int		right = GetSize() - 1;
+	int		comparison = 0;
+	
+	while (left <= right)
+	{
+		current = (left + right) / 2;
+		
+		void *pCurrent = GetAt(current);
+		comparison = compare(&pCurrent, &newElement);
+										  
+		if (comparison == 0)
+			break;
+		else if (comparison > 0)
+			right = current - 1;
+		else
+			left = current + 1;
+	}
+	
+	if (comparison < 0)
+		current += 1;
+	
+	XPPtrArray::InsertAt(current, newElement);
+	return current;
+}
+
+void XPPtrArray::QuickSort (int ( *compare )(const void *elem1, const void *elem2))
+{
+	if (m_nSize > 1)
+		XP_QSORT (m_pData, m_nSize, sizeof(void*), compare);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void *XPPtrArray::operator[](int nIndex) const
+{
+	return GetAt(nIndex);
+}
+
+void *&XPPtrArray::operator[](int nIndex)
+{
+	return ElementAt(nIndex);
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// XPSortedPtrArray
+
+XPSortedPtrArray::XPSortedPtrArray(XPCompareFunc *compare)
+                 :XPPtrArray()
+{
+	m_CompareFunc = compare;
+}
+
+int XPSortedPtrArray::Add(void *newElement)
+{
+#ifdef MAX_ARR_ELEMS
+	if (m_nSize >= MAX_ARR_ELEMS) 
+		return -1;	     
+#endif			
+	if (m_CompareFunc)
+		return InsertBinary(newElement, m_CompareFunc);
+	else
+		return XPPtrArray::Add (newElement);
+}
+
+int XPSortedPtrArray::FindIndex(int nStartIndex, void *pToFind) const
+{
+	if (m_CompareFunc)
+		return FindIndexUsing(nStartIndex, pToFind, m_CompareFunc);
+	else
+		return XPPtrArray::FindIndex(nStartIndex, pToFind);
+}
+
+int XPSortedPtrArray::FindIndexUsing(int nStartIndex, void *pToFind, XPCompareFunc *compare) const
+{
+	if (GetSize() == 0)
+		return -1;
+	if (!m_CompareFunc)
+		return TRUE;
+
+	int current = 0;
+	int left = nStartIndex;
+	int right = GetSize() - 1;
+	int comparison = 0;
+	
+	while (left <= right)
+	{
+		current = (left + right) / 2;
+		
+		void *pCurrent = GetAt(current);
+		comparison = compare(&pCurrent, &pToFind);
+										  
+		if (comparison == 0)
+			break;
+		else if (comparison > 0)
+			right = current - 1;
+		else
+			left = current + 1;
+	}
+	
+	if (comparison != 0)
+		current = -1;
+	
+	return current;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+//-----------------------------------
+// These functions are not to be called if the array is sorted (i.e. has a compare func)
+//-----------------------------------
+
+void XPSortedPtrArray::SetAt(int index, void *newElement)
+{ 
+	if (!m_CompareFunc)
+		XPPtrArray::SetAt (index, newElement);
+	else
+		XP_ASSERT(FALSE); // Illegal operation because the array is sorted
+}
+
+
+void XPSortedPtrArray::InsertAt(int index, void *newElement, int count)
+{ 
+	if (!m_CompareFunc)
+		XPPtrArray::InsertAt (index, newElement, count);
+	else
+		XP_ASSERT(FALSE); // Illegal operation because the array is sorted
+}
+
+
+void XPSortedPtrArray::InsertAt(int index, const XPPtrArray *array)
+{ 
+	if (!m_CompareFunc)
+		XPPtrArray::InsertAt (index, array);
+	else
+		XP_ASSERT(FALSE); // Illegal operation because the array is sorted
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Diagnostics
+
+#ifdef DEBUG
+XP_Bool XPPtrArray::VerifySort() const
+{
+	return TRUE;
+}
+
+XP_Bool XPSortedPtrArray::VerifySort() const
+{
+	// Check that the assumption of sorting in the array is valid.
+	if (GetSize() > 0 && m_CompareFunc)
+	{
+	    void *cur =  GetAt(0);
+	    for (int i = 1; i < GetSize(); i++)
+		{
+			void *prev = cur;
+			cur = GetAt(i);
+			if (m_CompareFunc(&cur, &prev) < 0)
+			{
+				XP_ASSERT(FALSE);
+				return FALSE;
+			}
+		}
+	}
+	
+	return TRUE;
+}
+#endif
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+
+msg_StringArray::msg_StringArray(XP_Bool ownsMemory, XPCompareFunc *compare)
+                :XPSortedPtrArray(compare)
+{
+	m_ownsMemory = ownsMemory;
+}
+
+msg_StringArray::~msg_StringArray()
+{
+	RemoveAll();
+}
+
+int msg_StringArray::Add(void *string)
+{
+	return XPPtrArray::Add(m_ownsMemory ? XP_STRDUP((char *)string) : string);
+}
+
+void msg_StringArray::RemoveAll()
+{
+    if (m_ownsMemory)
+    {
+        for (int i = 0; i < GetSize(); i++)
+        {
+            void *v = (void *)GetAt(i);
+            XP_FREEIF(v);
+        }
+    }
+    XPSortedPtrArray::RemoveAll(); // call the base class to shrink m_pData list
+}
+
+XP_Bool msg_StringArray::ImportTokenList(const char *list, const char *tokenSeparators /* = " ," */)
+{
+	// Tokenizes the input string and builds up the array of strings based on the 
+	// optional caller-provided token separators. 
+
+	XP_ASSERT(m_ownsMemory); // must own the memory for the substrings
+	if (list && m_ownsMemory)
+	{
+		char *scratch = XP_STRDUP(list); // make a copy cause strtok will change it
+		if (scratch)
+		{
+			char *elem = XP_STRTOK(scratch, tokenSeparators);
+			if (elem)
+			{
+				Add (elem);
+				while (NULL != (elem = XP_STRTOK(NULL, tokenSeparators)))
+					Add (elem);
+			}
+			XP_FREE(scratch);
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+char *msg_StringArray::ExportTokenList(const char *separator /* = " ," */)
+{
+	// Catenates all the member strings into a big string separated by optional
+	// caller-provided string. The return value must be freed by the caller
+
+	int i, len = 0;
+	int lenSep = XP_STRLEN(separator);
+
+	for (i = 0; i < GetSize(); i++)
+		len += XP_STRLEN(GetAt(i)) + lenSep;
+
+	char *list = (char *)XP_ALLOC(len + 1);
+	if (list)
+	{
+		*list = '\0';
+		for (i = 0; i < GetSize(); i++)
+		{
+			if (i > 0)
+				XP_STRCAT(list, separator);
+			XP_STRCAT(list, GetAt(i));
+		}
+	}
+	return list;
+}
diff --git a/mozilla/lib/mailto/ptrarray.h b/mozilla/lib/mailto/ptrarray.h
new file mode 100644
index 00000000000..1d6fc49722a
--- /dev/null
+++ b/mozilla/lib/mailto/ptrarray.h
@@ -0,0 +1,160 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+// ptrarray.h
+#ifndef PTR_ARRAY_H_
+#define PTR_ARRAY_H_
+
+#ifdef XP_UNIX
+#define __cdecl
+#endif
+
+typedef int XPCompareFunc(const void *, const void *);
+
+#ifdef DEBUG
+// These are here to stop people calling
+#define VIRTUAL virtual
+#else
+#define VIRTUAL
+#endif // DEBUG
+
+
+//*****************************************************************************
+
+class XPPtrArray 
+{
+public:
+	// Construction/destruction
+	                           XPPtrArray();
+	virtual                    ~XPPtrArray();
+
+	// State/attribute member functions
+	        int                GetSize() const;
+	        XP_Bool            IsValidIndex(int32 nIndex);
+	VIRTUAL XP_Bool            SetSize(int nNewSize);
+
+	// Accessor member functions
+	        void             *&ElementAt(int nIndex);
+	virtual int                FindIndex (int nStartIndex, void *pToFind) const;
+ 	virtual int                FindIndexUsing(int nStartIndex, void *pToFind, XPCompareFunc* compare) const;
+	        void              *GetAt(int nIndex) const;
+	VIRTUAL void               SetAt(int nIndex, void *newElement);
+
+	// Insertion/deletion member functions
+	virtual int                Add(void *newElement);
+	VIRTUAL void	           InsertAt(int nIndex, void *newElement, int nCount = 1);
+	VIRTUAL void               InsertAt(int nStartIndex, const XPPtrArray *pNewArray);
+	        XP_Bool            Remove(void *pToRemove);
+	virtual void               RemoveAll();
+	        void               RemoveAt(int nIndex, int nCount = 1);
+	        void               RemoveAt(int nStartIndex, const XPPtrArray *pNewArray);
+	VIRTUAL void               SetAtGrow(int nIndex, void *newElement);
+
+	// Sorting member functions
+	        int                InsertBinary(void *newElement, XPCompareFunc *compare);
+	        void               QuickSort(XPCompareFunc *compare);
+
+	// Overloaded operators
+	        void              *operator[](int nIndex) const;
+	        void             *&operator[](int nIndex);
+
+#ifdef DEBUG
+	virtual XP_Bool            VerifySort() const;
+#endif
+
+protected:
+	// Member Variables
+	int    m_nSize;
+	int    m_nMaxSize;
+	void **m_pData;
+};
+
+//*****************************************************************************
+
+class XPSortedPtrArray : public XPPtrArray
+{
+public:
+	                           XPSortedPtrArray(XPCompareFunc *compare);
+
+	virtual int                Add(void *newElement);
+
+	// PROMISE: this class will always call the compare-func with pToFind as the
+	//			second parameter.
+	virtual int                FindIndex(int nStartIndex, void *pToFind) const;
+
+    // These functions can only be used on non-sorted PtrArray objects (i.e. compareFunc is NULL)
+	virtual void               SetAt(int nIndex, void* newElement);
+	virtual void               InsertAt(int nIndex, void* newElement, int nCount = 1);
+	virtual void               InsertAt(int nStartIndex, const XPPtrArray* pNewArray);
+
+#ifdef DEBUG
+	virtual XP_Bool            VerifySort() const;
+#endif
+
+protected:
+	// Allows search to use a different compare func from the sort.  This is used
+	// by MSG_FolderCache, to find the cache element corresponding to a folder.
+	// The corresponding element and folder have identical relative paths, and the
+	// relative path is used by both compare funcs, which is why it works.
+	// to the found element
+	int                        FindIndexUsing(int nStartIndex, void *pToFind,
+                                              XPCompareFunc *compare) const;
+
+	// Member Variables
+	XPCompareFunc*	m_CompareFunc; // NULL to simulate unsorted base-class.
+};
+
+//*****************************************************************************
+
+// msg_StringArray is a subclass of the generic pointer array class
+// which is intended for string operations. 
+// - It can "own" the strings, or not.
+// - It can be sorted, if you provide a CompareFunc, or not, if you don't
+
+class msg_StringArray : public XPSortedPtrArray
+{
+public:
+	// Overrides from base class
+	msg_StringArray (XP_Bool ownsMemory, XPCompareFunc *compare = NULL); 
+	virtual ~msg_StringArray ();
+
+	const char *GetAt (int i) const { return (const char*) XPPtrArray::GetAt(i); }
+	virtual int Add (void *string);
+	virtual void RemoveAll ();
+
+	XP_Bool ImportTokenList (const char *list, const char *tokenSeps = ", ");
+	char *ExportTokenList (const char *tokenSep = ", ");
+
+protected:
+	XP_Bool m_ownsMemory;
+};
+
+//*****************************************************************************
+
+class MSG_FolderInfo;
+
+class MSG_FolderArray : public XPSortedPtrArray
+{
+public:
+	// Override constructor to allow folderArrays to be sorted
+	MSG_FolderArray (XPCompareFunc *compare = NULL) : XPSortedPtrArray (compare) {}
+
+	// Encapsulate this typecast, so we don't have to do it all over the place.
+	MSG_FolderInfo *GetAt(int i) const { return (MSG_FolderInfo*) XPPtrArray::GetAt(i); }
+};
+
+#endif