diff --git a/mozilla/mailnews/base/prefs/resources/content/MANIFEST b/mozilla/mailnews/base/prefs/resources/content/MANIFEST
index 7780489012d..5583d281da7 100644
--- a/mozilla/mailnews/base/prefs/resources/content/MANIFEST
+++ b/mozilla/mailnews/base/prefs/resources/content/MANIFEST
@@ -22,6 +22,8 @@
 
 AccountManager.xul
 AccountManager.js
+ispUtils.js
+accountUtils.js
 am-main.xul
 am-server.xul
 am-serverwithnoidentities.xul
diff --git a/mozilla/mailnews/base/prefs/resources/content/Makefile.in b/mozilla/mailnews/base/prefs/resources/content/Makefile.in
index cb42226f33c..94c628dbb32 100644
--- a/mozilla/mailnews/base/prefs/resources/content/Makefile.in
+++ b/mozilla/mailnews/base/prefs/resources/content/Makefile.in
@@ -32,6 +32,7 @@ EXPORT_RESOURCE_SAMPLES = \
 		AccountManager.xul \
 		AccountManager.js \
 		ispUtils.js \
+		accountUtils.js \
 		am-main.xul \
 		am-server.xul \
         am-serverwithnoidentities.xul \
diff --git a/mozilla/mailnews/base/prefs/resources/content/accountUtils.js b/mozilla/mailnews/base/prefs/resources/content/accountUtils.js
new file mode 100644
index 00000000000..6b557cbf30b
--- /dev/null
+++ b/mozilla/mailnews/base/prefs/resources/content/accountUtils.js
@@ -0,0 +1,47 @@
+/* -*- Mode: Java; 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
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ * Alec Flett <alecf@netscape.com>
+ */
+
+// returns the first account with an invalid server or identity
+
+function getFirstInvalidAccount(accounts)
+{
+    var numAccounts = accounts.Count();
+    for (var i=0; i<numAccounts; i++) {
+        var account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
+        if (!account.incomingServer.valid)
+            return account;
+
+        var identities = account.identities;
+        var numIdentities = identities.Count();
+
+        for (var j=0; j<numIdentities; j++) {
+            var identity = identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity);
+            if (!identity.valid)
+                return account
+        }
+    }
+
+    // none found
+    return null;
+}
+
diff --git a/mozilla/mailnews/base/prefs/resources/content/makefile.win b/mozilla/mailnews/base/prefs/resources/content/makefile.win
index b9276ac82a3..aa0b4a1c52e 100644
--- a/mozilla/mailnews/base/prefs/resources/content/makefile.win
+++ b/mozilla/mailnews/base/prefs/resources/content/makefile.win
@@ -60,6 +60,8 @@ install::
 	$(MAKE_INSTALL) aw-accname.js		$(DIST)\bin\chrome\messenger\content\default
 	$(MAKE_INSTALL) aw-done.xul			$(DIST)\bin\chrome\messenger\content\default
 	$(MAKE_INSTALL) aw-done.js			$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) accountUtils.js		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) ispUtils.js			$(DIST)\bin\chrome\messenger\content\default
 
 clobber::
 	rm -f $(DIST)\chrome\messenger\content\default\AccountManager.xul