diff --git a/mozilla/mailnews/compose/src/nsMsgAppleDecode.cpp b/mozilla/mailnews/compose/src/nsMsgAppleDecode.cpp
index 41560eb025d..7ab855f8603 100755
--- a/mozilla/mailnews/compose/src/nsMsgAppleDecode.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgAppleDecode.cpp
@@ -474,7 +474,7 @@ int ap_decode_file_infor(appledouble_decode_object *p_ap_decode_obj)
 	}
 
 	/* P_String version of the file name. */
-  nsCRT::strcpy((char *)name+1, p_ap_decode_obj->fname);
+  PL_strcpy((char *)name+1, p_ap_decode_obj->fname);
 	name[0] = (char) in_count;
 	
 	if (p_ap_decode_obj->write_as_binhex)
@@ -577,7 +577,7 @@ int ap_decode_file_infor(appledouble_decode_object *p_ap_decode_obj)
 		StandardFileReply reply;
 
 		/* convert char* p_ap_decode_obj->fname to a pascal string */
-		nsCRT::strcpy((char*)filename + 1, p_ap_decode_obj->fname);
+		PL_strcpy((char*)filename + 1, p_ap_decode_obj->fname);
 		filename[0] = nsCRT::strlen(p_ap_decode_obj->fname);
 														
 		if( !p_ap_decode_obj->mSpec )
@@ -829,7 +829,7 @@ int ap_decode_process_header(
 				short	refNum;
 					
 				fname[0] = nsCRT::strlen(p_ap_decode_obj->fname);
-				nsCRT::strcpy((char*)fname+1, p_ap_decode_obj->fname);
+				PL_strcpy((char*)fname+1, p_ap_decode_obj->fname);
 				 
 				if (HOpenRF(p_ap_decode_obj->vRefNum,
 							p_ap_decode_obj->dirId,
@@ -946,7 +946,7 @@ int ap_decode_process_data(
 			fspec.vRefNum = p_ap_decode_obj->vRefNum;
 			fspec.parID   = p_ap_decode_obj->dirId;
 			fspec.name[0] = nsCRT::strlen(p_ap_decode_obj->fname);
-			nsCRT::strcpy((char*)fspec.name+1, p_ap_decode_obj->fname);
+			PL_strcpy((char*)fspec.name+1, p_ap_decode_obj->fname);
 			
 			filename = my_PathnameFromFSSpec(&fspec);
 			if (p_ap_decode_obj->is_binary)
diff --git a/mozilla/mailnews/compose/src/nsMsgAppleDecodeStream.cpp b/mozilla/mailnews/compose/src/nsMsgAppleDecodeStream.cpp
index 4f521182212..81ea400fc98 100755
--- a/mozilla/mailnews/compose/src/nsMsgAppleDecodeStream.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgAppleDecodeStream.cpp
@@ -361,7 +361,7 @@ static void
 simple_copy(MWContext* context, char* saveName, void* closure)
 {
 	/* just copy the filename to the closure, so the caller can get it.	*/
-  nsCRT::strcpy(closure, saveName);
+  PL_strcpy(closure, saveName);
 }
 #endif
 
diff --git a/mozilla/mailnews/compose/src/nsMsgAppleDouble.cpp b/mozilla/mailnews/compose/src/nsMsgAppleDouble.cpp
index ae462803805..806bda842a8 100755
--- a/mozilla/mailnews/compose/src/nsMsgAppleDouble.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgAppleDouble.cpp
@@ -34,6 +34,7 @@
 #include "nsMsgAppleDouble.h"
 #include "nsMsgAppleCodes.h"
 #include "nsFileSpec.h"
+#include "nsMsgCompUtils.h"
 
 #ifdef XP_MAC
 
@@ -78,15 +79,15 @@ nsMsgIsMacFile(char *aUrlString)
     return PR_TRUE;
 
   if (
-       (!PL_strncasecmp(ext, "JPG")) ||
-       (!PL_strncasecmp(ext, "GIF")) ||
-       (!PL_strncasecmp(ext, "TIF")) ||
-       (!PL_strncasecmp(ext, "HTM")) ||
-       (!PL_strncasecmp(ext, "HTML")) ||
-       (!PL_strncasecmp(ext, "ART")) ||
-       (!PL_strncasecmp(ext, "XUL")) ||
-       (!PL_strncasecmp(ext, "XML")) ||
-       (!PL_strncasecmp(ext, "XUL"))
+       (!PL_strcasecmp(ext, "JPG")) ||
+       (!PL_strcasecmp(ext, "GIF")) ||
+       (!PL_strcasecmp(ext, "TIF")) ||
+       (!PL_strcasecmp(ext, "HTM")) ||
+       (!PL_strcasecmp(ext, "HTML")) ||
+       (!PL_strcasecmp(ext, "ART")) ||
+       (!PL_strcasecmp(ext, "XUL")) ||
+       (!PL_strcasecmp(ext, "XML")) ||
+       (!PL_strcasecmp(ext, "XUL"))
      )
      return PR_FALSE;
   else
diff --git a/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp b/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp
index de2320b47ce..deb171f2d67 100755
--- a/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp
@@ -292,7 +292,7 @@ int ap_encode_header(
 	
 	if (firstime)
 	{
-    nsCRT::strcpy(rd_buff, 
+    PL_strcpy(rd_buff, 
 			"Content-Type: application/applefile\nContent-Transfer-Encoding: base64\n\n");
 		status = write_stream(p_ap_encode_obj,
 			 				rd_buff, 
@@ -444,7 +444,7 @@ int ap_encode_data(
 		** preparing to encode the data fork.
 		*/
 		name[0] = nsCRT::strlen(p_ap_encode_obj->fname);
-    nsCRT::strcpy((char*)name+1, p_ap_encode_obj->fname);
+    PL_strcpy((char*)name+1, p_ap_encode_obj->fname);
 		if (HOpen( 	p_ap_encode_obj->vRefNum,
 					p_ap_encode_obj->dirId, 
 					name, 
diff --git a/mozilla/mailnews/compose/src/nsMsgBinHex.cpp b/mozilla/mailnews/compose/src/nsMsgBinHex.cpp
index 3f1560c1dd6..0a9a7c288ed 100644
--- a/mozilla/mailnews/compose/src/nsMsgBinHex.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgBinHex.cpp
@@ -288,7 +288,7 @@ int binhex_encode_next(
 		{
 			if  (p_bh_encode_obj->state == BINHEX_STATE_START)
 			{
-				nsCRT::strcpy(p_bh_encode_obj->outbuff + p_bh_encode_obj->pos_outbuff,
+				PL_strcpy(p_bh_encode_obj->outbuff + p_bh_encode_obj->pos_outbuff,
 							"\r\n(This file must be converted with BinHex 4.0)\r\n\r\n:");
 				p_bh_encode_obj->pos_outbuff += 52;
 			
@@ -519,7 +519,7 @@ int binhex_decode_init (
 static void
 simple_copy(MWContext* context, char* newFile, void* closure)
 {
-	nsCRT::strcpy((char *)closure, newFile);
+	PL_strcpy((char *)closure, newFile);
 }
 
 PRIVATE void binhex_process(