Index: mozilla/webtools/bugzilla/whine.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/whine.pl,v
retrieving revision 1.32
diff -pu -r1.32 mozilla/webtools/bugzilla/whine.pl
--- mozilla/webtools/bugzilla/whine.pl
+++ mozilla/webtools/bugzilla/whine.pl
@@ -447,6 +447,11 @@ sub run_queries {
             'params' => $searchparams,
             'user'   => $args->{'recipient'}, # the search runs as the recipient
         );
+        my $urlquerypart = $searchparams->canonicalise_query();
+        $thisquery->{'title'} =~ s/\%urlquerypart\%/$urlquerypart/g;
+        $thisquery->{'title'} =~ s/\%recipient\%/$args->{'recipient'}/g;
+        $thisquery->{'title'} =~ s/\%author\%/$args->{'author'}/g;
+
         my $sqlquery = $search->getSQL();
         $sth = $dbh->prepare($sqlquery);
         $sth->execute;
Index: mozilla/webtools/bugzilla/docs/xml/using.xml
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/xml/using.xml,v
retrieving revision 1.68
diff -pu -r1.68 mozilla/webtools/bugzilla/docs/xml/using.xml
--- mozilla/webtools/bugzilla/docs/xml/using.xml
+++ mozilla/webtools/bugzilla/docs/xml/using.xml
@@ -1624,7 +1624,8 @@
         per schedule) at whatever time (or times) you choose.
       </para>
 
-      <note>
+      <section id="whine-at-others">
+        <title>Whine at Others</title>
         <para>
           If you are a member of the bz_canusewhineatothers group, then you
           will be presented with another option: "Mail to".  Using this you 
@@ -1634,7 +1635,7 @@
           multiple users or groups, create a new schedule for each additional 
           user/group.
         </para>
-      </note>
+      </section>
     </section>
 
     <section id="whining-query">
@@ -1674,13 +1675,26 @@
         </para>
       </note>
 
-      <para>
-        Once you have chosen the saved search to be executed, give the query a 
-        descriptive title.  This title will appear in the email, above the 
-        results of the query.  If you choose "One message per bug", the query 
-        title will appear at the top of each email that contains a bug matching
-        your query.
-      </para>
+      <section id="whining-title">
+        <title>Whining search title</title>
+        <para>
+          Once you have chosen the saved search to be executed, give the query
+          a descriptive title.  This title will appear in the email, above the 
+          results of the query.  If you choose "One message per bug", the query 
+          title will appear at the top of each email that contains a bug
+          matching your query.
+        </para>
+
+        <section id="whining-title-pronouns">
+          <title>Pronoun Substitution</title>
+          <para>
+            If you use whine at others, you may want to use some pronouns in
+            each search title, you can use: "%urlquerypart%" to let
+            "%recipient%" construct and run "%author%"'s query.
+          </para>
+        </section>
+      </section>
+
 
       <para>
         Finally, decide if the results of the query should be sent in a single