diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp
index 79646e8d78a..7c691805930 100644
--- a/mozilla/editor/base/nsEditorShell.cpp
+++ b/mozilla/editor/base/nsEditorShell.cpp
@@ -1822,6 +1822,10 @@ nsEditorShell::SaveDocument(PRBool saveAs, PRBool saveCopy, PRBool *_retval)
               // Use page title as suggested name for new document
               if (fileName.Length() == 0 && title.Length() > 0)
               {
+                // Strip out quote character
+                PRUnichar quote = (PRUnichar)'\"';
+                title.StripChar(quote);
+
                 //Replace "bad" filename characteres with "_"
                 PRUnichar space = (PRUnichar)' ';
                 PRUnichar dot = (PRUnichar)'.';
diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp
index 79646e8d78a..7c691805930 100644
--- a/mozilla/editor/composer/src/nsEditorShell.cpp
+++ b/mozilla/editor/composer/src/nsEditorShell.cpp
@@ -1822,6 +1822,10 @@ nsEditorShell::SaveDocument(PRBool saveAs, PRBool saveCopy, PRBool *_retval)
               // Use page title as suggested name for new document
               if (fileName.Length() == 0 && title.Length() > 0)
               {
+                // Strip out quote character
+                PRUnichar quote = (PRUnichar)'\"';
+                title.StripChar(quote);
+
                 //Replace "bad" filename characteres with "_"
                 PRUnichar space = (PRUnichar)' ';
                 PRUnichar dot = (PRUnichar)'.';