diff --git a/mail/components/preferences/viewpasswords.js b/mail/components/preferences/viewpasswords.js
index a2bd0f34f6cb..d37d667d51c0 100644
--- a/mail/components/preferences/viewpasswords.js
+++ b/mail/components/preferences/viewpasswords.js
@@ -248,9 +248,21 @@ function DeleteSignon() {
 }
 
 function DeleteAllSignons() {
+  var prompter = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                           .getService(Components.interfaces.nsIPromptService);
+
+  // Confirm the user wants to remove all passwords
+  var dummy = { value: false };
+  if (prompter.confirmEx(window,
+                         kSignonBundle.getString("removeAllPasswordsTitle"),
+                         kSignonBundle.getString("removeAllPasswordsPrompt"),
+                         prompter.STD_YES_NO_BUTTONS + prompter.BUTTON_POS_1_DEFAULT,
+                         null, null, null, null, dummy) == 1) // 1 == "No" button
+    return;
+    
   DeleteAllFromTree(signonsTree, signonsTreeView,
-                        signons, deletedSignons,
-                        "removeSignon", "removeAllSignons");
+                    signons, deletedSignons,
+                    "removeSignon", "removeAllSignons");
   FinalizeSignonDeletions();
 }
 
diff --git a/mail/locales/en-US/chrome/communicator/wallet/SignonViewer.properties b/mail/locales/en-US/chrome/communicator/wallet/SignonViewer.properties
index 9b34086a6ce3..75cc5761dcb1 100644
--- a/mail/locales/en-US/chrome/communicator/wallet/SignonViewer.properties
+++ b/mail/locales/en-US/chrome/communicator/wallet/SignonViewer.properties
@@ -3,6 +3,8 @@ close=Close
 hidePasswords=Hide Passwords
 showPasswords=Show Passwords
 noMasterPasswordPrompt=Are you sure you wish to show your passwords?
+removeAllPasswordsPrompt=Are you sure you wish to remove all passwords?
+removeAllPasswordsTitle=Remove all passwords
 
 # Default user name in the view passwords dialog
-noUserNameForPassword=<not specified>
\ No newline at end of file
+noUserNameForPassword=<not specified>
diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
index 41638e37456f..b43084d0ea52 100644
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -155,8 +155,8 @@
   locale/@AB_CD@/communicator/utilityOverlay.properties      (%chrome/communicator/utilityOverlay.properties)
 * locale/@AB_CD@/communicator/utilityOverlay.dtd             (%chrome/communicator/utilityOverlay.dtd)
   locale/@AB_CD@/communicator/wallet/wallet.properties       (%chrome/communicator/wallet/wallet.properties)
-  locale/@AB_CD@/communicator/wallet/SignonViewer.properties (%chrome/communicator/wallet/SignonViewer.properties)
-  locale/@AB_CD@/communicator/wallet/SignonViewer.dtd        (%chrome/communicator/wallet/SignonViewer.dtd)
++ locale/@AB_CD@/communicator/wallet/SignonViewer.properties (%chrome/communicator/wallet/SignonViewer.properties)
++ locale/@AB_CD@/communicator/wallet/SignonViewer.dtd        (%chrome/communicator/wallet/SignonViewer.dtd)
 + locale/@AB_CD@/global/charset.dtd                 (%chrome/global/charset.dtd)
   locale/@AB_CD@/global-platform/win/nsWindowsHooks.properties (%chrome/global-platform/win/nsWindowsHooks.properties)
 #ifdef MOZ_USE_GENERIC_BRANDING