diff --git a/mozilla/xpfe/bootstrap/Mozilla Editor b/mozilla/xpfe/bootstrap/Mozilla Editor
index 016e60ae748..a419fc52bdc 100644
--- a/mozilla/xpfe/bootstrap/Mozilla Editor	
+++ b/mozilla/xpfe/bootstrap/Mozilla Editor	
@@ -1 +1 @@
-ARGS:-editor
\ No newline at end of file
+ARGS:-edit
diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index 93e79509023..723dd633bee 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -410,7 +410,7 @@ int main(int argc, char* argv[])
 
 #endif // defined(NS_USING_PROFILES)
     
-    rv = cmdLineArgs->GetCmdLineValue("-editor", &cmdResult);
+    rv = cmdLineArgs->GetCmdLineValue("-edit", &cmdResult);
     if (NS_SUCCEEDED(rv))
     {
       if (cmdResult && (strcmp("1",cmdResult)==0)) {
@@ -419,6 +419,20 @@ int main(int argc, char* argv[])
         withArgs = "chrome://editor/content/EditorInitPage.html";
       }
     }
+    // Check for -editor -- this may eventually go away
+    if (nsnull == urlstr)
+    {
+      rv = cmdLineArgs->GetCmdLineValue("-editor", &cmdResult);
+      if (NS_SUCCEEDED(rv))
+      {
+        printf("WARNING -- -editor is going away, use -edit instead!\n");
+        if (cmdResult && (strcmp("1",cmdResult)==0)) {
+          urlstr = "chrome://editor/content/";
+          useArgs = PR_TRUE;
+          withArgs = "chrome://editor/content/EditorInitPage.html";
+        }
+      }
+    }
     if (nsnull == urlstr)
     {
       rv = cmdLineArgs->GetCmdLineValue("-mail", &cmdResult);