diff --git a/mozilla/mailnews/mime/src/mimevcrd.c b/mozilla/mailnews/mime/src/mimevcrd.c
deleted file mode 100644
index 2eeb6d5ae51..00000000000
--- a/mozilla/mailnews/mime/src/mimevcrd.c
+++ /dev/null
@@ -1,1739 +0,0 @@
-/* -*- 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 "mimevcrd.h"
-#include "xpgetstr.h"
-#include "xp_core.h"
-#include "xp_mem.h"
-#include "vcc.h"
-#include "vobject.h"
-#include "libi18n.h"
-
-#include "prmem.h"
-#include "plstr.h"
-
-#define MIME_SUPERCLASS mimeInlineTextClass
-MimeDefClass(MimeInlineTextVCard, MimeInlineTextVCardClass,
-			 mimeInlineTextVCardClass, &MIME_SUPERCLASS);
-
-static int MimeInlineTextVCard_parse_line (char *, PRInt32, MimeObject *);
-static int MimeInlineTextVCard_parse_eof (MimeObject *, PRBool);
-static int MimeInlineTextVCard_parse_begin (MimeObject *obj);
-
-static int unique = 0;
-
-extern int MK_OUT_OF_MEMORY;
-
-extern int MK_LDAP_COMMON_NAME;   
-extern int MK_LDAP_FAX_NUMBER;    
-extern int MK_LDAP_GIVEN_NAME;    
-extern int MK_LDAP_LOCALITY;      
-extern int MK_LDAP_PHOTOGRAPH;    
-extern int MK_LDAP_EMAIL_ADDRESS; 
-extern int MK_LDAP_MANAGER;       
-extern int MK_LDAP_ORGANIZATION;  
-extern int MK_LDAP_OBJECT_CLASS;  
-extern int MK_LDAP_ORG_UNIT;      
-extern int MK_LDAP_POSTAL_ADDRESS;
-extern int MK_LDAP_SECRETARY;     
-extern int MK_LDAP_SURNAME;       
-extern int MK_LDAP_STREET;        
-extern int MK_LDAP_PHONE_NUMBER;  
-extern int MK_LDAP_CAR_LICENSE;
-extern int MK_LDAP_BUSINESS_CAT;
-extern int MK_LDAP_DEPT_NUMBER;
-extern int MK_LDAP_DESCRIPTION;
-extern int MK_LDAP_EMPLOYEE_TYPE;
-extern int MK_LDAP_POSTAL_CODE;
-extern int MK_LDAP_TITLE;
-extern int MK_LDAP_REGION;
-extern int MK_LDAP_DOM_TYPE;
-extern int MK_LDAP_INTL_TYPE;
-extern int MK_LDAP_POSTAL_TYPE;
-extern int MK_LDAP_PARCEL_TYPE;
-extern int MK_LDAP_WORK_TYPE;
-extern int MK_LDAP_HOME_TYPE;
-extern int MK_LDAP_PREF_TYPE;
-extern int MK_LDAP_VOICE_TYPE;
-extern int MK_LDAP_FAX_TYPE;
-extern int MK_LDAP_MSG_TYPE;
-extern int MK_LDAP_CELL_TYPE;
-extern int MK_LDAP_PAGER_TYPE;
-extern int MK_LDAP_BBS_TYPE;
-extern int MK_LDAP_MODEM_TYPE;
-extern int MK_LDAP_CAR_TYPE;
-extern int MK_LDAP_ISDN_TYPE;
-extern int MK_LDAP_VIDEO_TYPE;
-extern int MK_LDAP_AOL_TYPE;
-extern int MK_LDAP_APPLELINK_TYPE;
-extern int MK_LDAP_ATTMAIL_TYPE;
-extern int MK_LDAP_CSI_TYPE;
-extern int MK_LDAP_EWORLD_TYPE;
-extern int MK_LDAP_INTERNET_TYPE;
-extern int MK_LDAP_IBMMAIL_TYPE;
-extern int MK_LDAP_MCIMAIL_TYPE;
-extern int MK_LDAP_POWERSHARE_TYPE;
-extern int MK_LDAP_PRODIGY_TYPE;
-extern int MK_LDAP_TLX_TYPE;
-extern int MK_LDAP_MIDDLE_NAME;
-extern int MK_LDAP_NAME_PREFIX;
-extern int MK_LDAP_NAME_SUFFIX;
-extern int MK_LDAP_TZ;
-extern int MK_LDAP_GEO;
-extern int MK_LDAP_SOUND;
-extern int MK_LDAP_REVISION;
-extern int MK_LDAP_VERSION;
-extern int MK_LDAP_KEY;
-extern int MK_LDAP_LOGO;
-extern int MK_LDAP_X400;
-extern int MK_LDAP_BIRTHDAY;
-extern int MK_LDAP_ADDRESS;
-extern int MK_LDAP_LABEL;
-extern int MK_LDAP_MAILER;
-extern int MK_LDAP_ROLE;
-extern int MK_LDAP_UPDATEURL;
-extern int MK_LDAP_COOLTALKADDRESS;
-extern int MK_LDAP_USEHTML;
-extern int MK_ADDR_VIEW_COMPLETE_VCARD;
-extern int MK_ADDR_VIEW_CONDENSED_VCARD;
-extern int MK_MSG_ADD_TO_ADDR_BOOK;
-extern int MK_ADDR_DEFAULT_DLS;
-extern int MK_ADDR_SPECIFIC_DLS;
-extern int MK_ADDR_HOSTNAMEIP;
-extern int MK_ADDR_CONFINFO;
-extern int MK_ADDR_ADDINFO;
-
-static int BeginVCard (MimeObject *obj);
-static int EndVCard (MimeObject *obj);
-static int WriteOutVCard (MimeObject *obj, VObject* v);
-static int WriteOutEachVCardProperty (MimeObject *obj, VObject* v, int* numEmail);
-static int WriteOutVCardProperties (MimeObject *obj, VObject* v, int* numEmail);
-static int WriteLineToStream (MimeObject *obj, const char *line);
-
-static void GetEmailProperties (VObject* o, char ** attribName);
-static void GetTelephoneProperties (VObject* o, char ** attribName);
-static void GetAddressProperties (VObject* o, char ** attribName);
-static int WriteValue (MimeObject *obj, const char *);
-static int WriteAttribute (MimeObject *obj, const char *);
-static int WriteOutVCardPhoneProperties (MimeObject *obj, VObject* v);
-static int WriteOutEachVCardPhoneProperty (MimeObject *obj, VObject* o);
-
-typedef struct
-	{
-		const char *attributeName;
-		int resourceId;
-	} AttributeName;
-
-#define kNumAttributes 12
-
-static int
-MimeInlineTextVCardClassInitialize(MimeInlineTextVCardClass *class)
-{
-  MimeObjectClass *oclass = (MimeObjectClass *) class;
-  PR_ASSERT(!oclass->class_initialized);
-  oclass->parse_begin = MimeInlineTextVCard_parse_begin;
-  oclass->parse_line  = MimeInlineTextVCard_parse_line;
-  oclass->parse_eof   = MimeInlineTextVCard_parse_eof;
-
-return 0;
-}
-
-static int
-MimeInlineTextVCard_parse_begin (MimeObject *obj)
-{
-    int status = ((MimeObjectClass*)&mimeLeafClass)->parse_begin(obj);
-	MimeInlineTextVCardClass *class;
-    if (status < 0) return status;
-
-    if (!obj->output_p) return 0;
-    if (!obj->options || !obj->options->write_html_p) return 0;
-
-    /* This is a fine place to write out any HTML before the real meat begins.
-       In this sample code, we tell it to start a table. */
-
-	class = ((MimeInlineTextVCardClass *) obj->class);
-	/* initialize vcard string to empty; */
-	StrAllocCopy(class->vCardString, "");
-
-    return 0;
-}
-
-
-static int
-MimeInlineTextVCard_parse_line (char *line, PRInt32 length, MimeObject *obj)
-{
-    /* This routine gets fed each line of data, one at a time.  In my
-       sample, I spew it out as a table row, putting everything
-       between colons in its own table cell.*/
-
-	char* linestring;
-	MimeInlineTextVCardClass *class = ((MimeInlineTextVCardClass *) obj->class);
- 
-    if (!obj->output_p) return 0;
-    if (!obj->options || !obj->options->output_fn) return 0;
-    if (!obj->options->write_html_p) {
-		return MimeObject_write(obj, line, length, PR_TRUE);
-    }
-
-	linestring = (char *) PR_MALLOC (length + 1);
-
-	if (linestring) {
-		XP_STRNCPY_SAFE((char *)linestring, line, length + 1);
-		StrAllocCat (class->vCardString, linestring);
-		PR_Free (linestring);
-	}
-
-    return 0;
-}
-
-
-static int
-MimeInlineTextVCard_parse_eof (MimeObject *obj, PRBool abort_p)
-{
-    int status = 0;
-	MimeInlineTextVCardClass *class = ((MimeInlineTextVCardClass *) obj->class);
-	VObject *t, *v;
-
-    if (obj->closed_p) return 0;
-
-    /* Run parent method first, to flush out any buffered data. */
-    status = ((MimeObjectClass*)&MIME_SUPERCLASS)->parse_eof(obj, abort_p);
-    if (status < 0) return status;
-
-	if (!class->vCardString) return 0;
-
-	v = Parse_MIME(class->vCardString, PL_strlen(class->vCardString));
-
-	if (class->vCardString) {
-		PR_Free ((char*) class->vCardString);
-		class->vCardString = NULL;
-	}
-
-    if (obj->output_p && obj->options && obj->options->write_html_p &&
-		obj->options->headers != MimeHeadersCitation) {
-		/* This is a fine place to write any closing HTML.  In fact, you may
-		   want all the writing to be here, and all of the above would just
-		   collect data into datastructures, though that isn't very
-		   "streaming". */
-		t = v;
-		while (v && status >= 0) {
-			/* write out html */
-			status = WriteOutVCard (obj, v);
-			/* parse next vcard incase they're embedded */
-			v = nextVObjectInList(v);
-		}
-
-	    cleanVObject(t);
-    }
-	if (status < 0) return status;
-
-    return 0;
-}
-
-static int WriteEachLineToStream (MimeObject *obj, const char *line)
-{
-	int status = 0;
-	char *htmlLine;
-	int htmlLen = PL_strlen(line) + 1;
-
-	htmlLine = (char *) PR_MALLOC (htmlLen);
-	if (htmlLine)
-	{
-		htmlLine[0] = '\0';
-		PL_strcat (htmlLine, line);
-	    status = MimeObject_write(obj, htmlLine, PL_strlen(htmlLine), PR_TRUE);
-		PR_Free ((void*) htmlLine);
-	}
-	else
-		status = MK_OUT_OF_MEMORY;
-
-	return status;
-}
-
-static int OutputTable (MimeObject *obj, PRBool endTable, PRBool border, char *cellspacing, char *cellpadding, char *bgcolor)
-{
-	int status = 0;
-	char * htmlLine = NULL;
-
-	if (endTable)
-	{
-		status = WriteEachLineToStream (obj, "</TABLE>");
-	}
-	else
-	{
-		int htmlLen = PL_strlen("<TABLE>") + 1;
-		if (border)
-			htmlLen += PL_strlen (" BORDER");
-		if (cellspacing)
-			htmlLen += PL_strlen(" CELLSPACING=") + PL_strlen(cellspacing);
-		if (cellpadding)
-			htmlLen += PL_strlen(" CELLPADDING=") + PL_strlen(cellpadding);
-		if (bgcolor)
-			htmlLen += PL_strlen(" BGCOLOR=") + PL_strlen(bgcolor);
-		if (border || cellspacing || cellpadding || bgcolor)
-			htmlLen++;
-
-		htmlLine = (char *) PR_MALLOC (htmlLen);
-		if (htmlLine)
-		{
-			htmlLine[0] = '\0';
-			PL_strcat (htmlLine, "<TABLE");
-			if (border)
-				PL_strcat (htmlLine, " BORDER");
-			if (cellspacing)
-			{	
-				PL_strcat (htmlLine, " CELLSPACING=");
-				PL_strcat (htmlLine, cellspacing);
-			}
-			if (cellpadding)
-			{	
-				PL_strcat (htmlLine, " CELLPADDING=");
-				PL_strcat (htmlLine, cellpadding);
-			}
-			if (bgcolor)
-			{	
-				PL_strcat (htmlLine, " BGCOLOR=");
-				PL_strcat (htmlLine, bgcolor);
-			}
-
-			if (border || cellspacing || cellpadding || bgcolor)
-				PL_strcat (htmlLine, " ");
-
-			PL_strcat (htmlLine, ">");
-
-			status = MimeObject_write(obj, htmlLine, PL_strlen(htmlLine), PR_TRUE);
-			PR_Free ((void*) htmlLine);
-		}
-		else
-			status = MK_OUT_OF_MEMORY;
-	}	
-	return status;
-}
-
-static int OutputTableRowOrData(MimeObject *obj, PRBool outputRow, 
-								PRBool end, char * align, 
-								char* valign, char* colspan,
-								char* width)
-{
-	int status = 0;
-	char * htmlLine = NULL;
-
-	if (end)
-		if (outputRow)
-			status = WriteEachLineToStream (obj, "</TR>");
-		else
-			status = WriteEachLineToStream (obj, "</TD>");
-	else
-	{
-		int htmlLen = PL_strlen("<TR>") + 1;
-		if (align)
-			htmlLen += PL_strlen(" ALIGN=") + PL_strlen(align);
-		if (colspan)
-			htmlLen += PL_strlen(" COLSPAN=") + PL_strlen(colspan);
-		if (width)
-			htmlLen += PL_strlen(" WIDTH=") + PL_strlen(width);
-		if (valign)
-			htmlLen += PL_strlen(" VALIGN=") + PL_strlen(valign);
-		if (align || valign || colspan || width)
-			htmlLen++;
-
-		htmlLine = (char *) PR_MALLOC (htmlLen);
-		if (htmlLine)
-		{
-			htmlLine[0] = '\0';
-			if (outputRow)
-				PL_strcat (htmlLine, "<TR");
-			else
-				PL_strcat (htmlLine, "<TD");
-			if (align)
-			{	
-				PL_strcat (htmlLine, " ALIGN=");
-				PL_strcat (htmlLine, align);
-			}
-			if (valign)
-			{	
-				PL_strcat (htmlLine, " VALIGN=");
-				PL_strcat (htmlLine, valign);
-			}
-			if (colspan)
-			{	
-				PL_strcat (htmlLine, " COLSPAN=");
-				PL_strcat (htmlLine, colspan);
-			}
-			if (width)
-			{	
-				PL_strcat (htmlLine, " WIDTH=");
-				PL_strcat (htmlLine, width);
-			}
-			if (align || valign || colspan || width)
-				PL_strcat (htmlLine, " ");
-
-			PL_strcat (htmlLine, ">");
-
-			status = MimeObject_write(obj, htmlLine, PL_strlen(htmlLine), PR_TRUE);
-			PR_Free ((void*) htmlLine);
-		}
-		else
-			status = MK_OUT_OF_MEMORY;
-	}
-
-	return status;
-}
-
-
-static int OutputFont(MimeObject *obj, PRBool endFont, char * size, char* color)
-{
-	int status = 0;
-	char * htmlLine = NULL;
-
-	if (endFont)
-		status = WriteEachLineToStream (obj, "</FONT>");
-	else
-	{
-		int htmlLen = PL_strlen("<FONT>") + 1;
-		if (size)
-			htmlLen += PL_strlen(" SIZE=") + PL_strlen(size);
-		if (color)
-			htmlLen += PL_strlen(" COLOR=") + PL_strlen(color);
-		if (size || color)
-			htmlLen++;
-
-		htmlLine = (char *) PR_MALLOC (htmlLen);
-		if (htmlLine)
-		{
-			htmlLine[0] = '\0';
-				PL_strcat (htmlLine, "<FONT");
-			if (size)
-			{	
-				PL_strcat (htmlLine, " SIZE=");
-				PL_strcat (htmlLine, size);
-			}
-			if (color)
-			{	
-				PL_strcat (htmlLine, " COLOR=");
-				PL_strcat (htmlLine, color);
-			}
-			if (size || color)
-				PL_strcat (htmlLine, " ");
-
-			PL_strcat (htmlLine, ">");
-
-			status = MimeObject_write(obj, htmlLine, PL_strlen(htmlLine), PR_TRUE);
-			PR_Free ((void*) htmlLine);
-		}
-		else
-			status = MK_OUT_OF_MEMORY;
-	}
-
-	return status;
-}
-
-static int OutputVcardAttribute(MimeObject *obj, VObject *v, const char* id) 
-{
-	int status = 0;
-	VObject *prop = NULL;
-	char *string = NULL;
-
-	prop = isAPropertyOf(v, id);
-	if (prop)
-		if (VALUE_TYPE(prop))
-		{
-			if (VALUE_TYPE(prop) != VCVT_RAW)
-				string = fakeCString (vObjectUStringZValue(prop));
-			else
-			{
-				string = PR_MALLOC(PL_strlen((char *) vObjectAnyValue(prop)) + 1);
-				if (string)
-					PL_strcpy(string, (char *) vObjectAnyValue(prop));
-			}
-			if (string) {
-				status = OutputFont(obj, PR_FALSE, "-1", NULL);
-				if (status < 0) {
-					PR_FREEIF (string);
-					return status;
-				}
-				status = WriteLineToStream (obj, string);
-				PR_FREEIF (string);
-				if (status < 0) return status;
-				status = OutputFont(obj, PR_TRUE, NULL, NULL);
-				if (status < 0) return status;
-			}
-		}
-
-	return 0;
-}
-
-
-static int OutputBasicVcard(MimeObject *obj, VObject *v)
-{
-	int status = 0;
-	char * htmlLine1 = NULL;
-	char * htmlLine2 = NULL;
-	char * htmlLine = NULL;
-	VObject *prop = NULL;
-	VObject* prop2 = NULL;
-	char * urlstring = NULL;
-	char * namestring = NULL;
-	char * emailstring = NULL;
-
-	/* get the name and email */
-	prop = isAPropertyOf(v, VCFullNameProp);
-	if (prop)
-	{
-		if (VALUE_TYPE(prop))
-		{
-			if (VALUE_TYPE(prop) != VCVT_RAW)
-				namestring  = fakeCString (vObjectUStringZValue(prop));
-			else
-			{
-				namestring = PR_MALLOC(PL_strlen((char *) vObjectAnyValue(prop)) + 1);
-				if (namestring)
-					PL_strcpy(namestring, (char *) vObjectAnyValue(prop));
-			}
-			if (namestring)
-			{
-				prop = isAPropertyOf(v, VCURLProp);
-				if (prop)
-				{
-					urlstring  = fakeCString (vObjectUStringZValue(prop));
-					if (urlstring)
-						htmlLine1 = PR_smprintf ("<A HREF=""%s"" PRIVATE>%s</A> ", urlstring, namestring);
-					else
-						htmlLine1 = PR_smprintf ("%s ", namestring);
-					PR_FREEIF (urlstring);
-				}
-				else
-					htmlLine1 = PR_smprintf ("%s ", namestring);
-
-				/* get the email address */
-				prop = isAPropertyOf(v, VCEmailAddressProp);
-				if (prop)
-				{
-					emailstring  = fakeCString (vObjectUStringZValue(prop));
-					if (emailstring)
-					{
-						/* if its an internet address prepend the mailto url */
-						prop2 = isAPropertyOf(prop, VCInternetProp);
-						if (prop2)
-							htmlLine2 = PR_smprintf ("&lt;<A HREF=""mailto:%s"" PRIVATE>%s</A>&gt;", emailstring, emailstring);
-						else
-							htmlLine2 = PR_smprintf ("%s", emailstring);
-						PR_FREEIF (emailstring);
-					}
-				}
-
-				if (!htmlLine1 && !htmlLine2)
-				{
-					PR_FREEIF (htmlLine1);
-					PR_FREEIF (htmlLine2);
-					return MK_OUT_OF_MEMORY;
-				}
-				else
-				{
-					htmlLine = StrAllocCat (htmlLine, htmlLine1);
-					htmlLine = StrAllocCat (htmlLine, htmlLine2);
-				}
-
-				PR_FREEIF (htmlLine1);
-				PR_FREEIF (htmlLine2);
-				PR_FREEIF (namestring);
-			}
-		}
-	}
-
-	status = OutputTable (obj, PR_FALSE, PR_FALSE, "0", "0", NULL);
-	if (status < 0) {
-		PR_FREEIF (htmlLine); 
-		return status;
-	}
-	if (htmlLine)
-	{
-		status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-		if (status < 0) {
-			PR_Free (htmlLine);
-			return status;
-		}
-		status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, NULL, NULL, NULL, NULL);
-		if (status < 0) {
-			PR_Free (htmlLine);
-			return status;
-		}
-
-		status = WriteLineToStream (obj, htmlLine);
-		PR_Free (htmlLine); 
-		if (status < 0) return status;
-		status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-		if (status < 0) return status;
-		status = OutputTableRowOrData(obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-		if (status < 0) return status;
-	}
-	else
-		status = MK_OUT_OF_MEMORY;
-
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	/* output the title */
-	status = OutputVcardAttribute (obj, v, VCTitleProp);
-	if (status < 0) return status;
-	/* write out the org name and company name */
-	prop = isAPropertyOf(v, VCOrgProp);
-	if (prop)
-	{
-		status = OutputVcardAttribute (obj, prop, VCOrgNameProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCOrgUnitProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCOrgUnit2Prop);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCOrgUnit3Prop);
-		if (status < 0) return status;
-	}
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTable (obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	return 0;
-}
-
-static int OutputAdvancedVcard(MimeObject *obj, VObject *v)
-{
-	int status = 0;
-	char * htmlLine1 = NULL;
-	char * htmlLine2 = NULL;
-	VObject *prop = NULL;
-	VObject* prop2 = NULL;
-	char * urlstring = NULL;
-	char * namestring = NULL;
-	char * emailstring = NULL;
-	int numEmail = 0;
-
-	status = OutputTable (obj, PR_FALSE, PR_FALSE, "0", "0", NULL);
-	if (status < 0) return status;
-	/* beginning of first row */
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", "3", NULL);
-	if (status < 0) return status;
-
-	/* get the name and email */
-	prop = isAPropertyOf(v, VCFullNameProp);
-	if (prop)
-	{
-		if (VALUE_TYPE(prop))
-		{
-			if (VALUE_TYPE(prop) != VCVT_RAW)
-				namestring  = fakeCString (vObjectUStringZValue(prop));
-			else
-			{
-				namestring = PR_MALLOC(PL_strlen((char *) vObjectAnyValue(prop)) + 1);
-				if (namestring)
-					PL_strcpy(namestring, (char *) vObjectAnyValue(prop));
-			}
-			if (namestring)
-			{
-				prop = isAPropertyOf(v, VCURLProp);
-				if (prop)
-				{
-					urlstring  = fakeCString (vObjectUStringZValue(prop));
-					if (urlstring)
-						htmlLine1 = PR_smprintf ("<A HREF=""%s"" PRIVATE>%s</A> ", urlstring, namestring);
-					else
-						htmlLine1 = PR_smprintf ("%s ", namestring);
-					PR_FREEIF (urlstring);
-				}
-				else
-					htmlLine1 = PR_smprintf ("%s ", namestring);
-
-				PR_FREEIF (namestring);
-			}
-			if (!htmlLine1)
-			{
-				return MK_OUT_OF_MEMORY;
-			}
-		}
-	}
-	/* output the name if there was one */
-	if (htmlLine1)
-	{
-		status = WriteLineToStream (obj, htmlLine1);
-		PR_FREEIF (htmlLine1);
-		if (status < 0) return status;
-	}
-
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	
-	/* beginning of second row */
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) return status;
-	/* output the title */
-	status = OutputVcardAttribute (obj, v, VCTitleProp);
-	if (status < 0) return status;
-	/* write out the org name and company name */
-	prop = isAPropertyOf(v, VCOrgProp);
-	if (prop)
-	{
-		status = OutputVcardAttribute (obj, prop, VCOrgNameProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCOrgUnitProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCOrgUnit2Prop);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCOrgUnit3Prop);
-		if (status < 0) return status;
-	}
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE , "LEFT", "TOP", NULL, "\"10\"");
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) return status;
-
-	/* get the email address */
-	prop = isAPropertyOf(v, VCEmailAddressProp);
-	if (prop)
-	{
-		emailstring  = fakeCString (vObjectUStringZValue(prop));
-		if (emailstring)
-		{
-			numEmail++;
-			/* if its an internet address prepend the mailto url */
-			prop2 = isAPropertyOf(prop, VCInternetProp);
-			if (prop2)
-				htmlLine2 = PR_smprintf ("&lt;<A HREF=""mailto:%s"" PRIVATE>%s</A>&gt;", emailstring, emailstring);
-			else
-				htmlLine2 = PR_smprintf ("%s", emailstring);
-
-			PR_FREEIF (emailstring);
-		}
-		if (!htmlLine2)
-		{
-			return MK_OUT_OF_MEMORY;
-		}
-	}
-	/* output email address */
-	if (htmlLine2)
-	{
-		status = OutputFont(obj, PR_FALSE, "-1", NULL);
-		if (status < 0) {
-			PR_FREEIF (htmlLine2);
-			return status;
-		}
-		status = WriteLineToStream (obj, htmlLine2);
-		PR_FREEIF (htmlLine2);
-		if (status < 0) return status;
-		status = OutputFont(obj, PR_TRUE, NULL, NULL);
-		if (status < 0) return status;
-		/* output html mail setting only if its true */
-		prop = isAPropertyOf(v, VCUseHTML);
-		if (prop)
-		{
-			if (VALUE_TYPE(prop))
-			{
-				namestring  = fakeCString (vObjectUStringZValue(prop));
-				if (namestring)
-					if (PL_strcasecmp (namestring, "PR_TRUE") == 0)
-					{
-						PR_FREEIF (namestring);
-						status = OutputFont(obj, PR_FALSE, "-1", NULL);
-						if (status < 0) return status;
-						status = WriteLineToStream (obj, XP_GetString (MK_LDAP_USEHTML));
-						if (status < 0) return status;
-						status = OutputFont(obj, PR_TRUE, NULL, NULL);
-						if (status < 0) return status;
-					}
-					else
-						PR_FREEIF (namestring);
-			}
-		}
-	}
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	/* beginning of third row */
-	/* write out address information if we have any */
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) return status;
-	/* first column */
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) return status;
-	prop = isAPropertyOf(v, VCAdrProp);
-	if (prop)
-	{
-		status = OutputVcardAttribute (obj, prop, VCPostalBoxProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCExtAddressProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCStreetAddressProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCCityProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCRegionProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCPostalCodeProp);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, prop, VCCountryNameProp);
-		if (status < 0) return status;
-	}
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	/* second column */
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE , NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	/* third column */
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) return status;
-	/* output telephone fields */
-	status = WriteOutVCardPhoneProperties (obj, v);
-	if (status < 0) return status;
-	/* output conference fields */
-	status = OutputFont(obj, PR_FALSE, "-1", NULL);
-	if (status < 0) return status;
-	prop = isAPropertyOf(v, VCCooltalk);
-	if (prop)
-	{
-		WriteLineToStream (obj, XP_GetString (MK_ADDR_CONFINFO));
-		if (status < 0) return status;
-		prop2 = isAPropertyOf(prop, VCUseServer);
-		if (prop2)
-		{
-			if (VALUE_TYPE(prop2)) {
-				namestring  = fakeCString (vObjectUStringZValue(prop2));
-				if (PL_strcmp (namestring, "0") == 0)
-					status = WriteLineToStream (obj, XP_GetString (MK_ADDR_DEFAULT_DLS));
-				else {
-					if (PL_strcmp (namestring, "1") == 0)
-						status = WriteLineToStream (obj, XP_GetString (MK_ADDR_SPECIFIC_DLS));
-					else
-						if (PL_strcmp (namestring, "2") == 0)
-							status = WriteLineToStream (obj, XP_GetString (MK_ADDR_HOSTNAMEIP));
-				}
-				PR_FREEIF (namestring);
-				if (status < 0) return status;
-			}
-		}
-		status = OutputVcardAttribute (obj, prop, VCCooltalkAddress);
-		if (status < 0) return status;
-	}
-
-	status = OutputFont(obj, PR_TRUE, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	/* beginning of last row */
-	/* output notes field */
-	prop = isAPropertyOf(v, VCCommentProp);
-	if (prop)
-	{
-		status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-		if (status < 0) return status;
-		status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", "3", NULL);
-		if (status < 0) return status;
-		status = OutputVcardAttribute (obj, v, VCCommentProp);
-		if (status < 0) return status;
-		status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-		if (status < 0) return status;
-		status = OutputTableRowOrData(obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-		if (status < 0) return status;
-	}
-
-	status = OutputTable (obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	/* output second table containing all the additional info */
-	status = OutputTable (obj, PR_FALSE, PR_FALSE, "0", "0", NULL);
-	if (status < 0) return status;
-	/* beginning of first row */
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", "2", NULL);
-	if (status < 0) return status;
-	/* output the additional info header */
-	status = OutputFont(obj, PR_FALSE, "-1", NULL);
-	if (status < 0) return status;
-	status = WriteLineToStream (obj, XP_GetString (MK_ADDR_ADDINFO));
-	if (status < 0) return status;
-	status = OutputFont(obj, PR_TRUE, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData(obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	
-	/* beginning of remaining rows */
-	status = WriteOutVCardProperties (obj, v, &numEmail);
-	if (status < 0) return status;
-
-	status = OutputTable (obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	return 0;
-}
-
-static int OutputButtons(MimeObject *obj, PRBool basic, VObject *v)
-{
-	int status = 0;
-	char * htmlLine = NULL;
-	char * htmlLine1 = NULL;
-	char * htmlLine2 = NULL;
-	char* vCard = NULL;
-	char* vEscCard = NULL;
-	int len = 0;
-	char* charset = NULL;
-	char* rsrcString = NULL;
-	char* converted = NULL;
-	PRInt16 fromCharsetID, toCharsetID;
-
-	if (!obj->options->output_vcard_buttons_p)
-		return status;
-
-	vCard = writeMemVObjects(0, &len, v);
-
-	if (!vCard)
-		return MK_OUT_OF_MEMORY;
-
-	vEscCard = NET_Escape (vCard, URL_XALPHAS);
-
-	PR_FREEIF (vCard);
-
-	if (!vEscCard)
-		return MK_OUT_OF_MEMORY;
-
-	/* parse a content type for the charset */
-	fromCharsetID = INTL_CharSetNameToID(INTL_ResourceCharSet());
-	charset = PL_strstr(obj->content_type, "charset=");
-	toCharsetID = (charset != NULL) ? INTL_CharSetNameToID(charset+8) : INTL_DocToWinCharSetID(fromCharsetID);
-	
-	if (basic)
-	{
-		rsrcString = XP_GetString(MK_ADDR_VIEW_COMPLETE_VCARD);
-		/* convert from the resource charset. */
-		converted = (fromCharsetID != toCharsetID) ?
-			(char *) INTL_ConvertLineWithoutAutoDetect(
-						fromCharsetID, toCharsetID, (unsigned char *) rsrcString, (PRUint32) PL_strlen(rsrcString)) : rsrcString;
-		if (converted == NULL)
-			converted = rsrcString;
-	
-		htmlLine1 = PR_smprintf ("<FORM name=form1><INPUT type=reset value=\\\"%s\\\" onClick=\\\"showAdvanced%d();\\\"></INPUT></FORM>", 
-			converted, unique);
-	}
-	else 
-	{
-		rsrcString = XP_GetString(MK_ADDR_VIEW_CONDENSED_VCARD);
-		converted = (fromCharsetID != toCharsetID) ?
-			(char *) INTL_ConvertLineWithoutAutoDetect(
-						fromCharsetID, toCharsetID, (unsigned char *) rsrcString, (PRUint32) PL_strlen(rsrcString)) : rsrcString;
-		if (converted == NULL)
-			converted = rsrcString;
-
-		htmlLine1 = PR_smprintf ("<FORM name=form1><INPUT type=reset value=\\\"%s\\\" onClick=\\\"showBasic%d();\\\"></INPUT></FORM>", 
-			converted, unique);
-	}
-	if (converted != rsrcString)
-		PR_FREEIF(converted);
-
-	rsrcString = XP_GetString(MK_MSG_ADD_TO_ADDR_BOOK);
-	converted = (fromCharsetID != toCharsetID) ?
-		(char *) INTL_ConvertLineWithoutAutoDetect(
-					fromCharsetID, toCharsetID, (unsigned char *) rsrcString, (PRUint32) PL_strlen(rsrcString)) : rsrcString;
-	if (converted == NULL)
-		converted = rsrcString;
-
-	htmlLine2 = PR_smprintf ("<FORM name=form1 METHOD=get ACTION=\"addbook:add\"><INPUT TYPE=hidden name=vcard VALUE=\"%s\"><INPUT type=submit value=\"%s\"></INPUT></FORM>",
-		vEscCard, converted);
-	if (converted != rsrcString)
-		PR_FREEIF(converted);
-
-
-	if (!htmlLine1 && !htmlLine2)
-	{
-		PR_FREEIF (vEscCard);
-		PR_FREEIF (htmlLine1);
-		PR_FREEIF (htmlLine2);
-		return MK_OUT_OF_MEMORY;
-	}
-	
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-	if (status < 0) goto FAIL;
-
-	/*
-	 * WARNING: This HTML is written to the stream using JavaScript,
-	 * because we don't want this button to be displayed when JS has
-	 * been switched off (in the whole client or just in email). The
-	 * button won't work when JS is switched off (since it calls a JS
-	 * function), so then we don't want the button to be displayed.
-	 *   -- erik (and jfriend)
-	 */
-	status = WriteEachLineToStream (obj, "<SCRIPT>document.write(\"");
-	if (status < 0) goto FAIL;
-
-	status = WriteLineToStream (obj, htmlLine1);
-	if (status < 0) goto FAIL;
-
-	status = WriteEachLineToStream (obj, "\")</SCRIPT>");
-	if (status < 0) goto FAIL;
-
-	status = WriteLineToStream (obj, htmlLine2);
-	if (status < 0) goto FAIL;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) goto FAIL;
-
-	FAIL:
-	PR_FREEIF (vEscCard);
-	PR_FREEIF (htmlLine1);
-	PR_FREEIF (htmlLine2);
-
-	return status;
-}
-
-static int BeginLayer(MimeObject *obj, PRBool basic)
-{
-	int status = 0;
-	char * captionLine = NULL;
-
-	if (basic)
-	{
-//RICHIECSS		captionLine = PR_smprintf ("<LAYER NAME=basic%d>", unique);
-    captionLine = PR_smprintf ("<DIV ID=basic%d style=\"position: 'absolute';\">", unique);
-	}
-	else
-	{
-//RICHIECSS		captionLine = PR_smprintf ("<ILAYER NAME=advanced%d VISIBILITY=\"hide\">", unique);
-		captionLine = PR_smprintf ("<DIV ID=advanced%d style=\"position: 'absolute'; display: 'none';\">", unique);
-  }
-
-	if (captionLine)
-	{
-		status = WriteEachLineToStream (obj, captionLine);
-		PR_Free(captionLine);
-		if (status < 0) return status;
-		status = OutputTable (obj, PR_FALSE, PR_FALSE, NULL, NULL, NULL);
-		if (status < 0) return status;
-		status = OutputTableRowOrData (obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL, NULL);
-		if (status < 0) return status;
-		status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, NULL, "TOP", NULL, NULL);
-		if (status < 0) return status;
-		status = OutputTable (obj, PR_FALSE, PR_TRUE, "0", "0", "#FFFFFF");
-		if (status < 0) return status;
-		if (basic)
-		{
-			status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-			if (status < 0) return status;
-			status = OutputTableRowOrData(obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-			if (status < 0) return status;
-		}
-		else
-		{
-			status = OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL, NULL);
-			if (status < 0) return status;
-			status = OutputTableRowOrData(obj, PR_FALSE, PR_FALSE, NULL, NULL, NULL, NULL);
-			if (status < 0) return status;
-		}
-
-		status = OutputTable (obj, PR_FALSE, PR_FALSE, "4", NULL, NULL);
-		if (status < 0) return status;
-		status = OutputTableRowOrData (obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL, NULL);
-		if (status < 0) return status;
-		status = OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, NULL, NULL, NULL, NULL);
-		if (status < 0) return status;
-	}
-	else
-		status = MK_OUT_OF_MEMORY;
-
-	return status;
-}
-
-static int EndLayer(MimeObject *obj, PRBool basic, VObject* v)
-{
-	int status = 0;
-	char * captionLine = NULL;
-
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTable (obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTable (obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	status = OutputButtons(obj, basic, v);
-	if (status < 0) return status;
-
-	status = OutputTableRowOrData (obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	if (status < 0) return status;
-	status = OutputTable (obj, PR_TRUE, PR_FALSE, NULL, NULL, NULL);
-	if (status < 0) return status;
-
-	if (!basic) 
-	{
-//RICHIECSS		status = WriteEachLineToStream (obj, "</ILAYER>");
-		status = WriteEachLineToStream (obj, "</DIV>");
-    if (status < 0) return status;
-		status = WriteEachLineToStream (obj, "<P><SCRIPT>");
-		if (status < 0) return status;
-		captionLine = PR_smprintf ("function showAdvanced%d() {", unique);
-		if (captionLine)
-			status = WriteEachLineToStream (obj, captionLine);
-		PR_FREEIF (captionLine);
-		captionLine = NULL;
-		if (status < 0) return status;
-//RICHIECSS		captionLine = PR_smprintf ("document.layers[\"basic%d\"].visibility = \"hide\";", unique);
-		captionLine = PR_smprintf ("document.getElementById(\"basic%d\").style.display = \"none\";", unique);
-    if (captionLine)
-			status = WriteEachLineToStream (obj, captionLine);
-		PR_FREEIF (captionLine);
-		captionLine = NULL;
-		if (status < 0) return status;
-//RICHIECSS    captionLine = PR_smprintf ("document.layers[\"advanced%d\"].visibility = \"inherit\";", unique);
-    captionLine = PR_smprintf ("document.getElementById(\"advanced%d\").style.display = \"\";", unique);
-		if (captionLine)
-			status = WriteEachLineToStream (obj, captionLine);
-		PR_FREEIF (captionLine);
-		captionLine = NULL;
-		if (status < 0) return status;
-		status = WriteEachLineToStream (obj, "};");
-		if (status < 0) return status;
-		captionLine = PR_smprintf ("function showBasic%d() {", unique);
-		if (captionLine)
-			status = WriteEachLineToStream (obj, captionLine);
-		PR_FREEIF (captionLine);
-		captionLine = NULL;
-		if (status < 0) return status;
-//RICHIECSS		captionLine = PR_smprintf ("document.layers[\"advanced%d\"].visibility = \"hide\";", unique);
- 		captionLine = PR_smprintf ("document.getElementById(\"advanced%d\").style.display = \"none\";", unique);
-		if (captionLine)
-			status = WriteEachLineToStream (obj, captionLine);
-		if (status < 0) return status;
-//RICHIECSS		captionLine = PR_smprintf ("document.layers[\"basic%d\"].visibility = \"inherit\";", unique);
- 		captionLine = PR_smprintf ("document.getElementById(\"basic%d\").style.display = \"\";", unique);
-		if (captionLine)
-			status = WriteEachLineToStream (obj, captionLine);
-		PR_FREEIF (captionLine);
-		if (status < 0) return status;
-		status = WriteEachLineToStream (obj, "}; </SCRIPT></P>");
-	} 
-	else {
-//RICHIECSS		status = WriteEachLineToStream (obj, "</LAYER>");
-		status = WriteEachLineToStream (obj, "</DIV>");
-  }
-
-	if (status < 0) return status;
-	return 0;
-}
-
-static int EndVCard (MimeObject *obj)
-{
-	int status = 0;
-
-	/* Scribble HTML-ending stuff into the stream */
-	char htmlFooters[32];
-	PR_snprintf (htmlFooters, sizeof(htmlFooters), "</BODY>%s</HTML>%s", LINEBREAK, LINEBREAK);
-	status = MimeObject_write(obj, htmlFooters, PL_strlen(htmlFooters), PR_FALSE);
-
-	if (status < 0) return status;
-
-    if (obj->options && obj->options->set_html_state_fn) {
-        status = obj->options->set_html_state_fn(obj->options->stream_closure,
-                                                 PR_TRUE,   /* layer_encapulate_p */
-                                                 PR_FALSE,  /* start_p */
-                                                 PR_FALSE); /* abort_p */
-        if (status < 0) return status;
-    }
-    
-	return 0;
-}
-
-static int BeginVCard (MimeObject *obj)
-{
-	int status = 0;
-
-	/* Scribble HTML-starting stuff into the stream */
-	char htmlHeaders[32];
-
-    if (obj->options && obj->options->set_html_state_fn) {
-        status = obj->options->set_html_state_fn(obj->options->stream_closure,
-                                                 PR_TRUE,   /* layer_encapulate_p */
-                                                 PR_TRUE,   /* start_p */
-                                                 PR_FALSE); /* abort_p */
-        if (status < 0) return status;
-    }
-    
-	unique++;
-	PR_snprintf (htmlHeaders, sizeof(htmlHeaders), "<HTML>%s<BODY>%s", LINEBREAK, LINEBREAK);
-    status = MimeObject_write(obj, htmlHeaders, PL_strlen(htmlHeaders), PR_TRUE);
-
-	if (status < 0) return status;
-
-	return 0;
-}
-
-static int WriteOutVCard (MimeObject *obj, VObject* v)
-{
-	int status = 0;
-
-	status = BeginVCard (obj);
-	if (status < 0) return status;
-	
-	/* write out basic layer */
-	status = BeginLayer(obj, PR_TRUE);
-	if (status < 0) return status;
-	status = OutputBasicVcard(obj, v);
-	if (status < 0) return status;
-	status = EndLayer(obj, PR_TRUE, v);
-	if (status < 0) return status;
-
-	/* write out advanced layer */
-	status = BeginLayer(obj, PR_FALSE);
-	if (status < 0) return status;
-	status = OutputAdvancedVcard(obj, v);
-	if (status < 0) return status;
-	status = EndLayer(obj, PR_FALSE, v);
-	if (status < 0) return status;
-
-	status = EndVCard (obj);
-	if (status < 0) return status;
-
-	return 0;
-}
-
-static void GetAddressProperties (VObject* o, char ** attribName)
-{
-	VObject* domProp = isAPropertyOf(o, VCDomesticProp);
-	VObject* intlProp = isAPropertyOf(o, VCInternationalProp);
-	VObject* postal = isAPropertyOf(o, VCPostalProp);
-	VObject* parcel = isAPropertyOf(o, VCParcelProp);
-	VObject* home = isAPropertyOf(o, VCHomeProp);
-	VObject* work = isAPropertyOf(o, VCWorkProp);
-	if (domProp) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_DOM_TYPE));
-	}
-	if (intlProp) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_INTL_TYPE));
-	}
-	if (postal) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_POSTAL_TYPE));
-	}
-	if (parcel) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_PARCEL_TYPE));
-	}
-	if (home) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_HOME_TYPE));
-	}
-	if (work) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_WORK_TYPE));
-	}
-}
-
-
-static void GetTelephoneProperties (VObject* o, char ** attribName)
-{
-	VObject* prefProp = isAPropertyOf(o, VCPreferredProp);
-	VObject* home = isAPropertyOf(o, VCHomeProp);
-	VObject* work = isAPropertyOf(o, VCWorkProp);
-	VObject* voiceProp = isAPropertyOf(o, VCVoiceProp);
-	VObject* fax = isAPropertyOf(o, VCFaxProp);
-	VObject* msg = isAPropertyOf(o, VCMessageProp);
-	VObject* cell = isAPropertyOf(o, VCCellularProp);
-	VObject* pager = isAPropertyOf(o, VCPagerProp);
-	VObject* bbs = isAPropertyOf(o, VCBBSProp);
-	if (prefProp) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_PREF_TYPE));
-	}
-	if (home) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_HOME_TYPE));
-	}
-	if (work) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_WORK_TYPE));
-	}
-	if (voiceProp) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_VOICE_TYPE));
-	}
-	if (fax) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_FAX_TYPE));
-	}
-	if (msg) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_MSG_TYPE));
-	}
-	if (cell) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_CELL_TYPE));
-	}
-	if (pager) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_PAGER_TYPE));
-	}
-	if (bbs) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_BBS_TYPE));
-	}
-}
-
-static void GetEmailProperties (VObject* o, char ** attribName)
-{
-	
-	VObject* prefProp = isAPropertyOf(o, VCPreferredProp);
-	VObject* home = isAPropertyOf(o, VCHomeProp);
-	VObject* work = isAPropertyOf(o, VCWorkProp);
-	VObject* aol = isAPropertyOf(o, VCAOLProp);
-	VObject* applelink = isAPropertyOf(o, VCAppleLinkProp);
-	VObject* att = isAPropertyOf(o, VCATTMailProp);
-	VObject* cis = isAPropertyOf(o, VCCISProp);
-	VObject* eworld = isAPropertyOf(o, VCEWorldProp);
-	VObject* internet = isAPropertyOf(o, VCInternetProp);
-	VObject* ibmmail = isAPropertyOf(o, VCIBMMailProp);
-	VObject* mcimail = isAPropertyOf(o, VCMCIMailProp);
-	VObject* powershare = isAPropertyOf(o, VCPowerShareProp);
-	VObject* prodigy = isAPropertyOf(o, VCProdigyProp);
-	VObject* telex = isAPropertyOf(o, VCTLXProp);
-	VObject* x400 = isAPropertyOf(o, VCX400Prop);
-	if (prefProp) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_PREF_TYPE));
-	}
-	if (home) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_HOME_TYPE));
-	}
-	if (work) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_WORK_TYPE));
-	}
-	if (aol) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_AOL_TYPE));
-	}
-	if (applelink) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_APPLELINK_TYPE));
-	}
-	if (att) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_ATTMAIL_TYPE));
-	}
-	if (cis) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_CSI_TYPE));
-	}
-	if (eworld) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_EWORLD_TYPE));
-	}
-	if (internet) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_INTERNET_TYPE));
-	}
-	if (ibmmail) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_IBMMAIL_TYPE));
-	}
-	if (mcimail) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_MCIMAIL_TYPE));
-	}
-	if (powershare) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_POWERSHARE_TYPE));
-	}
-	if (prodigy) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_PRODIGY_TYPE));
-	}
-	if (telex) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_TLX_TYPE));
-	}
-	if (x400) {
-		StrAllocCat ((*attribName), " ");
-		StrAllocCat ((*attribName), XP_GetString (MK_LDAP_X400));
-	}
-
-}
-
-static int WriteOutEachVCardPhoneProperty (MimeObject *obj, VObject* o)
-{
-	char *attribName = NULL;
-	char *value = NULL;
-	int status = 0;
-
-	if (vObjectName(o)) 
-	{
-		if (PL_strcasecmp (VCTelephoneProp, vObjectName(o)) == 0) 
-		{
-			if (VALUE_TYPE(o)) 
-			{
-				GetTelephoneProperties(o, &attribName);
-				if (!attribName)
-					attribName = PL_strdup (XP_GetString (MK_LDAP_PHONE_NUMBER));
-				attribName = StrAllocCat(attribName, ": ");
-				value = fakeCString (vObjectUStringZValue(o));
-				if (value)
-				{
-					attribName = StrAllocCat (attribName, value);
-					PR_FREEIF (value);
-					if (attribName)
-					{
-						status = OutputFont(obj, PR_FALSE, "-1", NULL);
-						if (status < 0) {
-							PR_FREEIF (attribName);
-							return status;
-						}
-						status = WriteLineToStream (obj, attribName);
-						if (status < 0) {
-							PR_FREEIF (attribName);
-							return status;
-						}
-						status = OutputFont(obj, PR_TRUE, NULL, NULL);
-						if (status < 0) {
-							PR_FREEIF (attribName);
-							return status;
-						}
-					}
-					PR_FREEIF (attribName);
-				}
-			}
-		}
-	}
-	return status;
-}
-
-static int WriteOutVCardPhoneProperties (MimeObject *obj, VObject* v)
-{
-	int status = 0;
-	VObjectIterator t;
-	VObject *eachProp;
-
-    WriteOutEachVCardPhoneProperty (obj, v);
-	initPropIterator(&t,v);
-	while (moreIteration(&t) && status >= 0)
-	{
-		eachProp = nextVObject(&t);
-		status = WriteOutEachVCardPhoneProperty (obj, eachProp);
-	}
-
-	if (status < 0) return status;
-
-	return 0;
-}
-
-static int WriteOutEachVCardProperty (MimeObject *obj, VObject* o, int* numEmail)
-{
-	char *attribName = NULL;
-	char * url = NULL;
-	char *value = NULL;
-	char *ptr = NULL;
-	int status = 0;
-
-	if (vObjectName(o)) {
-
-		if (PL_strcasecmp (VCPhotoProp, vObjectName(o)) == 0) {
-			VObject* urlProp = isAPropertyOf(o, VCURLProp);
-			if (urlProp) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_PHOTOGRAPH));
-				/* format the value string to the url */
-				value = fakeCString (vObjectUStringZValue(o));
-				if (value)
-					url = PR_smprintf ("<IMG SRC = ""%s""", value);
-				PR_FREEIF (value);
-				value = NULL;
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCBirthDateProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_BIRTHDAY));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCDeliveryLabelProp, vObjectName(o)) == 0) {
-			attribName = PL_strdup (XP_GetString (MK_LDAP_LABEL));
-			GetAddressProperties(o, &attribName);
-			value = fakeCString (vObjectUStringZValue(o));
-			goto DOWRITE;
-		}
-
-		if (PL_strcasecmp (VCEmailAddressProp, vObjectName(o)) == 0) {
-			if ((*numEmail) != 1)
-			{
-				if (VALUE_TYPE(o)) {
-					(*numEmail)++;
-					attribName = PL_strdup (XP_GetString (MK_LDAP_EMAIL_ADDRESS));
-					GetEmailProperties(o, &attribName);
-					value = fakeCString (vObjectUStringZValue(o));
-					goto DOWRITE;
-				};
-			}
-		}
-
-		if (PL_strcasecmp (VCFamilyNameProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_SURNAME));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCGivenNameProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_GIVEN_NAME));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCNamePrefixesProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_NAME_PREFIX));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCNameSuffixesProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_NAME_SUFFIX));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCAdditionalNamesProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_MIDDLE_NAME));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCMailerProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_MAILER));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCTimeZoneProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_TZ));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCGeoProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_GEO));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCBusinessRoleProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_ROLE));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCLogoProp, vObjectName(o)) == 0) {
-			VObject* urlProp = isAPropertyOf(o, VCURLProp);
-			if (urlProp) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_LOGO));
-				/* format the value string to the url */
-				value = fakeCString (vObjectUStringZValue(o));
-				if (value)
-					url = PR_smprintf ("<IMG SRC = ""%s""", value);
-				PR_FREEIF (value);
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCAgentProp, vObjectName(o)) == 0) {
-			attribName = PL_strdup (XP_GetString (MK_LDAP_SECRETARY));
-			goto DOWRITE;
-		}
-
-		if (PL_strcasecmp (VCLastRevisedProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_REVISION));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (PL_strcasecmp (VCPronunciationProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_SOUND));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-
-		if (PL_strcasecmp (VCVersionProp, vObjectName(o)) == 0) {
-			if (VALUE_TYPE(o)) {
-				attribName = PL_strdup (XP_GetString (MK_LDAP_VERSION));
-				value = fakeCString (vObjectUStringZValue(o));
-				goto DOWRITE;
-			}
-		}
-
-		if (!attribName) 
-			return 0;
-	
-	DOWRITE:
-		OutputTableRowOrData(obj, PR_TRUE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-		OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-		if (attribName) { 
-			OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-			status = WriteAttribute (obj, attribName);
-			PR_Free (attribName);
-			OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-		}
-
-		if (value) {
-			OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-			status = WriteValue (obj, value);
-			PR_Free (value);
-			OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-		}
-
-		if (url) {
-			OutputTableRowOrData (obj, PR_FALSE, PR_FALSE, "LEFT", "TOP", NULL, NULL);
-			status = WriteValue (obj, url);
-			PR_Free (url);
-			OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL);
-		}
-		OutputTableRowOrData(obj, PR_TRUE, PR_TRUE, NULL, NULL, NULL, NULL);
-	}
-
-	if (status < 0) return status;
-
-	return 0;
-}
-
-
-static int WriteOutVCardProperties (MimeObject *obj, VObject* v, int* numEmail)
-{
-	int status = 0;
-	VObjectIterator t;
-	VObject *eachProp;
-
-    WriteOutEachVCardProperty (obj, v, numEmail);
-	initPropIterator(&t,v);
-	while (moreIteration(&t) && status >= 0)
-	{
-		eachProp = nextVObject(&t);
-		status = WriteOutVCardProperties (obj, eachProp, numEmail);
-	}
-
-	if (status < 0) return status;
-
-	return 0;
-}
-
-static int WriteLineToStream (MimeObject *obj, const char *line)
-{
-	int status = 0;
-	char *htmlLine;
-	int htmlLen = PL_strlen(line) + PL_strlen("<DT></DT>") + 1;;
-
-	htmlLine = (char *) PR_MALLOC (htmlLen);
-	if (htmlLine)
-	{
-		htmlLine[0] = '\0';
-// RICHIECSS - TEMPORARY FIX FOR A LAYOUT PROBLEM
-//		PL_strcat (htmlLine, "<DT>");
-		PL_strcat (htmlLine, line);
-// RICHIECSS - TEMPORARY FIX FOR A LAYOUT PROBLEM
-//              PL_strcat (htmlLine, "</DT>");
-	    status = MimeObject_write(obj, htmlLine, PL_strlen(htmlLine), PR_TRUE);
-		PR_Free ((void*) htmlLine);
-	}
-	else
-		status = MK_OUT_OF_MEMORY;
-
-	return status;
-}
-
-static int WriteAttribute (MimeObject *obj, const char *attrib)
-{
-	int status = 0;
-	OutputFont(obj, PR_FALSE, "-1", NULL);
-	status  = WriteLineToStream (obj, attrib);
-	OutputFont(obj, PR_TRUE, NULL, NULL);
-	return status;
-}
-
-
-static int WriteValue (MimeObject *obj, const char *value)
-{
-	int status = 0;
-	OutputFont(obj, PR_FALSE, "-1", NULL);
-	status  = WriteLineToStream (obj, value);
-	OutputFont(obj, PR_TRUE, NULL, NULL);
-	return status;
-}
-
-
diff --git a/mozilla/mailnews/mime/src/mimevcrd.h b/mozilla/mailnews/mime/src/mimevcrd.h
deleted file mode 100644
index ad159f329e6..00000000000
--- a/mozilla/mailnews/mime/src/mimevcrd.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- 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 _MIMEVCRD_H_
-#define _MIMEVCRD_H_
-
-#include "mimetext.h"
-
-/* The MimeInlineTextHTML class implements the text/x-vcard and (maybe?
-   someday?) the application/directory MIME content types.
- */
-
-typedef struct MimeInlineTextVCardClass MimeInlineTextVCardClass;
-typedef struct MimeInlineTextVCard      MimeInlineTextVCard;
-
-struct MimeInlineTextVCardClass {
-  MimeInlineTextClass text;
-  char* vCardString;
-};
-
-extern MimeInlineTextVCardClass mimeInlineTextVCardClass;
-
-struct MimeInlineTextVCard {
-  MimeInlineText text;
-};
-
-#endif /* _MIMEVCRD_H_ */