diff --git a/mozilla/string/obsolete/nsStr.cpp b/mozilla/string/obsolete/nsStr.cpp
index 46c668ede57..087c73f389d 100644
--- a/mozilla/string/obsolete/nsStr.cpp
+++ b/mozilla/string/obsolete/nsStr.cpp
@@ -207,15 +207,42 @@ void nsStr::Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUin
         if(aSrcOffset<aSource.mLength) {
             //here's the only new case we have to handle. 
             //chars are really being inserted into our buffer...
-          GrowCapacity(aDest,aDest.mLength+theLength,anAgent);
 
-            //shift the chars right by theDelta...
-          (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+          if(aDest.mLength+theLength > aDest.mCapacity) {
+            nsStr theTempStr;
+            nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+            nsIMemoryAgent* theAgent=(anAgent) ? anAgent : GetDefaultAgent();
+            EnsureCapacity(theTempStr,aDest.mLength+theLength,theAgent);  //grow the temp buffer to the right size
+
+            if(aDestOffset) {
+              Append(theTempStr,aDest,0,aDestOffset,theAgent); //first copy leftmost data...
+            } 
+              
+            Append(theTempStr,aSource,0,aSource.mLength,theAgent); //next copy inserted (new) data
+            
+            PRUint32 theRemains=aDest.mLength-aDestOffset;
+            if(theRemains) {
+              Append(theTempStr,aDest,aDestOffset,theRemains,theAgent); //next copy rightmost data
+            }
+
+            theAgent->Free(aDest);
+            aDest.mStr = theTempStr.mStr;
+            theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+            aDest.mCapacity=theTempStr.mCapacity;
+            aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+
+          }
+
+          else {
+              //shift the chars right by theDelta...
+            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
       
-          //now insert new chars, starting at offset
-          (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+            //now insert new chars, starting at offset
+            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+          }
 
-          //finally, make sure to update the string length...
+            //finally, make sure to update the string length...
           aDest.mLength+=theLength;
           AddNullTerminator(aDest);
 
diff --git a/mozilla/string/obsolete/nsStr.h b/mozilla/string/obsolete/nsStr.h
index 9d2ebac21d1..daf814e797e 100644
--- a/mozilla/string/obsolete/nsStr.h
+++ b/mozilla/string/obsolete/nsStr.h
@@ -173,7 +173,7 @@ enum  eCharSize {eOneByte=0,eTwoByte=1};
 #define kRadix16        (16)
 #define kAutoDetect     (100)
 #define kRadixUnknown   (kAutoDetect+1)
-const   PRInt32 kDefaultStringSize = 32;
+const   PRInt32 kDefaultStringSize = 64;
 const   PRInt32 kNotFound = -1;
 
 
diff --git a/mozilla/xpcom/ds/bufferRoutines.h b/mozilla/xpcom/ds/bufferRoutines.h
index 5b5fdfa9152..285316532e9 100644
--- a/mozilla/xpcom/ds/bufferRoutines.h
+++ b/mozilla/xpcom/ds/bufferRoutines.h
@@ -64,19 +64,10 @@ inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
  * @param   aCount is the number of chars to be "cut"
  */
 void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  //PRUint32 theMax=aLength-anOffset;
-  //PRUint32 theLength=(theMax<aCount) ? theMax : aCount;
+  char* dst = aDest+anOffset;
+  char* src = aDest+anOffset+aCount;
 
-  char* first= aDest+anOffset+aCount;
-  char* last = aDest+aLength;
-  char* to   = aDest+anOffset;
-
-  //now loop over characters, shifting them left...
-  while(first<=last) {
-    *to=*first;  
-    to++;
-    first++;
-  }
+  memmove(dst,src,aLength-anOffset);
 }
 
 /**
@@ -88,16 +79,10 @@ void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCou
  * @param   aCount is the number of chars to be "inserted"
  */
 void ShiftCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  char* last = aDest+aLength;
-  char* first= aDest+anOffset-1;
-  char* to = aDest+aLength+aCount;
+  char* src = aDest+anOffset;
+  char* dst = aDest+anOffset+aCount;
 
-  //Copy rightmost chars, up to offset+theDelta...
-  while(first<last) {
-    *to=*last;  
-    to--;
-    last--;
-  }
+  memmove(dst,src,aLength-anOffset);
 }
 
 /**
@@ -109,20 +94,11 @@ void ShiftCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCo
  * @param   aCount is the number of chars to be "cut"
  */
 void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  //PRUint32 theMax=aLength-anOffset;
-  //PRUint32 theLength=(theMax<aCount) ? theMax : aCount;
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* dst = root+anOffset;
+  PRUnichar* src = root+anOffset+aCount;
 
-  PRUnichar* theBuf=(PRUnichar*)aDest;
-  PRUnichar* first= theBuf+anOffset+aCount;
-  PRUnichar* last = theBuf+aLength;
-  PRUnichar* to   = theBuf+anOffset;
-
-  //now loop over characters, shifting them left...
-  while(first<=last) {
-    *to=*first;  
-    to++;
-    first++;
-  }
+  memmove(dst,src,sizeof(PRUnichar)*(aLength-anOffset));
 }
 
 
