diff --git a/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
index a6ff2c89c18..03d49ccb3c3 100644
--- a/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
@@ -52,6 +52,8 @@
               saveable => "1" },
             { name => "email", description => "Email settings", 
               saveable => "1" },
+            { name => "saved-searches", description => "Saved searches", 
+              saveable => "0" },
             { name => "permissions", description => "Permissions", 
               saveable => "0" } ] %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
new file mode 100644
index 00000000000..d5a0308773a
--- /dev/null
+++ b/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -0,0 +1,38 @@
+[%# 1.0@bugzilla.org %]
+[%# The contents of this file are subject to the Mozilla 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/MPL/
+  #
+  # 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 the Bugzilla Bug Tracking System.
+  #
+  # 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): Gervase Markham <gerv@gerv.net>
+  #%]
+
+<p>Your saved searches are as follows:</p>
+
+<blockquote>
+  <table cellpadding="3">  
+    [% FOREACH q = queries %]
+      <tr>
+        <td>[% q.name FILTER html %]:</td>
+        <td>
+          <a href="buglist.cgi?[% q.query FILTER html %]">Run</a> |
+          <a href="query.cgi?[% q.query FILTER html %]">Edit</a> |
+          <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
+                   [% q.name FILTER html %]">Forget</a>
+        </td>
+      </tr>
+    [% END %]
+  </table>
+</blockquote>
diff --git a/mozilla/webtools/bugzilla/userprefs.cgi b/mozilla/webtools/bugzilla/userprefs.cgi
index 3b320fa74a0..f2b9445edc6 100755
--- a/mozilla/webtools/bugzilla/userprefs.cgi
+++ b/mozilla/webtools/bugzilla/userprefs.cgi
@@ -294,6 +294,14 @@ sub DoPermissions {
 
 # No SavePermissions() because this panel has no changeable fields.
 
+
+sub DoSavedSearches() {
+    $vars->{'queries'} = Bugzilla->user->queries;
+}
+
+# No SaveSavedSearches() because this panel has no changeable fields (yet).
+
+
 ###############################################################################
 # Live code (not subroutine definitions) starts here
 ###############################################################################
@@ -330,6 +338,10 @@ SWITCH: for ($current_tab_name) {
         DoPermissions();
         last SWITCH;
     };
+    /^saved-searches$/ && do {
+        DoSavedSearches();
+        last SWITCH;
+    };
     ThrowUserError("unknown_tab",
                    { current_tab_name => $current_tab_name });
 }