--- trunk/templates/master.html	2004/05/06 16:53:40	13
+++ trunk/templates/master.html	2004/05/06 19:46:58	14
@@ -4,7 +4,7 @@
 </head>
 
 [% MACRO search(fld,text,link_text) BLOCK; %]
-<a href="?search=[% fld %]:[% text %]">[% IF link_text ; link_text ; ELSE ; text ; END %]</a>
+<a href="?search=[% fld %]:[% IF fld == "subject" %][% FILTER subject_search ; text ; END %][% ELSE ; text ; END %]">[% IF link_text ; link_text ; ELSE ; text ; END %]</a>
 [% END %]
 
 [% MACRO option(var, value, text) BLOCK %]
@@ -22,16 +22,16 @@
 [% MACRO to(message) BLOCK %]
 <span class="to">
  [% FOREACH f IN message.to %]
-  [% IF !loop.fist %]To [% END %]
+  [% IF loop.fist %]To [% END %]
   [% search('to_phrase',f) %][% IF !loop.last %], [% END %]
  [% END %]
  [% FOREACH f IN message.cc %]
-  [% IF !loop.fist %]Cc [% END %]
+  [% IF loop.fist %]Cc [% END %]
   [% search('cc_phrase',f) %][% IF !loop.last %], [% END %]
  [% END %]
  [% FOREACH f IN message.bcc %]
-  [% IF !loop.fist %]Bcc [% END %]
-  [% search('cc_phrase',f) %][% IF !loop.last %], [% END %]
+  [% IF loop.fist %]Bcc [% END %]
+  [% search('bcc_phrase',f) %][% IF !loop.last %], [% END %]
  [% END %]
 </span>
 [% END %]
@@ -49,6 +49,7 @@
 <form>
 Search
 <select name="search_fld">
+[% option("search_fld","message","anywhere") %]
 [% option("search_fld","subject","message subject") %]
 [% option("search_fld","body","message text") %]
 [% option("search_fld","from_phrase","sender name") %]