--- trunk/templates/master.html	2004/05/06 22:52:19	15
+++ trunk/templates/master.html	2004/05/06 23:06:08	16
@@ -20,21 +20,29 @@
 [% END %]
 
 [% MACRO to(message) BLOCK %]
-<span class="to">
+[% IF message.to.size %]
+<span class="to">To:
  [% FOREACH f IN message.to %]
-  [% IF loop.fist %]To [% END %]
   [% search('to_phrase',f) %][% IF !loop.last %], [% END %]
  [% END %]
+</span>
+[% END %]
+[% IF message.cc.size %]
+<span class="cc">Cc:
  [% FOREACH f IN message.cc %]
-  [% IF loop.fist %]Cc [% END %]
   [% search('cc_phrase',f) %][% IF !loop.last %], [% END %]
  [% END %]
+</span>
+[% END %]
+[% IF message.bcc.size %]
+<span class="bcc">Bcc:
  [% FOREACH f IN message.bcc %]
   [% IF loop.fist %]Bcc [% END %]
   [% search('bcc_phrase',f) %][% IF !loop.last %], [% END %]
  [% END %]
 </span>
 [% END %]
+[% END %]
 
 [% MACRO date(msg) BLOCK %]
 <span class="date">[% msg.date %]</span>
@@ -56,9 +64,12 @@
 [% option("search_fld","from_address","sender address") %]
 [% option("search_fld","to_phrase","recipient name") %]
 [% option("search_fld","to_address","recipient address") %]
+[% option("search_fld","cc_phrase","also to name") %]
+[% option("search_fld","bcc_phrase","sneek to name") %]
 </select>
 <input type="text" name="search_val" size=20 value="[% param.search_val %]">
 </select>
+<input type="submit" name="submit" value="Go!">
 </form>
 
 </td>