2 files changed, 21 insertions, 1 deletions
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 5d73a357b..8bbb62dfc 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -108,7 +108,27 @@
     </td>
   </tr>
 </table>
+<noscript>If you had Javascript active, you could toggle all of these with one click.<br></noscript>
+<script type="text/javascript">
+<!--
+function SetCheckboxes(setting) {
+  for (var count = 0; count < document.userprefsform.elements.length; count++) {
+    var theinput = document.userprefsform.elements[count];
+    if (theinput.type == "checkbox") {
+      if (theinput.name == "ExcludeSelf") {
+        theinput.checked = false;
+      }
+      else {
+        theinput.checked = setting;
+      }
+    }
+  }
+}
 
+document.write('<input type="button" value="Enable All Mail" onclick="SetCheckboxes(true); return false;">\n');
+document.write('<input type="button" value="Disable All Mail" onclick="SetCheckboxes(false); return false;">\n');
+// -->
+</script>
 <hr>
 <b>Field/recipient specific options:</b>
 <br>
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index d822d31ca..9d2b08051 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -98,7 +98,7 @@
 
 <h3>[% current_tab.description %]</h3>
 
-<form method="post" action="userprefs.cgi">
+<form name="userprefsform" method="post" action="userprefs.cgi">
   <input type="hidden" name="tab" value="[% current_tab.name %]">
 
   [%# See bug 160710 for why this is done this way %]