diff --git a/mozilla/modules/xml/glue/xmlglue.c b/mozilla/modules/xml/glue/xmlglue.c
index 9b8972666ba..7e8446af5f1 100644
--- a/mozilla/modules/xml/glue/xmlglue.c
+++ b/mozilla/modules/xml/glue/xmlglue.c
@@ -140,6 +140,7 @@ outputToStream (XMLFile f, char* s)
 	  } 
      return;
   }
+  FE_Trace(s);
   if (f->outputBuffer == NULL) f->outputBuffer = getMem(OUTPUT_BUFFER_SIZE+1);
   if ((strlen(s) > OUTPUT_BUFFER_SIZE)) {
     char* buff = copyString(s);
diff --git a/mozilla/modules/xml/glue/xmlglue.h b/mozilla/modules/xml/glue/xmlglue.h
index d81d1fa1170..092a5baf68f 100644
--- a/mozilla/modules/xml/glue/xmlglue.h
+++ b/mozilla/modules/xml/glue/xmlglue.h
@@ -41,7 +41,7 @@
 
 /* xmlglue.c data structures and defines */
 
-#define XML_LINE_SIZE 500
+#define XML_LINE_SIZE 4096
 
 
 #include <stdlib.h>
diff --git a/mozilla/modules/xml/glue/xmlss.c b/mozilla/modules/xml/glue/xmlss.c
index 84254ce7abd..e25f77bc392 100644
--- a/mozilla/modules/xml/glue/xmlss.c
+++ b/mozilla/modules/xml/glue/xmlss.c
@@ -32,7 +32,7 @@
 #define href "href"
 #define XLL   "XML-Link"
 
-#define BUF_SIZE 500
+#define BUF_SIZE 4096
 
 int
 parseNextXMLCSSBlob (NET_StreamClass *stream, char* blob, int32 size)
@@ -54,6 +54,7 @@ parseNextXMLCSSBlob (NET_StreamClass *stream, char* blob, int32 size)
     if (ss->holdOver[0] != '\0') {
       memcpy(ss->line, ss->holdOver, strlen(ss->holdOver));
       m = strlen(ss->holdOver);
+      somethingseenp = 1;
       memset(ss->holdOver, '\0', BUF_SIZE);
     }
     while ((m < 300) && (c != '{') && (c != '}')) {
@@ -70,15 +71,15 @@ parseNextXMLCSSBlob (NET_StreamClass *stream, char* blob, int32 size)
     n++;
     if (m > 0) {
       if ((c == '}') || (c == '{')) {
-	last = n;
-	if (c == '{') ss->holdOver[0] = '{'; 
-	if (somethingseenp) {
-	  parseNextXMLCSSElement(ss, ss->line);
-	} else if (size > last) {
-	  memcpy(ss->holdOver, ss->line, m);
-	}
-      } else if (c == '{') ss->holdOver[0] = '{';
-    }
+        last = n;
+        if (c == '{') ss->holdOver[0] = '{'; 
+        if (somethingseenp) {
+          parseNextXMLCSSElement(ss, ss->line);
+        }
+      }  else if (size > last) {
+          memcpy(ss->holdOver, ss->line, m);
+      }
+    } else if (c == '{') ss->holdOver[0] = '{';
   }
   return(size);
 }
@@ -273,12 +274,14 @@ outputAllStyles(XMLFile xf)
   outputToStream(xf, "<style>\n");
   for (ss = xf->ss; (ss != NULL) ; ss = ss->next) {    
     for (se = ss->el; (se != NULL) ; se = se->next) {
+      if (se->style) { 
       ssline = PR_smprintf(".xml%d {%s}\n", se->id, se->style);
       PR_ASSERT(ssline);
       if (!ssline)
           return;
       outputToStream(xf, ssline);
       free(ssline);
+	  }
     }
   }
   outputToStream(xf, "</style>\n");