diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp
index d901d5fa9c5..627a91e2762 100644
--- a/mozilla/extensions/wallet/src/wallet.cpp
+++ b/mozilla/extensions/wallet/src/wallet.cpp
@@ -202,6 +202,8 @@ wallet_GetWalletNotificationPref(void) {
 /* The following declarations define the data base */
 /***************************************************/
 
+#define WALLET_FREE(_ptr) { nsMemory::Free((void*)_ptr); (_ptr) = nsnull; }
+#define WALLET_FREEIF(_ptr) if (_ptr) WALLET_FREE(_ptr)
 
 enum PlacementType {DUP_IGNORE, DUP_OVERWRITE, DUP_BEFORE, DUP_AFTER, AT_END, BY_LENGTH};
 #define LIST_COUNT(list)  ((list) ? (list)->Count() : 0)
@@ -216,9 +218,10 @@ public:
   }
   ~wallet_Sublist()
   {
+    WALLET_FREEIF(item);
     MOZ_COUNT_DTOR(wallet_Sublist);
   }
-  nsString item;
+  const char* item;
 };
 
 /*
@@ -239,6 +242,8 @@ public:
   }
   ~wallet_MapElement()
   {
+    WALLET_FREEIF(item1);
+    WALLET_FREEIF(item2);
     if (itemList) {
       PRInt32 count = LIST_COUNT(itemList);
       wallet_Sublist * sublistPtr;
@@ -250,8 +255,8 @@ public:
     }
     MOZ_COUNT_DTOR(wallet_MapElement);
   }
-  nsString item1;
-  nsString item2;
+  const char* item1;
+  const char* item2;
   nsVoidArray * itemList;
 };
 
@@ -267,15 +272,20 @@ MOZ_DECL_CTOR_COUNTER(wallet_HelpMac)
 class wallet_HelpMac {
 public:
   wallet_HelpMac() {
+    item1 = nsnull;
+    item2 = nsnull;
+    item3 = nsnull;
     MOZ_COUNT_CTOR(wallet_HelpMac);
   }
   ~wallet_HelpMac() {
+    WALLET_FREEIF(item1);
+    WALLET_FREEIF(item2);
+    WALLET_FREEIF(item3);
     MOZ_COUNT_DTOR(wallet_HelpMac);
   }
-  nsAutoString item1;
-  nsAutoString item2;
-  nsAutoString item3;
-  nsAutoString dummy;
+  const char* item1;
+  const char* item2;
+  const char* item3;
 };
 wallet_HelpMac * helpMac;
 
@@ -291,8 +301,8 @@ PRIVATE nsVoidArray * wallet_URL_list=0;
 PRIVATE nsVoidArray * wallet_DistinguishedSchema_list=0;
 #endif
 
-#define NO_CAPTURE 0
-#define NO_PREVIEW 1
+#define NO_CAPTURE(x) x.First()
+#define NO_PREVIEW(x) x.Last()
 
 MOZ_DECL_CTOR_COUNTER(wallet_PrefillElement)
 
@@ -300,17 +310,19 @@ class wallet_PrefillElement {
 public:
   wallet_PrefillElement() : inputElement(nsnull), selectElement(nsnull)
   {
+    schema = nsnull;
     MOZ_COUNT_CTOR(wallet_PrefillElement);
   }
   ~wallet_PrefillElement()
   {
+    WALLET_FREEIF(schema);
     NS_IF_RELEASE(inputElement);
     NS_IF_RELEASE(selectElement);
     MOZ_COUNT_DTOR(wallet_PrefillElement);
   }
   nsIDOMHTMLInputElement* inputElement;
   nsIDOMHTMLSelectElement* selectElement;
-  nsString schema;
+  char* schema;
   nsString value;
   PRInt32 selectIndex;
   PRUint32 count;
@@ -351,15 +363,12 @@ wallet_Dump(nsVoidArray * list) {
   PRInt32 count = LIST_COUNT(list);
   for (PRInt32 i=0; i<count; i++) {
     mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
-    fprintf(stdout, "%s %s \n",
-            NS_LossyConvertUCS2toASCII(mapElementPtr->item1).get(),
-            NS_LossyConvertUCS2toASCII(mapElementPtr->item2).get());
+    fprintf(stdout, "%s %s \n", (mapElementPtr->item1), (mapElementPtr->item2));
     wallet_Sublist * sublistPtr;
     PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
     for (PRInt32 i2=0; i2<count2; i2++) {
       sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
-      fprintf(stdout, "     %s \n",
-              NS_LossyConvertUCS2toASCII(sublistPtr->item).get());
+      fprintf(stdout, "     %s \n", (sublistPtr->item));
     }
   }
   wallet_Pause();
@@ -509,6 +518,7 @@ Wallet_Localize(const char* genericString) {
   return ToNewUnicode(v);
 }
 
+
 /**********************/
 /* Modal dialog boxes */
 /**********************/
@@ -548,7 +558,7 @@ Wallet_ConfirmYN(PRUnichar * szMessage, nsIDOMWindowInternal* window) {
                           (nsIPrompt::BUTTON_TITLE_NO * nsIPrompt::BUTTON_POS_1),
                           nsnull, nsnull, nsnull, nsnull, nsnull, &buttonPressed);
 
-  Recycle(confirm_string);
+  WALLET_FREE(confirm_string);
   return (buttonPressed == 0);
 }
 
@@ -572,8 +582,8 @@ Wallet_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindowInternal* window)
                           (nsIPrompt::BUTTON_TITLE_IS_STRING * nsIPrompt::BUTTON_POS_2),
                           nsnull, nsnull, never_string, nsnull, nsnull, &buttonPressed);
 
-  Recycle(never_string);
-  Recycle(confirm_string);
+  WALLET_FREE(never_string);
+  WALLET_FREE(confirm_string);
 
   return buttonPressed;
 }
@@ -591,7 +601,7 @@ wallet_Alert(PRUnichar * szMessage, nsIDOMWindowInternal* window)
   const nsAutoString message( szMessage );
   PRUnichar * title = Wallet_Localize("CaveatTitle");
   res = dialog->Alert(title, message.get());
-  Recycle(title);
+  WALLET_FREE(title);
   return;     // XXX should return the error
 }
 
@@ -602,7 +612,7 @@ wallet_Alert(PRUnichar * szMessage, nsIPrompt* dialog)
   const nsAutoString message( szMessage );
   PRUnichar * title = Wallet_Localize("CaveatTitle");
   res = dialog->Alert(title, message.get());
-  Recycle(title);
+  WALLET_FREE(title);
   return;     // XXX should return the error
 }
 
@@ -632,7 +642,7 @@ Wallet_CheckConfirmYN
     NS_ASSERTION(PR_FALSE, "Bad result from checkbox");
     *checkValue = 0; /* this should never happen but it is happening!!! */
   }
-  Recycle(confirm_string);
+  WALLET_FREE(confirm_string);
   return (buttonPressed == 0);
 }
 
@@ -682,7 +692,7 @@ PRIVATE nsresult EncryptString (const char * text, char *& crypt) {
   }
 
   /* otherwise do our own obscuring using Base64 encoding */
-  char * crypt0 = PL_Base64Encode((const char *)text, 0, NULL);
+  char * crypt0 = PL_Base64Encode(text, 0, NULL);
   if (!crypt0) {
     return NS_ERROR_FAILURE;
   }
@@ -697,7 +707,7 @@ PRIVATE nsresult EncryptString (const char * text, char *& crypt) {
     crypt[PREFIX_len+i] = crypt0[i];
   }
   crypt[PREFIX_len + crypt0_len] = '\0';
-  Recycle(crypt0);
+  WALLET_FREE(crypt0);
 
   return NS_OK;
 }
@@ -775,76 +785,49 @@ WLLT_ChangePassword(PRBool* status) {
   *status = NS_SUCCEEDED(rv);
 }
 