@@ -135,17 +111,12 @@ void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint3
  * @param   aCount is the number of chars to be "inserted"
  */
 void ShiftDoubleCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  PRUnichar* theBuf=(PRUnichar*)aDest;
-  PRUnichar* last = theBuf+aLength;
-  PRUnichar* first= theBuf+anOffset-1;
-  PRUnichar* to = theBuf+aLength+aCount;
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* src = root+anOffset;
+  PRUnichar* dst = root+anOffset+aCount;
+
+  memmove(dst,src,sizeof(PRUnichar)*(aLength-anOffset));
 
-  //Copy rightmost chars, up to offset+theDelta...
-  while(first<last) {
-    *to=*last;  
-    to--;
-    last--;
-  }
 }
 
 
@@ -176,16 +147,10 @@ ShiftChars gShiftChars[2][2]= {
  */
 void CopyChars1To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
 
-  char*       to   = aDest+anDestOffset;
-  const char* first= aSource+anOffset;
-  const char* last = first+aCount;
+  char* dst = aDest+anDestOffset;
+  char* src = (char*)aSource+anOffset;
 
-  //now loop over characters, shifting them left...
-  while(first<last) {
-    *to=*first;  
-    to++;
-    first++;
-  }
+  memcpy(dst,src,aCount);
 } 
 
 /**
@@ -252,7 +217,7 @@ void CopyChars2To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32
   PRUnichar* theSource=(PRUnichar*)aSource;
   PRUnichar* from= theSource+anOffset;
 
-  memcpy((void*)to,(void*)from,aCount*2);
+  memcpy((void*)to,(void*)from,aCount*sizeof(PRUnichar));
 }
 
 
diff --git a/mozilla/xpcom/ds/nsStr.cpp b/mozilla/xpcom/ds/nsStr.cpp
index 46c668ede57..087c73f389d 100644
--- a/mozilla/xpcom/ds/nsStr.cpp
+++ b/mozilla/xpcom/ds/nsStr.cpp
@@ -207,15 +207,42 @@ void nsStr::Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUin
         if(aSrcOffset<aSource.mLength) {
             //here's the only new case we have to handle. 
             //chars are really being inserted into our buffer...
-          GrowCapacity(aDest,aDest.mLength+theLength,anAgent);
 
-            //shift the chars right by theDelta...
-          (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+          if(aDest.mLength+theLength > aDest.mCapacity) {
+            nsStr theTempStr;
+            nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+            nsIMemoryAgent* theAgent=(anAgent) ? anAgent : GetDefaultAgent();
+            EnsureCapacity(theTempStr,aDest.mLength+theLength,theAgent);  //grow the temp buffer to the right size
+
+            if(aDestOffset) {
+              Append(theTempStr,aDest,0,aDestOffset,theAgent); //first copy leftmost data...
+            } 
+              
+            Append(theTempStr,aSource,0,aSource.mLength,theAgent); //next copy inserted (new) data
+            
+            PRUint32 theRemains=aDest.mLength-aDestOffset;
+            if(theRemains) {
+              Append(theTempStr,aDest,aDestOffset,theRemains,theAgent); //next copy rightmost data
+            }
+
+            theAgent->Free(aDest);
+            aDest.mStr = theTempStr.mStr;
+            theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+            aDest.mCapacity=theTempStr.mCapacity;
+            aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+
+          }
+
+          else {
+              //shift the chars right by theDelta...
+            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
       
-          //now insert new chars, starting at offset
-          (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+            //now insert new chars, starting at offset
+            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+          }
 
-          //finally, make sure to update the string length...
+            //finally, make sure to update the string length...
           aDest.mLength+=theLength;
           AddNullTerminator(aDest);
 
diff --git a/mozilla/xpcom/ds/nsStr.h b/mozilla/xpcom/ds/nsStr.h
index 9d2ebac21d1..daf814e797e 100644
--- a/mozilla/xpcom/ds/nsStr.h
+++ b/mozilla/xpcom/ds/nsStr.h
@@ -173,7 +173,7 @@ enum  eCharSize {eOneByte=0,eTwoByte=1};
 #define kRadix16        (16)
 #define kAutoDetect     (100)
 #define kRadixUnknown   (kAutoDetect+1)
-const   PRInt32 kDefaultStringSize = 32;
+const   PRInt32 kDefaultStringSize = 64;
 const   PRInt32 kNotFound = -1;
 
 
diff --git a/mozilla/xpcom/string/obsolete/nsStr.cpp b/mozilla/xpcom/string/obsolete/nsStr.cpp
index 46c668ede57..087c73f389d 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.cpp
+++ b/mozilla/xpcom/string/obsolete/nsStr.cpp
@@ -207,15 +207,42 @@ void nsStr::Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUin
         if(aSrcOffset<aSource.mLength) {
             //here's the only new case we have to handle. 
             //chars are really being inserted into our buffer...
-          GrowCapacity(aDest,aDest.mLength+theLength,anAgent);
 
-            //shift the chars right by theDelta...
-          (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+          if(aDest.mLength+theLength > aDest.mCapacity) {
+            nsStr theTempStr;
+            nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+            nsIMemoryAgent* theAgent=(anAgent) ? anAgent : GetDefaultAgent();
+            EnsureCapacity(theTempStr,aDest.mLength+theLength,theAgent);  //grow the temp buffer to the right size
+
+            if(aDestOffset) {
+              Append(theTempStr,aDest,0,aDestOffset,theAgent); //first copy leftmost data...
+            } 
+              
+            Append(theTempStr,aSource,0,aSource.mLength,theAgent); //next copy inserted (new) data
+            
+            PRUint32 theRemains=aDest.mLength-aDestOffset;
+            if(theRemains) {
+              Append(theTempStr,aDest,aDestOffset,theRemains,theAgent); //next copy rightmost data
+            }
+
+            theAgent->Free(aDest);
+            aDest.mStr = theTempStr.mStr;
+            theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+            aDest.mCapacity=theTempStr.mCapacity;
+            aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+
+          }
+
+          else {
+              //shift the chars right by theDelta...
+            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
       
-          //now insert new chars, starting at offset
-          (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+            //now insert new chars, starting at offset
+            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+          }
 
-          //finally, make sure to update the string length...
+            //finally, make sure to update the string length...
           aDest.mLength+=theLength;
           AddNullTerminator(aDest);
 
diff --git a/mozilla/xpcom/string/obsolete/nsStr.h b/mozilla/xpcom/string/obsolete/nsStr.h
index 9d2ebac21d1..daf814e797e 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.h
+++ b/mozilla/xpcom/string/obsolete/nsStr.h
@@ -173,7 +173,7 @@ enum  eCharSize {eOneByte=0,eTwoByte=1};
 #define kRadix16        (16)
 #define kAutoDetect     (100)
 #define kRadixUnknown   (kAutoDetect+1)
-const   PRInt32 kDefaultStringSize = 32;
+const   PRInt32 kDefaultStringSize = 64;
 const   PRInt32 kNotFound = -1;