diff --git a/mozilla/mailnews/base/resources/content/mailWindow.js b/mozilla/mailnews/base/resources/content/mailWindow.js
index 1340e80a6df..d8c7535f01e 100644
--- a/mozilla/mailnews/base/resources/content/mailWindow.js
+++ b/mozilla/mailnews/base/resources/content/mailWindow.js
@@ -1,4 +1,4 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * The contents of this file are subject to the Netscape Public
  * License Version 1.1 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
@@ -226,16 +226,13 @@ nsMsgStatusFeedback.prototype =
 		},
 	StopMeteors : function()
 		{
-            dump("stopping meteors 1\n");
-            if (!gStatusBar)
-                gStatusBar = document.getElementById("statusbar-icon");
-            if(!gThrobber)
-                gThrobber = document.getElementById("navigator-throbber");
+      dump("stopping meteors 1\n");
+      if (!gStatusBar) gStatusBar = document.getElementById("statusbar-icon");
+      if(!gThrobber) gThrobber = document.getElementById("navigator-throbber");
 
 			// Record page loading time.
 			var elapsed = ( (new Date()).getTime() - startTime ) / 1000;
-            var msg = Bundle.GetStringFromName("documentDonePrefix") +
-                elapsed + Bundle.GetStringFromName("documentDonePostfix");
+			var msg = "Document: Done (" + elapsed + " secs)";
 			dump( msg + "\n" );
       window.MsgStatusFeedback.ShowStatusString(msg);
       defaultStatus = msg;
diff --git a/mozilla/mailnews/base/resources/locale/en-US/messenger.properties b/mozilla/mailnews/base/resources/locale/en-US/messenger.properties
index e676eeae558..1a093b9259e 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/messenger.properties
+++ b/mozilla/mailnews/base/resources/locale/en-US/messenger.properties
@@ -65,19 +65,3 @@ serverType-movemail=Unix Movemail
 recipientColumnHeader=Recipient
 senderColumnHeader=Sender
 
-# status feedback stuff
-documentDonePrefix=Document: Done (
-documentDonePostfix=secs)
-documentDone=Document: Done
-documentLoading=Loading Document...
-
-# localized folder names
-
-localFolders=Local Folders
-
-unsentFolderName=Unsent Messages
-
-trashFolderName=Trash
-sentFolderName=Sent
-draftsFolderName=Drafts
-templatesFolderName=Templates