-PUBLIC nsresult
-Wallet_Encrypt (const nsString& text, nsString& crypt) {
+nsresult
+wallet_Encrypt(const nsCString& text, nsCString& crypt) {
 
-  /* convert text from unichar to UTF8 */
-  nsAutoString UTF8text;
-  PRUnichar c;
-  for (PRUint32 i=0; i<text.Length(); i++) {
-    c = text.CharAt(i);
-    if (c <= 0x7F) {
-      UTF8text.Append(c);
-    } else if (c <= 0x7FF) {
-      UTF8text += PRUnichar((0xC0) | ((c>>6) & 0x1F));
-      UTF8text += PRUnichar((0x80) | (c & 0x3F));
-    } else {
-      UTF8text += PRUnichar((0xE0) | ((c>>12) & 0xF));
-      UTF8text += PRUnichar((0x80) | ((c>>6) & 0x3F));
-      UTF8text += PRUnichar((0x80) | (c & 0x3F));
-    }
-  }
-  
   /* encrypt text to crypt */
   char * cryptCString = nsnull;
-  char * UTF8textCString = ToNewCString(UTF8text);
-  nsresult rv = EncryptString(UTF8textCString, cryptCString);
-  Recycle (UTF8textCString);
+  nsresult rv = EncryptString(text.get(), cryptCString);
   if NS_FAILED(rv) {
     return rv;
   }
-  crypt.AssignWithConversion(cryptCString);
-  Recycle (cryptCString);
+  crypt = cryptCString;
+  WALLET_FREE(cryptCString);
+  return NS_OK;
+}
+
+nsresult
+wallet_Decrypt(const nsCString& crypt, nsCString& text) {
+
+  /* decrypt crypt to text */
+  char * textCString = nsnull;
+  nsresult rv = DecryptString(crypt.get(), textCString);
+  if NS_FAILED(rv) {
+    return rv;
+  }
+
+  text = textCString;
+  WALLET_FREE(textCString);
   return NS_OK;
 }
 
 PUBLIC nsresult
-Wallet_Decrypt(const nsString& crypt, nsString& text) {
+Wallet_Encrypt (const nsString& textUCS2, nsString& cryptUCS2) {
+  nsCAutoString cryptUTF8;
+  nsresult rv = wallet_Encrypt(NS_ConvertUCS2toUTF8(textUCS2), cryptUTF8);
+  cryptUCS2 = NS_ConvertUTF8toUCS2(cryptUTF8);
+  return rv;
+}
 
-  /* decrypt crypt to text */
-  char * cryptCString = ToNewCString(crypt);
-  char * UTF8textCString = nsnull;
-
-  nsresult rv = DecryptString(cryptCString, UTF8textCString);
-  Recycle(cryptCString);
-  if NS_FAILED(rv) {
-    return rv;
-  }
-
-  /* convert text from UTF8 to unichar */
-  PRUnichar c1, c2, c3;
-  text.Truncate(0);
-  text.SetCapacity(2 * crypt.Length());
-  
-  PRUint32 UTF8textCString_len = PL_strlen(UTF8textCString);
-  for (PRUint32 i=0; i<UTF8textCString_len; ) {
-    c1 = (PRUnichar)UTF8textCString[i++];    
-    if ((c1 & 0x80) == 0x00) {
-      text += c1;
-    } else if ((c1 & 0xE0) == 0xC0) {
-      c2 = (PRUnichar)UTF8textCString[i++];    
-      text += (PRUnichar)(((c1 & 0x1F)<<6) + (c2 & 0x3F));
-    } else if ((c1 & 0xF0) == 0xE0) {
-      c2 = (PRUnichar)UTF8textCString[i++];    
-      c3 = (PRUnichar)UTF8textCString[i++];    
-      text += (PRUnichar)(((c1 & 0x0F)<<12) + ((c2 & 0x3F)<<6) + (c3 & 0x3F));
-    } else {
-      Recycle(UTF8textCString);
-      return NS_ERROR_FAILURE; /* this is an error, input was not utf8 */
-    }
-  }
-  Recycle(UTF8textCString);
-  return NS_OK;
+PUBLIC nsresult
+Wallet_Decrypt(const nsString& cryptUCS2, nsString& textUCS2) {
+  nsCAutoString textUTF8;
+  nsresult rv = wallet_Decrypt(NS_ConvertUCS2toUTF8(cryptUCS2), textUTF8);
+  textUCS2 = NS_ConvertUTF8toUCS2(textUTF8);
+  return rv;
 }
 
 PUBLIC nsresult
@@ -879,7 +862,7 @@ wallet_Clear(nsVoidArray ** list) {
     }
   }
   delete (*list);
-  *list = 0;
+  *list = nsnull;
 }
 
 /*
@@ -892,13 +875,13 @@ PRIVATE nsVoidArray * wallet_MapElementAllocations_list=0;
 const PRInt32 kAllocBlockElems = 500;
 static PRInt32 wallet_NextAllocSlot = kAllocBlockElems;
 
-static wallet_MapElement *
-wallet_AllocateMapElement() {
+static nsresult
+wallet_AllocateMapElement(wallet_MapElement*& mapElement) {
   static wallet_MapElement* mapElementTable;
   if (wallet_NextAllocSlot >= kAllocBlockElems) {
     mapElementTable = new wallet_MapElement[kAllocBlockElems];
     if (!mapElementTable) {
-      return nsnull;
+      return NS_ERROR_OUT_OF_MEMORY;
     }
     if(!wallet_MapElementAllocations_list) {
       wallet_MapElementAllocations_list = new nsVoidArray();
@@ -908,21 +891,34 @@ wallet_AllocateMapElement() {
     }
     wallet_NextAllocSlot = 0;
   }
-  return &mapElementTable[wallet_NextAllocSlot++];
+  mapElement = &mapElementTable[wallet_NextAllocSlot++];
+  return NS_OK;
 }
 
 static void
 wallet_DeallocateMapElements() {
   wallet_MapElement * mapElementPtr;
   PRInt32 count = LIST_COUNT(wallet_MapElementAllocations_list);
+
+  // initialize remainder of last allocated block so we don't crash on []delete
+  for (PRInt32 j=wallet_NextAllocSlot; j<kAllocBlockElems; j++) {
+    mapElementPtr =
+      NS_STATIC_CAST(wallet_MapElement*,
+                     (wallet_MapElementAllocations_list)->ElementAt(count-1));
+    mapElementPtr[j].item1 = nsnull;
+    mapElementPtr[j].item2 = nsnull;
+    mapElementPtr[j].itemList = nsnull;
+  }
+
   for (PRInt32 i=count-1; i>=0; i--) {
     mapElementPtr =
       NS_STATIC_CAST(wallet_MapElement*, (wallet_MapElementAllocations_list)->ElementAt(i));
     delete [] mapElementPtr;
   }  
   delete wallet_MapElementAllocations_list;
-  wallet_MapElementAllocations_list = 0;
+  wallet_MapElementAllocations_list = nsnull;
   wallet_NextAllocSlot = kAllocBlockElems;
+
 }
 
 /*
@@ -930,8 +926,8 @@ wallet_DeallocateMapElements() {
  */
 static PRBool
 wallet_WriteToList(
-    nsString item1,     // not ref. Locally modified
-    nsString item2,     // not ref. Locally modified
+    const char* item1,
+    const char* item2,
     nsVoidArray* itemList,
     nsVoidArray*& list,
     PRBool obscure,
@@ -940,12 +936,12 @@ wallet_WriteToList(
   wallet_MapElement * mapElementPtr;
   PRBool added_to_list = PR_FALSE;
 
-  wallet_MapElement * mapElement;
+  wallet_MapElement * mapElement = nsnull;
   if (list == wallet_FieldToSchema_list || list == wallet_SchemaStrings_list ||
       list == wallet_PositionalSchema_list || list == wallet_StateSchema_list ||
       list == wallet_SchemaConcat_list  || list == wallet_DistinguishedSchema_list ||
       list == wallet_VcardToSchema_list) {
-    mapElement = wallet_AllocateMapElement();
+    wallet_AllocateMapElement(mapElement);
   } else {
     mapElement = new wallet_MapElement;
   }
@@ -953,25 +949,28 @@ wallet_WriteToList(
     return PR_FALSE;
   }
 
-  ToLowerCase(item1);
+  nsCAutoString item1UTF8(item1); ToLowerCase(item1UTF8);
+  mapElement->item1 = ToNewCString(item1UTF8);
+  mapElement->item2 = PL_strdup(item2);
+  mapElement->itemList = itemList;
+
   if (obscure) {
-    nsAutoString crypt;
-    if (NS_FAILED(Wallet_Encrypt(item2, crypt))) {
+    char * crypt = nsnull;
+    if (NS_FAILED(EncryptString(mapElement->item2, crypt))) {
+      delete mapElement;
       return PR_FALSE;
     }
-    item2 = crypt;
+    WALLET_FREEIF(mapElement->item2);
+    mapElement->item2 = crypt;
   }
 
-  mapElement->item1 = item1;
-  mapElement->item2 = item2;
-  mapElement->itemList = itemList;
-
   /* make sure the list exists */
   if(!list) {
-      list = new nsVoidArray();
-      if(!list) {
-          return PR_FALSE;
-      }
+    list = new nsVoidArray();
+    if(!list) {
+      delete mapElement;
+      return PR_FALSE;
+    }
   }
 
   /*
@@ -997,22 +996,22 @@ wallet_WriteToList(
           wallet_Sublist * sublistPtr2;
           sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(0));
           sublistPtr2 = NS_STATIC_CAST(wallet_Sublist*, itemList->ElementAt(0));
-          if(sublistPtr->item.Length() < sublistPtr2->item.Length()) {
+          if(PL_strlen(sublistPtr->item) < PL_strlen(sublistPtr2->item)) {
             list->InsertElementAt(mapElement, i);
             added_to_list = PR_TRUE;
             break;
           }
-        } else if (mapElementPtr->item2.Length() < item2.Length()) {
+        } else if (PL_strlen(mapElementPtr->item2) < PL_strlen(mapElement->item2)) {
           list->InsertElementAt(mapElement, i);
           added_to_list = PR_TRUE;
           break;
         }
       }
-    } else if(mapElementPtr->item1.Equals(item1)) {
+    } else if(!PL_strcmp(mapElementPtr->item1, mapElement->item1)) {
       if (DUP_OVERWRITE==placement) {
         delete mapElement;
-        mapElementPtr->item1 = item1;
-        mapElementPtr->item2 = item2;
+        mapElementPtr->item1 = mapElement->item1;
+        mapElementPtr->item2 = mapElement->item2;
         mapElementPtr->itemList = itemList;
       } else if (DUP_BEFORE==placement) {
         list->InsertElementAt(mapElement, i);
@@ -1021,7 +1020,7 @@ wallet_WriteToList(
         added_to_list = PR_TRUE;
         break;
       }
-    } else if(Compare(mapElementPtr->item1,item1)>=0) {
+    } else if(PL_strcmp(mapElementPtr->item1, mapElement->item1)>=0) {
       list->InsertElementAt(mapElement, i);
       added_to_list = PR_TRUE;
       break;
@@ -1038,8 +1037,8 @@ wallet_WriteToList(
  */
 static PRBool
 wallet_ReadFromList(
-  nsString item1,
-  nsString& item2,
+  const nsACString& item1,
+  nsACString& item2,
   nsVoidArray*& itemList,
   nsVoidArray*& list,
   PRBool obscure,
@@ -1051,17 +1050,18 @@ wallet_ReadFromList(
 
   /* find item1 in the list */
   wallet_MapElement * mapElementPtr;
-  ToLowerCase(item1);
   PRInt32 count = LIST_COUNT(list);
   for (PRInt32 i=index; i<count; i++) {
     mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
-    if(mapElementPtr->item1.Equals(item1)) {
+    if(item1.Equals(mapElementPtr->item1,  nsCaseInsensitiveCStringComparator())) {
       if (obscure) {
-        if (NS_FAILED(Wallet_Decrypt(mapElementPtr->item2, item2))) {
+        char * plaintext = nsnull;
+        if (NS_FAILED(DecryptString(mapElementPtr->item2, plaintext))) {
           return PR_FALSE;
         }
+        item2 = plaintext;
       } else {
-        item2 = nsAutoString(mapElementPtr->item2);
+        item2 = PL_strdup(mapElementPtr->item2);
       }
       itemList = mapElementPtr->itemList;
       index = i+1;
@@ -1077,8 +1077,8 @@ wallet_ReadFromList(
 
 PRBool
 wallet_ReadFromList(
-  nsString item1,
-  nsString& item2,
+  const nsACString& item1,
+  nsACString& item2,
   nsVoidArray*& itemList,
   nsVoidArray*& list,
   PRBool obscure)
@@ -1166,7 +1166,12 @@ Wallet_UTF8Put(nsOutputFileStream& strm, PRUnichar c) {
   }
 }
 
-static PRUnichar
+static void
+wallet_Put(nsOutputFileStream& strm, char c) {
+  strm.put(c);
+}
+
+static char
 wallet_Get(nsInputFileStream& strm) {
   const PRUint32 buflen = 1000;
   static char buf[buflen+1];
@@ -1180,7 +1185,7 @@ wallet_Get(nsInputFileStream& strm) {
       return 0;
     }
   }
-  return (buf[next++] & 0xFF);
+  return (buf[next++]);
 }
 
 PUBLIC PRUnichar
@@ -1196,8 +1201,9 @@ Wallet_UTF8Get(nsInputFileStream& strm) {
   } else {
     return 0; /* this is an error, input was not utf8 */
   }
-}/*
+}
 
+/*
  * I have an even a simpler set of routines if you are not concerned about UTF-8.  The
  * algorithms for those routines are as follows:
  *
@@ -1331,10 +1337,11 @@ Wallet_RandomName(char* suffix)
  * strip carriage returns and line feeds from end of line
  */
 
-static PRInt32
-wallet_GetLine(nsInputFileStream& strm, nsString& line)
+static nsresult
+wallet_GetLine(nsInputFileStream& strm, const char** lineCString)
 {
   const PRUint32 kInitialStringCapacity = 64;
+  nsCAutoString line;
 
   /* read the line */
   line.Truncate(0);
@@ -1343,14 +1350,14 @@ wallet_GetLine(nsInputFileStream& strm, nsString& line)
   PRInt32 stringCap = kInitialStringCapacity;
   line.SetCapacity(stringCap);
   
-  PRUnichar c;
-  static PRUnichar lastC = '\0';
+  char c;
+  static char lastC = '\0';
   for (;;) {
-    c = Wallet_UTF8Get(strm);
+    c = wallet_Get(strm);
 
     /* check for eof */
     if (c == 0) {
-      return -1;
+      return NS_ERROR_FAILURE;
     }
 
     /* check for line terminator (mac=CR, unix=LF, win32=CR+LF */
@@ -1371,49 +1378,51 @@ wallet_GetLine(nsInputFileStream& strm, nsString& line)
     }
     line += c;
   }
-
+  WALLET_FREEIF(*lineCString);
+  *lineCString = ToNewCString(line);
   return NS_OK;
 }
 
 static PRBool
 wallet_GetHeader(nsInputFileStream& strm)
 {
-  nsAutoString format;
-  nsAutoString buffer;
+  const char* format = nsnull;
 
   /* format revision number */
-  if (NS_FAILED(wallet_GetLine(strm, format))) {
+  if (NS_FAILED(wallet_GetLine(strm, &format))) {
     return PR_FALSE;
   }
-  if (!format.EqualsWithConversion(HEADER_VERSION)) {
-    /* something's wrong */
-    return PR_FALSE;
-  }
-  return PR_TRUE;
+  PRBool rv = !PL_strcmp(format, HEADER_VERSION);
+  WALLET_FREEIF(format);
+  return rv;
+}
+
+/*
+ * Write a line-feed to a file
+ */
+static void
+wallet_EndLine(nsOutputFileStream& strm) {
+  strm.put('\n');
 }
 
 /*
  * Write a line to a file
  */
 static void
-wallet_PutLine(nsOutputFileStream& strm, const nsString& line) {
-  for (PRUint32 i=0; i<line.Length(); i++) {
-    Wallet_UTF8Put(strm, line.CharAt(i));
-  }
-  Wallet_UTF8Put(strm, '\n');
+wallet_PutLine(nsOutputFileStream& strm, const char* line) {
+  strm.write(line, PL_strlen(line));
+  wallet_EndLine(strm);
 }
 
 static void
 wallet_PutHeader(nsOutputFileStream& strm) {
 
   /* format revision number */
-  {
-    nsAutoString temp1;
-    temp1.AssignWithConversion(HEADER_VERSION);
-    wallet_PutLine(strm, temp1);
-  }
+  wallet_PutLine(strm, HEADER_VERSION);
 }
 
+#define WALLET_NULL(_ptr) (!(_ptr) || !(_ptr)[0])
+
 /*
  * write contents of designated list into designated file
  */
@@ -1440,7 +1449,7 @@ wallet_WriteToFile(const char * filename, nsVoidArray* list) {
   }
 
   /* put out the header */
-  if (filename == schemaValueFileName) {
+  if (!PL_strcmp(filename, schemaValueFileName)) {
     wallet_PutHeader(strm);
   }
 
@@ -1449,7 +1458,7 @@ wallet_WriteToFile(const char * filename, nsVoidArray* list) {
   for (PRInt32 i=0; i<count; i++) {
     mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
     wallet_PutLine(strm, (*mapElementPtr).item1);
-    if (!(*mapElementPtr).item2.IsEmpty()) {
+    if (!WALLET_NULL((*mapElementPtr).item2)) {
       wallet_PutLine(strm, (*mapElementPtr).item2);
     } else {
       wallet_Sublist * sublistPtr;
@@ -1459,7 +1468,7 @@ wallet_WriteToFile(const char * filename, nsVoidArray* list) {
         wallet_PutLine(strm, (*sublistPtr).item);
       }
     }
-    wallet_PutLine(strm, nsAutoString());
+    wallet_EndLine(strm);
   }
 
   /* close the stream */
@@ -1491,7 +1500,7 @@ wallet_ReadFromFile
   }
  
   /* read in the header */
-  if (filename == schemaValueFileName) {
+  if (!PL_strcmp(filename, schemaValueFileName)) {
     if (!wallet_GetHeader(strm)) {
       /* something's wrong -- ignore the file */
       strm.close();
@@ -1500,32 +1509,33 @@ wallet_ReadFromFile
   }
 
   for (;;) {
-    if (NS_FAILED(wallet_GetLine(strm, helpMac->item1))) {
+    if (NS_FAILED(wallet_GetLine(strm, &helpMac->item1))) {
       /* end of file reached */
       break;
     }
 
 #ifdef AutoCapture
     /* Distinguished schema list is a list of single entries, not name/value pairs */
-    if (PL_strcmp(filename, distinguishedSchemaFileName) == 0) {
+    if (!PL_strcmp(filename, distinguishedSchemaFileName)) {
       nsVoidArray* dummy = NULL;
       wallet_WriteToList(helpMac->item1, helpMac->item1, dummy, list, PR_FALSE, placement);
       continue;
     }
 #endif
 
-    if (NS_FAILED(wallet_GetLine(strm, helpMac->item2))) {
+    if (NS_FAILED(wallet_GetLine(strm, &helpMac->item2))) {
       /* unexpected end of file reached */
       break;
     }
-    if (helpMac->item2.Length()==0) {
+
+    if (WALLET_NULL(helpMac->item2)) {
       /* the value must have been deleted */
       nsVoidArray* dummy = NULL;
       wallet_WriteToList(helpMac->item1, helpMac->item2, dummy, list, PR_FALSE, placement);
       continue;
     }
 
-    if (NS_FAILED(wallet_GetLine(strm, helpMac->item3))) {
+    if (NS_FAILED(wallet_GetLine(strm, &helpMac->item3))) {
       /* end of file reached */
       nsVoidArray* dummy = NULL;
       wallet_WriteToList(helpMac->item1, helpMac->item2, dummy, list, PR_FALSE, placement);
@@ -1533,54 +1543,53 @@ wallet_ReadFromFile
       return;
     }
 
-    if (helpMac->item3.Length()==0) {
+    if (WALLET_NULL(helpMac->item3)) {
       /* just a pair of values, no need for a sublist */
       nsVoidArray* dummy = NULL;
       wallet_WriteToList(helpMac->item1, helpMac->item2, dummy, list, PR_FALSE, placement);
     } else {
       /* need to create a sublist and put item2 and item3 onto it */
 
-      // don't we leak itemList here?
-
       nsVoidArray * itemList = new nsVoidArray();
       if (!itemList) {
         break;
       }
 
-      // Don't we leak sublist too?
       wallet_Sublist * sublist = new wallet_Sublist;
       if (!sublist) {
         break;
       }
-      sublist->item = helpMac->item2;
+      sublist->item = PL_strdup(helpMac->item2);
       itemList->AppendElement(sublist);
       sublist = new wallet_Sublist;
       if (!sublist) {
+        delete itemList;
         break;
       }
-      sublist->item = helpMac->item3;
+      sublist->item = PL_strdup(helpMac->item3);
       itemList->AppendElement(sublist);
       /* add any following items to sublist up to next blank line */
-      helpMac->dummy.Truncate(0);
       for (;;) {
         /* get next item for sublist */
-        if (NS_FAILED(wallet_GetLine(strm, helpMac->item3))) {
+        if (NS_FAILED(wallet_GetLine(strm, &helpMac->item3))) {
           /* end of file reached */
-          wallet_WriteToList(helpMac->item1, helpMac->dummy, itemList, list, PR_FALSE, placement);
+          wallet_WriteToList(helpMac->item1, nsnull, itemList, list, PR_FALSE, placement);
           strm.close();
           return;
         }
-        if (helpMac->item3.Length()==0) {
+
+        if (WALLET_NULL(helpMac->item3)) {
           /* blank line reached indicating end of sublist */
-          wallet_WriteToList(helpMac->item1, helpMac->dummy, itemList, list, PR_FALSE, placement);
+          wallet_WriteToList(helpMac->item1, nsnull, itemList, list, PR_FALSE, placement);
           break;
         }
         /* add item to sublist */
         sublist = new wallet_Sublist;
         if (!sublist) {
+          delete itemList;
           break;
         }
-        sublist->item = helpMac->item3;
+        sublist->item = PL_strdup(helpMac->item3);
         itemList->AppendElement(sublist);
       }
     }
@@ -1604,7 +1613,7 @@ Wallet_GiveCaveat(nsIDOMWindowInternal* window, nsIPrompt* dialog) {
     } else {
       wallet_Alert(message, dialog);
     }
-    Recycle(message);
+    WALLET_FREE(message);
   }
 }
  
@@ -1613,14 +1622,14 @@ wallet_GetHostFile(nsIURI * url, nsString& outHostFile)
 {
   outHostFile.Truncate(0);
   nsAutoString urlName;
-  char* host;
+  char* host = nsnull;
   nsresult rv = url->GetHost(&host);
   if (NS_FAILED(rv)) {
     return;
   }
   urlName.AppendWithConversion(host);
   nsCRT::free(host);
-  char* file;
+  char* file = nsnull;
   rv = url->GetPath(&file);
   if (NS_FAILED(rv)) {
     return;
@@ -1633,23 +1642,26 @@ wallet_GetHostFile(nsIURI * url, nsString& outHostFile)
   urlName.Left(outHostFile, stringEnd);
 }
 
-static nsString&
-Strip(const nsString& text, nsString& stripText) {
-  for (PRUint32 i=0; i<text.Length(); i++) {
-    PRUnichar c = text.CharAt(i);
+static void
+Strip(const nsString& textUCS2, nsCString& stripText) {
+  NS_ConvertUCS2toUTF8 textUTF8(textUCS2);
+// above line is equivalen to the following (who would have guessed it?)
+//    nsCAutoString textUTF8 = NS_ConvertUCS2toUTF8(textUCS2);
+  for (PRUint32 i=0; i<textUTF8.Length(); i++) {
+    char c = textUTF8.CharAt(i);
     if (nsCRT::IsAsciiAlpha(c) || nsCRT::IsAsciiDigit(c) || c>'~') {
       stripText += c;
     }
   }
-  return stripText;
 }
 
 /*
  * given a displayable text, get the schema
  */
-static void TextToSchema(
+static void
+TextToSchema(
     const nsString& text,
-    nsString& schema)
+    nsACString& schema)
 {
   /* return if no SchemaStrings list exists */
   if (!wallet_SchemaStrings_list) {
@@ -1688,7 +1700,7 @@ static void TextToSchema(
     if (isSubstring) {
 
       /* all strings were contained in the displayable text, accept this schema */
-      schema = mapElementPtr->item1;
+      schema.Assign(mapElementPtr->item1);
       return;
     }
   }
@@ -1697,70 +1709,78 @@ static void TextToSchema(
 /*
  * given a field name, get the value
  */
-static PRInt32 FieldToValue(
+static nsresult 
+FieldToValue(
     const nsString& field,
-    nsString& schema,
-    nsString& value,
+    nsACString& schema,
+    nsString& valueUCS2,
     nsVoidArray*& itemList,
     PRInt32& index)
 {
 
   /* return if no SchemaToValue list exists or if all values previous used */
   if (!wallet_SchemaToValue_list || index == -1) {
-    return -1;
+    return NS_ERROR_FAILURE;
   }
 
   /* if no schema name is given, fetch schema name from field/schema tables */
   nsVoidArray* dummy;
-  nsString stripField;
-  if ((schema.Length() > 0) ||
-      wallet_ReadFromList(Strip(field, stripField), schema, dummy, wallet_FieldToSchema_list, PR_FALSE)) {
+  nsCAutoString stripField;
+  if (schema.IsEmpty()) {
+    Strip(field, stripField);
+  }
+  if (!schema.IsEmpty() ||
+      wallet_ReadFromList(stripField, schema, dummy, wallet_FieldToSchema_list, PR_FALSE)) {
 
     /* schema name found, now attempt to fetch value from schema/value table */ 
+    nsCAutoString valueUTF8;
     PRInt32 index2 = index;
     if ((index >= 0) &&
-        wallet_ReadFromList(schema, value, itemList, wallet_SchemaToValue_list, PR_TRUE, index2)) {
+        wallet_ReadFromList
+          (schema, valueUTF8, itemList, wallet_SchemaToValue_list, PR_TRUE, index2)) {
       /* value found, prefill it into form and return */
+      valueUCS2 = NS_ConvertUTF8toUCS2(valueUTF8);
       index = index2;
-      return 0;
+      return NS_OK;
 
     } else {
 
       /* value not found, see if concatenation rule exists */
       nsVoidArray * itemList2;
-      nsAutoString dummy2;
+      nsCAutoString valueUTF8b;
       if (index > 0) {
         index = 0;
       }
       PRInt32 index0 = index;
       PRInt32 index00 = index;
       PRInt32 index4 = 0;
-      while (wallet_ReadFromList(schema, dummy2, itemList2, wallet_SchemaConcat_list, PR_FALSE, index4)) {
+      while (wallet_ReadFromList(schema, valueUTF8b, itemList2, wallet_SchemaConcat_list, PR_FALSE, index4)) {
 
         /* concatenation rules exist, generate value as a concatenation */
+        nsCAutoString concatenatedValueUTF8;
         wallet_Sublist * sublistPtr;
-        value.SetLength(0);
-        nsAutoString value2;
+        concatenatedValueUTF8.SetLength(0);
+        nsCAutoString valueUTF8c;
         PRInt32 index00max = index0;
 
-        if (dummy2.Length() > 0) {
+        if (!valueUTF8b.IsEmpty()) {
 
           /* single item on rhs of concatenation rule */
           PRInt32 index5 = 0;
           PRInt32 j;
           PRBool failed = PR_FALSE;
           for (j=0; j>index0; j -= 2) {
-            if (!wallet_ReadFromList(dummy2, value2, dummy, wallet_SchemaToValue_list, PR_TRUE, index5)) {
+            if (!wallet_ReadFromList(valueUTF8b, valueUTF8c, dummy, wallet_SchemaToValue_list, PR_TRUE, index5)) {
               failed = PR_TRUE;
               break;
             }
             index00 += 2;
           }
 
-          if (!failed && wallet_ReadFromList(dummy2, value2, dummy, wallet_SchemaToValue_list, PR_TRUE, index5)) {
+          if (!failed && wallet_ReadFromList(valueUTF8b, valueUTF8c, dummy, wallet_SchemaToValue_list, PR_TRUE, index5)) {
 
             /* found an unused value for the single rhs item */
-            value += value2;
+            concatenatedValueUTF8 += valueUTF8c;
             index00 += 2;
           }
           index00max = index00;
@@ -1779,8 +1799,9 @@ static PRInt32 FieldToValue(
           index00 = index0;
           PRInt32 index3 = 0;
           PRBool failed = PR_FALSE;
+          nsCAutoString valueUTF8d; valueUTF8d.Assign(sublistPtr->item);
           for (PRInt32 j=0; j>index0; j -= 2) {
-            if (!wallet_ReadFromList(sublistPtr->item, value2, dummy, wallet_SchemaToValue_list, PR_TRUE, index3)) {
+            if (!wallet_ReadFromList(valueUTF8d, valueUTF8, dummy, wallet_SchemaToValue_list, PR_TRUE, index3)) {
 
               /* all values of next multi-rhs item were used previously */
               failed = PR_TRUE;
@@ -1789,13 +1810,13 @@ static PRInt32 FieldToValue(
             index00 += 2;
           }
 
-          if (!failed && wallet_ReadFromList(sublistPtr->item, value2, dummy, wallet_SchemaToValue_list, PR_TRUE, index3)) {
-            if (value.Length()>0) {
-              value.Append(NS_LITERAL_STRING(" "));
+          if (!failed && wallet_ReadFromList(valueUTF8d, valueUTF8, dummy, wallet_SchemaToValue_list, PR_TRUE, index3)) {
+            if (!concatenatedValueUTF8.IsEmpty()) {
+              concatenatedValueUTF8 += " ";
             }
 
             /* found an unused value for the multi-rhs item */
-            value += value2;
+            concatenatedValueUTF8 += valueUTF8;
             index00 += 2;
           }
           if (index00 > index00max) {
@@ -1804,11 +1825,12 @@ static PRInt32 FieldToValue(
         }
 
         itemList = nsnull;
-        if (value.Length()>0) {
+        if (!concatenatedValueUTF8.IsEmpty()) {
 
           /* a new value was found */
           index -= 2;
-          return 0;
+          valueUCS2 = NS_ConvertUTF8toUCS2(concatenatedValueUTF8);
+          return NS_OK;
         }
 
         /* all values from this concat rule were used, go on to next concat rule */
@@ -1817,29 +1839,33 @@ static PRInt32 FieldToValue(
 
       /* no more concat rules, indicate failure */
       index = -1;
-      return -1;
+      return NS_ERROR_FAILURE;
     }
   } else {
     /* schema name not found, use field name as schema name and fetch value */
     PRInt32 index2 = index;
 
-    nsAutoString temp;
-    wallet_GetHostFile(wallet_lastUrl, temp);
-    temp.Append(NS_LITERAL_STRING(":"));
-    temp.Append(field);
+    nsAutoString localSchemaUCS2;
+    wallet_GetHostFile(wallet_lastUrl, localSchemaUCS2);
+    localSchemaUCS2.Append(NS_LITERAL_STRING(":"));
+    localSchemaUCS2.Append(field);
+    nsCAutoString localSchemaUTF8 = NS_ConvertUCS2toUTF8(localSchemaUCS2);
+    nsCAutoString valueUTF8;
 
-    if (wallet_ReadFromList(temp, value, itemList, wallet_SchemaToValue_list, PR_TRUE, index2)) {
+    if (wallet_ReadFromList
+        (localSchemaUTF8, valueUTF8, itemList, wallet_SchemaToValue_list, PR_TRUE, index2)) {
       /* value found, prefill it into form */
-      schema = temp;
+      schema = localSchemaUTF8;
       index = index2;
-      return 0;
+      valueUCS2 = NS_ConvertUTF8toUCS2(valueUTF8);
+      return NS_OK;
     }
   }
   index = -1;
-  return -1;
+  return NS_ERROR_FAILURE;
 }
 
-static PRInt32
+static nsresult
 wallet_GetSelectIndex(
   nsIDOMHTMLSelectElement* selectElement,
   const nsString& value,
@@ -1871,13 +1897,13 @@ wallet_GetSelectIndex(
           optionText.Trim(" \n\t\r");
           if (valueLC==optionValue || valueLC==optionText) {
             index = optionX;
-            return 0;
+            return NS_OK;
           }
         }
       }
     }
   }
-  return -1;
+  return NS_ERROR_FAILURE;
 }
 
 void
@@ -1954,17 +1980,17 @@ wallet_StepForwardOrBack
     }
 
     /* if we've reached a #text node, append it to accumulated text */
-    nsAutoString siblingName;
-    result = elementNode->GetNodeName(siblingName);
-    nsCAutoString siblingCName; siblingCName.AssignWithConversion(siblingName);
-    if (siblingCName.EqualsIgnoreCase("#text")) {
+    nsAutoString siblingNameUCS2;
+    result = elementNode->GetNodeName(siblingNameUCS2);
+    nsCAutoString siblingNameUTF8; siblingNameUTF8.AssignWithConversion(siblingNameUCS2);
+    if (siblingNameUTF8.EqualsIgnoreCase("#text")) {
       nsAutoString siblingValue;
       result = elementNode->GetNodeValue(siblingValue);
       text.Append(siblingValue);      
     }
 
     /* if we've reached a SCRIPT node, don't fetch its siblings */
-    if (siblingCName.EqualsIgnoreCase("SCRIPT")) {
+    if (siblingNameUTF8.EqualsIgnoreCase("SCRIPT")) {
       return;
     }
 
@@ -1996,10 +2022,10 @@ wallet_StepForwardOrBack
 //static nsICaseConversion* gCaseConv =  nsnull;
 
 static void
-wallet_ResolvePositionalSchema(nsIDOMNode* elementNode, nsString& schema) {
+wallet_ResolvePositionalSchema(nsIDOMNode* elementNode, nsACString& schema) {
   static PRInt32 numerator = 0;
   static PRInt32 denominator = 0;
-  static nsString lastPositionalSchema;
+  static nsCString lastPositionalSchema;
 
   /* return if no PositionalSchema list exists */
   if (!wallet_PositionalSchema_list) {
@@ -2007,12 +2033,12 @@ wallet_ResolvePositionalSchema(nsIDOMNode* elementNode, nsString& schema) {
     return;
   }
 
-  if (schema.Length()) {
+  if (!schema.IsEmpty()) {
     numerator = 0;
     denominator = 0;
-    lastPositionalSchema = schema;
+    lastPositionalSchema.Assign(schema);
   } else if (numerator < denominator) {
-    schema = lastPositionalSchema;
+    schema.Assign(lastPositionalSchema);
   } else {
     schema.SetLength(0);
     return;
@@ -2023,7 +2049,7 @@ wallet_ResolvePositionalSchema(nsIDOMNode* elementNode, nsString& schema) {
   PRInt32 count = LIST_COUNT(wallet_PositionalSchema_list);
   for (PRInt32 i=0; i<count; i++) {
     mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_PositionalSchema_list->ElementAt(i));
-    if (mapElementPtr->item1.EqualsIgnoreCase(schema)) {
+    if (schema.Equals(mapElementPtr->item1, nsCaseInsensitiveCStringComparator())) {
       /* found our positional schema in the list */
 
       /* A "position set" is a set of continuous <input> or <select> fields
@@ -2113,11 +2139,11 @@ wallet_ResolvePositionalSchema(nsIDOMNode* elementNode, nsString& schema) {
         }
       }
 
-      nsAutoString fractionString; /* of form 2/5 meaning 2nd in a 5-element set */
-      nsAutoString fractionStringWithoutDenominator; /* of form 2/ meaning 2nd in any-length set */
+      nsCAutoString fractionString; /* of form 2/5 meaning 2nd in a 5-element set */
+      nsCAutoString fractionStringWithoutDenominator; /* of form 2/ meaning 2nd in any-length set */
       fractionString.SetLength(0);
       fractionString.AppendInt(numerator);
-      fractionString.Append(NS_LITERAL_STRING("/"));
+      fractionString.Append("/");
       fractionStringWithoutDenominator.Assign(fractionString);
       fractionString.AppendInt(denominator);
 
@@ -2127,29 +2153,28 @@ wallet_ResolvePositionalSchema(nsIDOMNode* elementNode, nsString& schema) {
       for (PRInt32 j=0; j<count2; j=j+2) {
         sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j));
 
-        if (sublistPtr->item.EqualsWithConversion(fractionString) ||
-            sublistPtr->item.EqualsWithConversion(fractionStringWithoutDenominator)) {
+        if (!PL_strcmp(sublistPtr->item, fractionString.get()) ||
+            !PL_strcmp(sublistPtr->item, fractionStringWithoutDenominator.get())) {
           sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
-          schema = sublistPtr->item;
+          schema.Assign(sublistPtr->item);
           return;
         }
       }
     }
   }
-  schema.SetLength(0);
 }
 
-static nsString previousElementState;
+const char* previousElementState = nsnull;
 static nsIDOMNode* previousElementNode;
 
 static void
 wallet_InitializeStateTesting() {
   previousElementNode = nsnull;
-  previousElementState.SetLength(0);
+  previousElementState = nsnull;
 }
 
 static void
-wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsString& schema) {
+wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsACString& schema) {
 
   /* return if no StateSchema list exists */
   if (!wallet_StateSchema_list) {
@@ -2161,7 +2186,7 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsString& schema) {
   PRInt32 count = LIST_COUNT(wallet_StateSchema_list);
   for (PRInt32 i=0; i<count; i++) {
     mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_StateSchema_list->ElementAt(i));
-    if (mapElementPtr->item1.EqualsIgnoreCase(schema)) {
+    if (schema.Equals(mapElementPtr->item1, nsCaseInsensitiveCStringComparator())) {
       /* found our state schema in the list */
 
       /* A state-schema entry consists of a set of possible states and the schema associated
@@ -2191,7 +2216,7 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsString& schema) {
         nsAutoString text;
         wallet_StepForwardOrBack(localElementNode, text, atInputOrSelect, atEnd, PR_FALSE);
 
-        /* see if its a node we already saved the state for */
+        /* see if it's a node we already saved the state for */
         if (localElementNode == previousElementNode) {
           previousElementNode = elementNode;
 
@@ -2201,27 +2226,24 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsString& schema) {
           PRInt32 j;
           for (j=0; j<count2; j=j+2) {
             sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j));
-
-            /* next state in list obtained, test to see if it is the state of the previous node */
-            if (sublistPtr->item.EqualsIgnoreCase(previousElementState)) {
+            if (!PL_strcasecmp(sublistPtr->item, previousElementState)) {
               previousElementState = sublistPtr->item;
               sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
-              schema = sublistPtr->item;
+              schema.Assign(sublistPtr->item);
               return;
             }
 
             /* test to see if we obtained the catch-all (*) state.
              *   Note: the catch-all must be the last entry in the list
              */
-            if (sublistPtr->item.Equals(NS_LITERAL_STRING("*"))) {
+            if (!PL_strcmp(sublistPtr->item, "*")) {
               sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
-              schema = sublistPtr->item;
+              schema.Assign(sublistPtr->item);
               return;
             }
           }
 
           /* no catch-all state specified, return no schema */
-          schema.SetLength(0);
           return;
         }
 
@@ -2236,7 +2258,7 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsString& schema) {
             previousElementState = sublistPtr->item;
             previousElementNode = elementNode;
             sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
-            schema = sublistPtr->item;
+            schema.Assign(sublistPtr->item);
             return;
           }
         }
@@ -2247,17 +2269,16 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsString& schema) {
       PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
       for (PRInt32 j=0; j<count2; j=j+2) {
         sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j));
-        if (sublistPtr->item.Equals(NS_LITERAL_STRING("*"))) {
+        if (!PL_strcmp(sublistPtr->item, "*")) {
           previousElementNode = localElementNode;
           sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
-          schema = sublistPtr->item;
+          schema.Assign(sublistPtr->item);
           previousElementNode = elementNode;
           return;
         }
       }
 
       /* no catch-all state specified, return no schema */
-      schema.SetLength(0);
       previousElementNode = elementNode;
       return;
     }
@@ -2271,14 +2292,15 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsString& schema) {
 }
 
 static void
-wallet_GetSchemaFromDisplayableText(nsIDOMNode* elementNode, nsString& schema, PRBool skipStateChecking) {
+wallet_GetSchemaFromDisplayableText
+    (nsIDOMNode* elementNode, nsACString& schema, PRBool skipStateChecking) {
 
-  static nsString lastSchema;
+  static nsCString lastSchema;
   static nsIDOMNode* lastElementNode;
 
   /* return if this is the same as the last element node */
   if (elementNode == lastElementNode) {
-    schema = lastSchema;
+    schema.Assign(lastSchema);
     return;
   }
   lastElementNode = elementNode;
@@ -2310,18 +2332,18 @@ wallet_GetSchemaFromDisplayableText(nsIDOMNode* elementNode, nsString& schema, P
       someTextFound = PR_TRUE;
 
       TextToSchema(text, schema);
-      if (schema.Length()) {
+      if (!schema.IsEmpty()) {
 
         /* schema found, process positional schema if any */
-        if (schema.Length() && schema.CharAt(0) == '%') {
+        if (!schema.IsEmpty() && schema.First() == '%') {
           wallet_ResolvePositionalSchema(elementNode, schema);
         }
 
         /* process state schema if any */
-        if (!skipStateChecking && schema.Length() && schema.CharAt(0) == '$') {
+        if (!skipStateChecking && !schema.IsEmpty() && schema.First() == '$') {
           wallet_ResolveStateSchema(elementNode, schema); 
         }
-        lastSchema = schema;
+        lastSchema.Assign(schema);
         return;
       }
 
@@ -2350,11 +2372,11 @@ wallet_GetSchemaFromDisplayableText(nsIDOMNode* elementNode, nsString& schema, P
    * of the skipStateChecking argument.
    */
 
-  if (!skipStateChecking && schema.Length() && schema.CharAt(0) == '$') {
+  if (!skipStateChecking && !schema.IsEmpty() && schema.First() == '$') {
     wallet_ResolveStateSchema(elementNode, schema); 
   }
 
-  lastSchema = schema;
+  lastSchema.Assign(schema);
   return;
 }
 
@@ -2363,18 +2385,17 @@ wallet_GetPrefills(
   nsIDOMNode* elementNode,
   nsIDOMHTMLInputElement*& inputElement,  
   nsIDOMHTMLSelectElement*& selectElement,
-  nsString& schema,
+  nsACString& schema,
   nsString& value,
   PRInt32& selectIndex,
   PRInt32& index)
 {
   nsresult result;
+  nsCAutoString localSchema; localSchema.Assign(schema);
 
   /* get prefills for input element */
   result = elementNode->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement);
 
-  // The below code looks really suspicious leak-wize
-
   if ((NS_SUCCEEDED(result)) && (nsnull != inputElement)) {
     nsAutoString type;
     result = inputElement->GetType(type);
@@ -2385,52 +2406,50 @@ wallet_GetPrefills(
         nsVoidArray* itemList;
 
         /* try to get schema name from vcard attribute if it exists */
-        if (schema.Length() == 0) {
+        if (localSchema.IsEmpty()) {
           nsCOMPtr<nsIDOMElement> element = do_QueryInterface(elementNode);
           if (element) {
             nsAutoString vcard; vcard.Assign(NS_LITERAL_STRING("VCARD_NAME"));
-            nsAutoString vcardValue;
-            result = element->GetAttribute(vcard, vcardValue);
+            nsAutoString vcardValueUCS2;
+            result = element->GetAttribute(vcard, vcardValueUCS2);
             if (NS_OK == result) {
               nsVoidArray* dummy;
-              wallet_ReadFromList(vcardValue, schema, dummy, wallet_VcardToSchema_list, PR_FALSE);
+              wallet_ReadFromList(NS_ConvertUCS2toUTF8(vcardValueUCS2), localSchema, dummy,
+                                  wallet_VcardToSchema_list, PR_FALSE);
             }
           }
         }
 
         /* try to get schema name from displayable text if possible */
-        if (schema.Length() == 0) {
-          wallet_GetSchemaFromDisplayableText(inputElement, schema, PR_FALSE);
+        if (localSchema.IsEmpty()) {
+          wallet_GetSchemaFromDisplayableText(inputElement, localSchema, PR_FALSE);
         }
 
 #ifdef IgnoreFieldNames
 // use displayable text instead of field names
-if (schema.Length()) {
+if (!localSchema.IsEmpty()) {
 #endif
 
         /*
          * if schema name was obtained then get value from schema name,
          * otherwise get value from field name by using mapping tables to get schema name
          */
-        if (FieldToValue(field, schema, value, itemList, index) == 0) {
+        if (NS_SUCCEEDED(FieldToValue(field, localSchema, value, itemList, index))) {
           if (value.IsEmpty() && nsnull != itemList) {
             /* pick first of a set of synonymous values */
-            nsAutoString encryptedValue( ((wallet_Sublist *)itemList->ElementAt(0))->item );
-            if (NS_FAILED(Wallet_Decrypt(encryptedValue, value))) {
+            const char* encryptedValue = ((wallet_Sublist *)itemList->ElementAt(0))->item;
+            char* valueCString = nsnull;
+            if (NS_FAILED(DecryptString(encryptedValue, valueCString))) {
               NS_RELEASE(inputElement);
               return NS_ERROR_FAILURE;
             }
+            value = NS_ConvertUTF8toUCS2(valueCString);
           }
           selectElement = nsnull;
           selectIndex = -1;
+          schema = localSchema;
           return NS_OK;
         }
-
-#ifdef IgnoreFieldNames
-// use displayable text instead of field names
-}
-#endif
-
       }
     }
     NS_RELEASE(inputElement);
@@ -2445,30 +2464,31 @@ if (schema.Length()) {
     if (NS_SUCCEEDED(result)) {
 
       /* try to get schema name from displayable text if possible */
-      wallet_GetSchemaFromDisplayableText(selectElement, schema, PR_FALSE);
+      if (localSchema.IsEmpty()) {
+        wallet_GetSchemaFromDisplayableText(selectElement, localSchema, PR_FALSE);
+      }
 
 #ifdef IgnoreFieldNames
 // use displayable text instead of field names
-if (schema.Length()) {
+if (!localSchema.IsEmpty()) {
 #endif
 
       nsVoidArray* itemList;
-      if (FieldToValue(field, schema, value, itemList, index) == 0) {
+      if (NS_SUCCEEDED(FieldToValue(field, localSchema, value, itemList, index))) {
         if (!value.IsEmpty()) {
           /* no synonym list, just one value to try */
           result = wallet_GetSelectIndex(selectElement, value, selectIndex);
           if (NS_SUCCEEDED(result)) {
             /* value matched one of the values in the drop-down list */
 
-            // No Release() here?
-
             inputElement = nsnull;
+            schema = localSchema;
             return NS_OK;
           }
         } else {
           /* synonym list exists, try each value */
           for (PRInt32 i=0; i<LIST_COUNT(itemList); i++) {
-            value = ((wallet_Sublist *)itemList->ElementAt(i))->item;
+            value = NS_ConvertUTF8toUCS2(((wallet_Sublist *)itemList->ElementAt(i))->item);
             result = wallet_GetSelectIndex(selectElement, value, selectIndex);
             if (NS_SUCCEEDED(result)) {
               /* value matched one of the values in the drop-down list */
@@ -2476,18 +2496,12 @@ if (schema.Length()) {
               // No Release() here?
 
               inputElement = nsnull;
+              schema = localSchema;
               return NS_OK;
             }
           }
         }
       }
-
-
-#ifdef IgnoreFieldNames
-// use displayable text instead of field names
-}
-#endif
-
     }
     NS_RELEASE(selectElement);
   }
@@ -2510,7 +2524,7 @@ Wallet_ReleaseAllLists() {
 #endif
     wallet_DeallocateMapElements();
     delete helpMac;
-    helpMac = 0;
+    helpMac = nsnull;
 }
 
 //#define WALLET_CHECK_FOOTPRINT
@@ -2524,14 +2538,14 @@ wallet_Size(nsVoidArray * list) {
     mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
     size += sizeof(wallet_MapElement*);
     size += sizeof(wallet_MapElement);
-    size += 2*(mapElementPtr->item1).Length();
-    size += 2*(mapElementPtr->item2).Length();
+    size += PL_strlen(mapElementPtr->item1);
+    size += PL_strlen(mapElementPtr->item2);
     wallet_Sublist * sublistPtr;
     PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
     for (PRInt32 i2=0; i2<count2; i2++) {
       sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
       size += sizeof(wallet_Sublist);
-      size += 2*(sublistPtr->item).Length();
+      size += PL_strlen(sublistPtr->item);
     }
   }
   return size;
@@ -2695,15 +2709,15 @@ wallet_InitializeCurrentURL(nsIDocument * doc) {
 
 #define SEPARATOR "#*%$"
 
-static PRInt32
+static nsresult
 wallet_GetNextInString(const nsString& str, nsString& head, nsString& tail) {
   PRInt32 separator = str.Find(SEPARATOR);
   if (separator == -1) {
-    return -1;
+    return NS_ERROR_FAILURE;
   }
   str.Left(head, separator);
   str.Mid(tail, separator+sizeof(SEPARATOR)-1, str.Length() - (separator+sizeof(SEPARATOR)-1));
-  return 0;
+  return NS_OK;
 }
 
 static void
@@ -2716,7 +2730,7 @@ wallet_ReleasePrefillElementList(nsVoidArray * wallet_PrefillElement_list) {
       delete prefillElementPtr;
     }
     delete wallet_PrefillElement_list;
-    wallet_PrefillElement_list = 0;
+    wallet_PrefillElement_list = nsnull;
   }
 }
 
@@ -2729,25 +2743,21 @@ PUBLIC void
 WLLT_GetPrefillListForViewer(nsString& aPrefillList)
 {
   wallet_Initialize(PR_FALSE); /* to initialize helpMac */
-  wallet_PrefillElement * mapElementPtr;
+  wallet_PrefillElement * prefillElementPtr;
   nsAutoString buffer;
   PRInt32 count = LIST_COUNT(wallet_list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_PrefillElement*, wallet_list->ElementAt(i));
+    prefillElementPtr = NS_STATIC_CAST(wallet_PrefillElement*, wallet_list->ElementAt(i));
     buffer.AppendWithConversion(BREAK);
-    buffer.AppendInt(mapElementPtr->count,10);
+    buffer.AppendInt(prefillElementPtr->count,10);
     buffer.AppendWithConversion(BREAK);
-    buffer.Append(mapElementPtr->schema);
+    buffer.Append(NS_ConvertUTF8toUCS2(prefillElementPtr->schema));
     buffer.AppendWithConversion(BREAK);
-    buffer.Append(mapElementPtr->value);
+    buffer.Append(prefillElementPtr->value);
   }
 
-  PRUnichar * urlUnichar = ToNewUnicode(wallet_url);
   buffer.AppendWithConversion(BREAK);
-
-  buffer += urlUnichar;
-  Recycle(urlUnichar);
-
+  buffer += wallet_url.get();
   aPrefillList = buffer;
 }
 
@@ -2761,6 +2771,45 @@ wallet_FreeURL(wallet_MapElement *url) {
     PR_Free(url);
 }
 
+const char* permission_NoCapture_NoPreview = "yy";
+const char* permission_NoCapture_Preview = "yn";
+const char* permission_Capture_NoPreview = "ny";
+const char* permission_Capture_Preview = "nn";
+
+PRIVATE void
+wallet_SetNoPreview(nsACString& permission, char noPreview) {
+  if (noPreview == 'y') {
+    if (NO_CAPTURE(permission) == 'y') {
+      permission = permission_NoCapture_NoPreview;
+    } else {
+      permission = permission_Capture_NoPreview;
+    }
+  } else {
+    if (NO_CAPTURE(permission) == 'y') {
+      permission = permission_NoCapture_Preview;
+    } else {
+      permission = permission_Capture_Preview;
+    }
+  }
+}
+
+PRIVATE void
+wallet_SetNoCapture(nsACString& permission, char noCapture) {
+  if (noCapture == 'y') {
+    if (NO_PREVIEW(permission) == 'y') {
+      permission = permission_NoCapture_NoPreview;
+    } else {
+      permission = permission_NoCapture_Preview;
+    }
+  } else {
+    if (NO_PREVIEW(permission) == 'y') {
+      permission = permission_NoCapture_NoPreview;
+    } else {
+      permission = permission_NoCapture_Preview;
+    }
+  }
+}
+
 PUBLIC void
 Wallet_SignonViewerReturn(const nsString& results)
 {
@@ -2776,8 +2825,8 @@ Wallet_SignonViewerReturn(const nsString& results)
       count--;
       url = NS_STATIC_CAST(wallet_MapElement*, wallet_URL_list->ElementAt(count));
       if (url && SI_InSequence(gone, count)) {
-        url->item2.SetCharAt('n', NO_PREVIEW);
-        if (url->item2.CharAt(NO_CAPTURE) == 'n') {
+        wallet_SetNoPreview(nsCAutoString(url->item2), 'n');
+        if (!PL_strcmp(url->item2, permission_Capture_Preview)) {
           wallet_FreeURL(url);
           wallet_WriteToFile(URLFileName, wallet_URL_list);
         }
@@ -2793,8 +2842,8 @@ Wallet_SignonViewerReturn(const nsString& results)
       count2--;
       url = NS_STATIC_CAST(wallet_MapElement*, wallet_URL_list->ElementAt(count2));
       if (url && SI_InSequence(gone, count2)) {
-        url->item2.SetCharAt('n', NO_CAPTURE);
-        if (url->item2.CharAt(NO_PREVIEW) == 'n') {
+        wallet_SetNoCapture(nsCAutoString(url->item2), 'n');
+        if (!PL_strcmp(url->item2, permission_Capture_Preview)) {
           wallet_FreeURL(url);
           wallet_WriteToFile(URLFileName, wallet_URL_list);
         }
@@ -2807,8 +2856,7 @@ Wallet_SignonViewerReturn(const nsString& results)
  * see if user wants to capture data on current page
  */
 PRIVATE PRBool
-wallet_OKToCapture(char* urlName, nsIDOMWindowInternal* window) {
-  nsAutoString url; url.AssignWithConversion(urlName);
+wallet_OKToCapture(const nsAFlatCString& url, nsIDOMWindowInternal* window) {
 
   /* exit if pref is not set */
   if (!wallet_GetFormsCapturingPref() || !wallet_GetEnabledPref()) {
@@ -2818,9 +2866,10 @@ wallet_OKToCapture(char* urlName, nsIDOMWindowInternal* window) {
   /* see if this url is already on list of url's for which we don't want to capture */
   wallet_InitializeURLList();
   nsVoidArray* dummy;
-  nsAutoString value; value.Assign(NS_LITERAL_STRING("nn"));
-  if (wallet_ReadFromList(url, value, dummy, wallet_URL_list, PR_FALSE)) {
-    if (value.CharAt(NO_CAPTURE) == 'y') {
+  nsCAutoString urlPermissions;
+  if (wallet_ReadFromList(url, urlPermissions, dummy, wallet_URL_list, PR_FALSE)) {
+    if (urlPermissions.Equals(permission_Capture_Preview) ||
+        urlPermissions.Equals(permission_Capture_NoPreview)) {
       return PR_FALSE;
     }
   }
@@ -2831,12 +2880,12 @@ wallet_OKToCapture(char* urlName, nsIDOMWindowInternal* window) {
   PRInt32 button = Wallet_3ButtonConfirm(message, window);
   if (button == NEVER_BUTTON) {
     /* add URL to list with NO_CAPTURE indicator set */
-    value.SetCharAt('y', NO_CAPTURE);
-    if (wallet_WriteToList(url, value, dummy, wallet_URL_list, PR_FALSE, DUP_OVERWRITE)) {
+    wallet_SetNoCapture(nsCAutoString(urlPermissions), 'y');
+    if (wallet_WriteToList(url.get(), urlPermissions.get(), dummy, wallet_URL_list, PR_FALSE, DUP_OVERWRITE)) {
       wallet_WriteToFile(URLFileName, wallet_URL_list);
     }
   }
-  Recycle(message);
+  WALLET_FREE(message);
   return (button == YES_BUTTON);
 }
 #endif
@@ -2845,7 +2894,7 @@ wallet_OKToCapture(char* urlName, nsIDOMWindowInternal* window) {
  * capture the value of a form element
  */
 PRIVATE PRBool
-wallet_Capture(nsIDocument* doc, const nsString& field, const nsString& value, const nsString& schema)
+wallet_Capture(nsIDocument* doc, const nsString& field, const nsString& value, nsACString& schema)
 {
   /* do nothing if there is no value */
   if (!value.Length()) {
@@ -2858,27 +2907,32 @@ wallet_Capture(nsIDocument* doc, const nsString& field, const nsString& value, c
 
 #ifdef IgnoreFieldNames
 // use displayable text instead of field names
-  if (!schema.Length()) {
+  if (schema.IsEmpty()) {
     return PR_FALSE;
   }
 #endif
 
-  nsAutoString oldValue;
+  const char* valueCString = NS_ConvertUCS2toUTF8(value).get();
+  nsCAutoString oldValue;
 
   /* is there a mapping from this field name to a schema name */
-  nsAutoString localSchema(schema);
+  nsCAutoString localSchema; localSchema.Assign(schema);
   nsVoidArray* dummy;
-  nsString stripField;
-  if (localSchema.Length() ||
-      (wallet_ReadFromList(Strip(field, stripField), localSchema, dummy, wallet_FieldToSchema_list, PR_FALSE))) {
-
+  nsCAutoString stripField;
+  if (localSchema.IsEmpty()) {
+    Strip(field, stripField);
+  }
+  if (!localSchema.IsEmpty() ||
+      (wallet_ReadFromList(stripField, localSchema, dummy,
+                           wallet_FieldToSchema_list, PR_FALSE))) {
     /* field to schema mapping already exists */
 
     /* is this a new value for the schema */
     PRInt32 index = 0;
     PRInt32 lastIndex = index;
     while(wallet_ReadFromList(localSchema, oldValue, dummy, wallet_SchemaToValue_list, PR_TRUE, index)) {
-      if (oldValue == value) {
+      PRBool isNewValue = !oldValue.Equals(valueCString);
+      if (!isNewValue) {
         /*
          * Remove entry from wallet_SchemaToValue_list and then reinsert.  This will
          * keep multiple values in that list for the same field ordered with
@@ -2901,8 +2955,8 @@ wallet_Capture(nsIDocument* doc, const nsString& field, const nsString& value, c
     }
 
     /* this is a new value so store it */
-    dummy = 0;
-    if (wallet_WriteToList(localSchema, value, dummy, wallet_SchemaToValue_list, PR_TRUE)) {
+    dummy = nsnull;
+    if (wallet_WriteToList(localSchema.get(), valueCString, dummy, wallet_SchemaToValue_list, PR_TRUE)) {
       wallet_WriteToFile(schemaValueFileName, wallet_SchemaToValue_list);
     }
 
@@ -2914,13 +2968,15 @@ wallet_Capture(nsIDocument* doc, const nsString& field, const nsString& value, c
     PRInt32 index = 0;
     PRInt32 lastIndex = index;
 
-    nsAutoString concat_param;
-    wallet_GetHostFile(wallet_lastUrl, concat_param);
-    concat_param.Append(NS_LITERAL_STRING(":"));
-    concat_param.Append(field);
-
-    while(wallet_ReadFromList(concat_param, oldValue, dummy, wallet_SchemaToValue_list, PR_TRUE, index)) {
-      if (oldValue == value) {
+    nsAutoString concatParamUCS2;
+    wallet_GetHostFile(wallet_lastUrl, concatParamUCS2);
+    concatParamUCS2.Append(NS_LITERAL_STRING(":"));
+    concatParamUCS2.Append(field);
+    nsCAutoString concatParamUTF8 = NS_ConvertUCS2toUTF8(concatParamUCS2);
+    while(wallet_ReadFromList
+        (concatParamUTF8, oldValue, dummy, wallet_SchemaToValue_list, PR_TRUE, index)) {
+      PRBool isNewValue = !oldValue.Equals(valueCString);
+      if (!isNewValue) {
         /*
          * Remove entry from wallet_SchemaToValue_list and then reinsert.  This will
          * keep multiple values in that list for the same field ordered with
@@ -2941,19 +2997,23 @@ wallet_Capture(nsIDocument* doc, const nsString& field, const nsString& value, c
       }
       lastIndex = index;
 
-      wallet_GetHostFile(wallet_lastUrl, concat_param);
-      concat_param.Append(NS_LITERAL_STRING(":"));
-      concat_param.Append(field);
+      //??? aren't these next four lines redundant?
+      wallet_GetHostFile(wallet_lastUrl, concatParamUCS2);
+      concatParamUCS2.Append(NS_LITERAL_STRING(":"));
+      concatParamUCS2.Append(field);
+      concatParamUTF8 = NS_ConvertUCS2toUTF8(concatParamUCS2);
     }
 
     /* this is a new value so store it */
-    dummy = 0;
-    nsAutoString hostFileField;
-    wallet_GetHostFile(wallet_lastUrl, hostFileField);
-    hostFileField.Append(NS_LITERAL_STRING(":"));
-    hostFileField.Append(field);
+    dummy = nsnull;
+    nsAutoString hostFileFieldUCS2;
+    wallet_GetHostFile(wallet_lastUrl, hostFileFieldUCS2);
+    hostFileFieldUCS2.Append(NS_LITERAL_STRING(":"));
+    hostFileFieldUCS2.Append(field);
 
-    if (wallet_WriteToList(hostFileField, value, dummy, wallet_SchemaToValue_list, PR_TRUE)) {
+    if (wallet_WriteToList
+        (NS_ConvertUCS2toUTF8(hostFileFieldUCS2).get(), valueCString, dummy,
+         wallet_SchemaToValue_list, PR_TRUE)) {
       wallet_WriteToFile(schemaValueFileName, wallet_SchemaToValue_list);
     }
   }
@@ -2977,9 +3037,10 @@ WLLT_GetNopreviewListForViewer(nsString& aNopreviewList)
   PRInt32 count = LIST_COUNT(wallet_URL_list);
   for (PRInt32 i=0; i<count; i++) {
     url = NS_STATIC_CAST(wallet_MapElement*, wallet_URL_list->ElementAt(i));
-    if (url->item2.CharAt(NO_PREVIEW) == 'y') {
+    if (!PL_strcmp(url->item2, permission_Capture_NoPreview) ||
+        !PL_strcmp(url->item2, permission_NoCapture_NoPreview)) {
       buffer.AppendWithConversion(BREAK);
-      buffer += url->item1;
+      buffer += NS_ConvertUTF8toUCS2(url->item1);
     }
   }
   aNopreviewList = buffer;
@@ -2995,9 +3056,10 @@ WLLT_GetNocaptureListForViewer(nsString& aNocaptureList)
   PRInt32 count = LIST_COUNT(wallet_URL_list);
   for (PRInt32 i=0; i<count; i++) {
     url = NS_STATIC_CAST(wallet_MapElement*, wallet_URL_list->ElementAt(i));
-    if (url->item2.CharAt(NO_CAPTURE) == 'y') {
+    if (!PL_strcmp(url->item2, permission_NoCapture_Preview) ||
+        !PL_strcmp(url->item2, permission_NoCapture_NoPreview)) {
       buffer.AppendWithConversion(BREAK);
-      buffer += url->item1;
+      buffer += NS_ConvertUTF8toUCS2(url->item1);
     }
   }
   aNocaptureList = buffer;
@@ -3048,7 +3110,7 @@ WLLT_PostEdit(const nsString& walletList)
     tail.Mid(temp, separator+1, tail.Length() - (separator+1));
     tail = temp;
 
-    wallet_PutLine(strm, head);
+    wallet_PutLine(strm, NS_ConvertUCS2toUTF8(head).get());
   }
 
   /* close the file and read it back into the SchemaToValue list */
@@ -3067,16 +3129,18 @@ WLLT_PreEdit(nsString& walletList)
   for (PRInt32 i=0; i<count; i++) {
     mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_SchemaToValue_list->ElementAt(i));
 
-    walletList += mapElementPtr->item1; walletList.AppendWithConversion(BREAK);
-    if (!mapElementPtr->item2.IsEmpty()) {
-      walletList += mapElementPtr->item2; walletList.AppendWithConversion(BREAK);
+    walletList += NS_ConvertUTF8toUCS2(mapElementPtr->item1);
+    walletList.AppendWithConversion(BREAK);
+    if (!WALLET_NULL(mapElementPtr->item2)) {
+      walletList += NS_ConvertUTF8toUCS2(mapElementPtr->item2);
+      walletList.AppendWithConversion(BREAK);
     } else {
       wallet_Sublist * sublistPtr;
       PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
       for (PRInt32 i2=0; i2<count2; i2++) {
         sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
-        walletList += sublistPtr->item; walletList.AppendWithConversion(BREAK);
-
+        walletList += NS_ConvertUTF8toUCS2(sublistPtr->item);
+        walletList.AppendWithConversion(BREAK);
       }
     }
     walletList.AppendWithConversion(BREAK);
@@ -3123,7 +3187,7 @@ wallet_ReencryptAll(const char * newpref, void* window) {
   gReencryptionLevel ++;
   PRInt32 count = LIST_COUNT(wallet_SchemaToValue_list);
   PRInt32 i = 0;
-  nsAutoString value;
+  char* plainText = nsnull;
 
   /* logout first so there is no conversion unless user knows the master password */
 if (!changingPassword) {
@@ -3140,24 +3204,27 @@ if (!changingPassword) {
   gEncryptionFailure = PR_FALSE;
   for (i=0; i<count && !gEncryptionFailure; i++) {
     mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_SchemaToValue_list->ElementAt(i));
-    if (!mapElementPtr->item2.IsEmpty()) {
-      if (NS_FAILED(Wallet_Decrypt(mapElementPtr->item2, value))) {
+    char * crypt = nsnull;
+    if (!WALLET_NULL(mapElementPtr->item2)) {
+      if (NS_FAILED(DecryptString(mapElementPtr->item2, plainText))) {
         goto fail;
       }
-      if (NS_FAILED(Wallet_Encrypt(value, mapElementPtr->item2))) {
+      if (NS_FAILED(EncryptString(plainText, crypt))) {
         goto fail;
       }
+      mapElementPtr->item2 = crypt;
     } else {
       wallet_Sublist * sublistPtr;
       PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
       for (PRInt32 i2=0; i2<count2; i2++) {
         sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
-        if (NS_FAILED(Wallet_Decrypt(sublistPtr->item, value))) {
+        if (NS_FAILED(DecryptString(sublistPtr->item, plainText))) {
           goto fail;
         }
-        if (NS_FAILED(Wallet_Encrypt(value, sublistPtr->item))) {
+        if (NS_FAILED(EncryptString(plainText, crypt))) {
           goto fail;
         }
+        sublistPtr->item = crypt;
       }
     }
   }
@@ -3181,7 +3248,7 @@ if (!changingPassword) {
 
 //  message = Wallet_Localize("Converted");
 //  wallet_Alert(message, (nsIDOMWindowInternal *)window);
-//  Recycle(message);
+//  WALLET_FREE(message);
   gReencryptionLevel--;
   return 0; /* this is PREF_NOERROR but we no longer include prefapi.h */
 fail:
@@ -3191,7 +3258,7 @@ fail:
   /* alert the user to the failure */
   message = Wallet_Localize("NotConverted");
   wallet_Alert(message, (nsIDOMWindowInternal *)window);
-  Recycle(message);
+  WALLET_FREE(message);
   gReencryptionLevel--;
   return 1;
 }
@@ -3234,12 +3301,12 @@ WLLT_PrefillReturn(const nsString& results)
 
   /* add url to url list if user doesn't want to preview this page in the future */
   if (skip.Equals(NS_LITERAL_STRING("true"))) {
-    nsAutoString url = nsAutoString(urlName);
+    nsCAutoString url = NS_ConvertUCS2toUTF8(urlName);
     nsVoidArray* dummy;
-    nsAutoString value; value.Assign(NS_LITERAL_STRING("nn"));
-    wallet_ReadFromList(url, value, dummy, wallet_URL_list, PR_FALSE);
-    value.SetCharAt('y', NO_PREVIEW);
-    if (wallet_WriteToList(url, value, dummy, wallet_URL_list, PR_FALSE, DUP_OVERWRITE)) {
+    nsCAutoString urlPermissions;
+    wallet_ReadFromList(url, urlPermissions, dummy, wallet_URL_list, PR_FALSE);
+    wallet_SetNoPreview(nsCAutoString(urlPermissions), 'y');
+    if (wallet_WriteToList(url.get(), urlPermissions.get(), dummy, wallet_URL_list, PR_FALSE, DUP_OVERWRITE)) {
       wallet_WriteToFile(URLFileName, wallet_URL_list);
     }
   }
@@ -3273,11 +3340,11 @@ WLLT_PrefillReturn(const nsString& results)
     if (mapElementPtr->count != 0) {
       /* count != 0 indicates a new schema name */
       nsAutoString tail;
-      if (wallet_GetNextInString(fillins, next, tail) == -1) {
+      if (NS_FAILED(wallet_GetNextInString(fillins, next, tail))) {
         break;
       }
       fillins = tail;
-      if (next != mapElementPtr->schema) {
+      if (PL_strcmp(NS_ConvertUCS2toUTF8(next).get(), mapElementPtr->schema)) {
         break; /* something's wrong so stop prefilling */
       }
       wallet_GetNextInString(fillins, next, tail);
@@ -3295,12 +3362,17 @@ WLLT_PrefillReturn(const nsString& results)
        * reordering if the current entry already was first
        */
       if (mapElementPtr->count == 0) {
-        nsAutoString oldValue;
+        nsCAutoString oldvalueUTF8;
         PRInt32 index = 0;
         PRInt32 lastIndex = index;
         nsVoidArray* dummy;
-        while(wallet_ReadFromList(mapElementPtr->schema, oldValue, dummy, wallet_SchemaToValue_list, PR_TRUE, index)) {
-          if (oldValue == mapElementPtr->value) {
+        while(wallet_ReadFromList(nsDependentCString(mapElementPtr->schema),
+                                  oldvalueUTF8,
+                                  dummy,
+                                  wallet_SchemaToValue_list,
+                                  PR_TRUE,
+                                  index)) {
+          if (oldvalueUTF8.Equals(NS_ConvertUCS2toUTF8(mapElementPtr->value).get())) {
             wallet_MapElement * mapElement =
               (wallet_MapElement *) (wallet_SchemaToValue_list->ElementAt(lastIndex));
             wallet_SchemaToValue_list->RemoveElementAt(lastIndex);
@@ -3397,15 +3469,17 @@ wallet_TraversalForPrefill
                            * elements in group will have count field set to 0
                            */
                           prefillElement = new wallet_PrefillElement;
+                          nsCAutoString schemaUTF8;
                           if (NS_SUCCEEDED(wallet_GetPrefills
                               (elementNode,
                               prefillElement->inputElement,
                               prefillElement->selectElement,
-                              prefillElement->schema,
+                              schemaUTF8,
                               prefillElement->value,
                               prefillElement->selectIndex,
                               index))) {
                             /* another value found */
+                            prefillElement->schema = ToNewCString(schemaUTF8);
                             if (nsnull == firstElement) {
                               firstElement = prefillElement;
                             }
@@ -3454,7 +3528,7 @@ WLLT_PrefillOneElement
 {
   nsIDOMHTMLInputElement* inputElement;
   nsIDOMHTMLSelectElement* selectElement;
-  nsString schema;
+  nsCAutoString schema;
   nsString value;
   PRInt32 selectIndex = 0;
   PRInt32 index = 0;
@@ -3476,8 +3550,8 @@ WLLT_PrefillOneElement
             value,
             selectIndex,
             index))) {
-              compositeValue.AppendWithConversion(BREAK);
-              compositeValue.Append(value);
+          compositeValue.AppendWithConversion(BREAK);
+          compositeValue.Append(value);
         }
       }
     }
@@ -3508,7 +3582,7 @@ WLLT_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindowInternal* win)
     if (!gEncryptionFailure) {
       PRUnichar * message = Wallet_Localize("noPrefills");
       wallet_Alert(message, win);
-      Recycle(message);
+      WALLET_FREE(message);
     }
 
     // Shouldn't wallet_PrefillElement_list be deleted here?
@@ -3523,10 +3597,12 @@ WLLT_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindowInternal* win)
   if (!quick) {
     wallet_InitializeURLList();
     nsVoidArray* dummy;
-    nsAutoString value; value.Assign(NS_LITERAL_STRING("nn"));
+    nsCAutoString urlPermissions;
     if (urlName.Length() != 0) {
-      wallet_ReadFromList(urlName, value, dummy, wallet_URL_list, PR_FALSE);
-      noPreview = (value.CharAt(NO_PREVIEW) == 'y');
+      wallet_ReadFromList
+        (NS_ConvertUCS2toUTF8(urlName), urlPermissions, dummy, wallet_URL_list, PR_FALSE);
+      noPreview = (urlPermissions.Equals(permission_Capture_NoPreview) ||
+                   urlPermissions.Equals(permission_NoCapture_NoPreview));
     }
   }
 
@@ -3580,24 +3656,19 @@ wallet_CaptureInputElement(nsIDOMNode* elementNode, nsIDocument* doc) {
         result = inputElement->GetValue(value);
         if (NS_SUCCEEDED(result)) {
           /* get schema name from vcard attribute if it exists */
-          nsAutoString schema;
+          nsCAutoString schema;
           nsCOMPtr<nsIDOMElement> element = do_QueryInterface(elementNode);
           if (element) {
             nsAutoString vcardName; vcardName.Assign(NS_LITERAL_STRING("VCARD_NAME"));
-            nsAutoString vcardValue;
-            result = element->GetAttribute(vcardName, vcardValue);
+            nsAutoString vcardValueUCS2;
+            result = element->GetAttribute(vcardName, vcardValueUCS2);
             if (NS_OK == result) {
               nsVoidArray* dummy;
-              wallet_ReadFromList(vcardValue, schema, dummy, wallet_VcardToSchema_list, PR_FALSE);
+              wallet_ReadFromList(NS_ConvertUCS2toUTF8(vcardValueUCS2), schema, dummy,
+                                  wallet_VcardToSchema_list, PR_FALSE);
             }
           }
-
-#ifdef IgnoreFieldNames
-// use displayable text instead of vcard names
-schema.SetLength(0);
-#endif
-
-          if (!schema.Length()) {
+          if (schema.IsEmpty()) {
             /* get schema from displayable text if possible */
             wallet_GetSchemaFromDisplayableText(inputElement, schema, (value.Length()==0));
           }
@@ -3650,24 +3721,19 @@ wallet_CaptureSelectElement(nsIDOMNode* elementNode, nsIDocument* doc) {
                               && optionText.Length();
               if (valueOK || textOK) {
                 /* get schema name from vcard attribute if it exists */
-                nsAutoString schema;
+                nsCAutoString schema;
                 nsCOMPtr<nsIDOMElement> element = do_QueryInterface(elementNode);
                 if (element) {
                   nsAutoString vcardName; vcardName.Assign(NS_LITERAL_STRING("VCARD_NAME"));
-                  nsAutoString vcardValue;
-                  result = element->GetAttribute(vcardName, vcardValue);
+                  nsAutoString vcardValueUCS2;
+                  result = element->GetAttribute(vcardName, vcardValueUCS2);
                   if (NS_OK == result) {
                     nsVoidArray* dummy;
-                    wallet_ReadFromList(vcardValue, schema, dummy, wallet_VcardToSchema_list, PR_FALSE);
+                    wallet_ReadFromList(NS_ConvertUCS2toUTF8(vcardValueUCS2), schema, dummy,
+                                        wallet_VcardToSchema_list, PR_FALSE);
                   }
                 }
-
-#ifdef IgnoreFieldNames
-// use displayable text instead of vcard names
-schema.SetLength(0);
-#endif
-
-                if (!schema.Length()) {
+                if (schema.IsEmpty()) {
                   /* get schema from displayable text if possible */
                   wallet_GetSchemaFromDisplayableText(selectElement, schema, (!valueOK && !textOK));
                 }
@@ -3780,7 +3846,7 @@ WLLT_RequestToCapture(nsIPresShell* shell, nsIDOMWindowInternal* win, PRUint32*
     *status = +1;
   }
   wallet_Alert(message, win);
-  Recycle(message);
+  WALLET_FREE(message);
 }
 
 MOZ_DECL_CTOR_COUNTER(si_SignonDataStruct)
@@ -3836,7 +3902,7 @@ wallet_IsNewValue(nsIDOMNode* elementNode, nsString valueOnForm) {
   }
   nsIDOMHTMLInputElement* inputElement;
   nsIDOMHTMLSelectElement* selectElement;
-  nsAutoString schema;
+  nsCAutoString schema;
   nsAutoString valueSaved;
   PRInt32 selectIndex = 0;
   PRInt32 index = 0;
@@ -3857,8 +3923,7 @@ WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindowInternal* window) {
 
   /* get url name as ascii string */
   char *URLName = nsnull;
-  char *strippedURLName = nsnull;
-  nsAutoString strippedURLNameAutoString;
+  nsAutoString strippedURLNameUCS2;
   nsCOMPtr<nsIDocument> doc;
   currentForm->GetDocument(*getter_AddRefs(doc));
   if (!doc) {
@@ -3870,14 +3935,13 @@ WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindowInternal* window) {
     return;
   }
   (void)docURL->GetSpec(&URLName);
-  wallet_GetHostFile(docURL, strippedURLNameAutoString);
-  strippedURLName = ToNewCString(strippedURLNameAutoString);
+  wallet_GetHostFile(docURL, strippedURLNameUCS2);
+  nsCAutoString strippedURLNameUTF8 = NS_ConvertUCS2toUTF8(strippedURLNameUCS2);
 
   /* get to the form elements */
   nsCOMPtr<nsIDOMHTMLDocument> htmldoc(do_QueryInterface(doc));
   if (htmldoc == nsnull) {
     nsCRT::free(URLName);
-    nsCRT::free(strippedURLName);
     return;
   }
 
@@ -3885,7 +3949,6 @@ WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindowInternal* window) {
   nsresult rv = htmldoc->GetForms(getter_AddRefs(forms));
   if (NS_FAILED(rv) || (forms == nsnull)) {
     nsCRT::free(URLName);
-    nsCRT::free(strippedURLName);
     return;
   }
 
@@ -4019,24 +4082,27 @@ WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindowInternal* window) {
 #ifdef AutoCapture
                         if (passwordcount == 0 && !OKToPrompt) {
                           /* get schema from field */
-                          nsAutoString schema;
+                          nsCAutoString schema;
                           nsVoidArray* dummy;
-                          nsString stripField;
+                          nsCAutoString stripField;
 
                           /* try to get schema from displayable text */
-                          if (schema.Length() == 0) {
+                          if (schema.IsEmpty()) {
                             wallet_GetSchemaFromDisplayableText(inputElement, schema, PR_FALSE);
                           }
 
 #ifndef IgnoreFieldNames
                           /* no schema found, so try to get it from field name */
-                          if (schema.Length() == 0) {
-                            wallet_ReadFromList(Strip(field, stripField), schema, dummy, wallet_FieldToSchema_list, PR_FALSE);
+                          if (schema.IsEmpty()) {
+                            Strip(field, stripField);
+                            wallet_ReadFromList
+                              (stripField, schema, 
+                               dummy, wallet_FieldToSchema_list, PR_FALSE);
                           }
 #endif
 
                           /* if schema found, see if it is in distinguished schema list */
-                          if (schema.Length()) {
+                          if (!schema.IsEmpty()) {
                             /* see if schema is in distinguished list */
                             wallet_MapElement * mapElementPtr;
                             PRInt32 count = LIST_COUNT(wallet_DistinguishedSchema_list);
@@ -4044,7 +4110,7 @@ WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindowInternal* window) {
                             for (PRInt32 i=0; i<count; i++) {
                               mapElementPtr = NS_STATIC_CAST
                                 (wallet_MapElement*, wallet_DistinguishedSchema_list->ElementAt(i));
-                              if (mapElementPtr->item1.EqualsIgnoreCase(schema) && value.Length() > 0) {
+                                  if (schema.Equals(mapElementPtr->item1, nsCaseInsensitiveCStringComparator()) && value.Length() > 0) {
                                 hits++;
                                 if (hits > 1 && newValueFound) {
                                   OKToPrompt = PR_TRUE;
@@ -4089,12 +4155,12 @@ WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindowInternal* window) {
             PRUnichar * notification = Wallet_Localize("WalletNotification");
             wallet_SetWalletNotificationPref(PR_TRUE);
             wallet_Alert(notification, window);
-            Recycle(notification);
+            WALLET_FREE(notification);
           }
 #else
           /* save form if it meets all necessary conditions */
           if (wallet_GetFormsCapturingPref() &&
-              (OKToPrompt) && wallet_OKToCapture(strippedURLName, window)) {
+              (OKToPrompt) && wallet_OKToCapture(strippedURLNameUTF8, window)) {
 
             /* give caveat if this is the first time data is being captured */
             Wallet_GiveCaveat(window, nsnull);
@@ -4115,7 +4181,6 @@ WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindowInternal* window) {
     }
   }
   nsCRT::free(URLName);
-  nsCRT::free(strippedURLName);
 }
 
 PUBLIC void