--- a/mailnews/compose/src/nsMsgAppleEncode.cpp
+++ b/mailnews/compose/src/nsMsgAppleEncode.cpp
@@ -101,17 +101,17 @@ int fill_apple_mime_header(
 						strlen(p_ap_encode_obj->fname));
 	if (status != noErr)
 		return status;
 		
 	PR_snprintf(tmpstr, sizeof(tmpstr),
 			"\"\r\nContent-Disposition: inline; filename=\"%s\"\r\n\r\n\r\n--=\r\n",
 			p_ap_encode_obj->fname);
 #endif /* 0 */
-	PR_snprintf(tmpstr, sizeof(tmpstr), "--%s"CRLF, p_ap_encode_obj->boundary);
+	PR_snprintf(tmpstr, sizeof(tmpstr), "--%s" CRLF, p_ap_encode_obj->boundary);
 	status = write_stream(p_ap_encode_obj, 
 						tmpstr, 
 						strlen(tmpstr));
 	return status;
 } 
 
 int ap_encode_file_infor(
 	appledouble_encode_object *p_ap_encode_obj)
@@ -342,17 +342,17 @@ int ap_encode_header(
 		status = finish64(p_ap_encode_obj);
 		if (status != noErr)
 			return status;
 		
 		/*
 		** write out the boundary 
 		*/
 		PR_snprintf(rd_buff, sizeof(rd_buff),
-						CRLF"--%s"CRLF, 
+						CRLF "--%s" CRLF, 
 						p_ap_encode_obj->boundary);
 					
 		status = write_stream(p_ap_encode_obj,
 						rd_buff,
 						strlen(rd_buff));
 		if (status == noErr)
 			status = errDone;
 	}
@@ -483,17 +483,17 @@ int ap_encode_data(
 		}
 
 		/*
 		**	the data portion header information.
 		*/
         nsCAutoString leafName;
         resFile->GetNativeLeafName(leafName);
 		PR_snprintf(rd_buff, sizeof(rd_buff),
-			"Content-Type: %s; name=\"%s\"" CRLF "Content-Transfer-Encoding: base64" CRLF "Content-Disposition: inline; filename=\"%s\""CRLF CRLF,
+			"Content-Type: %s; name=\"%s\"" CRLF "Content-Transfer-Encoding: base64" CRLF "Content-Disposition: inline; filename=\"%s\"" CRLF CRLF,
 			magic_type,
 			leafName.get(),
 			leafName.get());
 			
 		status = write_stream(p_ap_encode_obj, 
 					rd_buff, 
 					strlen(rd_buff)); 
 		if (status != noErr)
@@ -526,17 +526,17 @@ int ap_encode_data(
 
 		status = finish64(p_ap_encode_obj);
 		if (status != noErr)
 			return status;
 		
 		/* write out the boundary 	*/
 		
 		PR_snprintf(rd_buff, sizeof(rd_buff),
-						CRLF"--%s--"CRLF CRLF, 
+						CRLF "--%s--" CRLF CRLF, 
 						p_ap_encode_obj->boundary);
 	
 		status = write_stream(p_ap_encode_obj,
 						rd_buff,
 						strlen(rd_buff));
 	
 		if (status == noErr)				
 			status = errDone;

--- a/mailnews/import/eudora/src/nsEudoraFilters.cpp
+++ b/mailnews/import/eudora/src/nsEudoraFilters.cpp
@@ -558,25 +558,25 @@ nsresult nsEudoraFilters::EnableFilter(b
 #define LDAQ "\xC7"
 #define RDAQ "\xC8"
 #endif
 
 static const char* gStandardHeaders[] =
 {
 // Eudora string        nsMsgSearchAttribValue
 // -------------        ----------------------
-    "Subject:",              // Subject
-    "From:",                 // Sender
-    LDAQ"Body"RDAQ,          // Body
-    "Date:",                 // Date
-    "X-Priority:",           // Priority
-    "",                      // MsgStatus
-    "To:",                   // To
-    "Cc:",                   // CC
-    LDAQ"Any Recipient"RDAQ, // ToOrCC
+    "Subject:",                // Subject
+    "From:",                   // Sender
+    LDAQ "Body" RDAQ,          // Body
+    "Date:",                   // Date
+    "X-Priority:",             // Priority
+    "",                        // MsgStatus
+    "To:",                     // To
+    "Cc:",                     // CC
+    LDAQ "Any Recipient" RDAQ, // ToOrCC
     NULL
 };
 
 static PRInt32 FindHeader(const char* pHeader)
 {
   for (PRInt32 i = 0; gStandardHeaders[i]; i++)
   {
     if (*gStandardHeaders[i] && !PL_strcasecmp(pHeader, gStandardHeaders[i]))