diff -ur /var/www/html/prodpatches/Bugzilla/Bug.pm prodpatches/Bugzilla/Bug.pm
--- /var/www/html/prodpatches/Bugzilla/Bug.pm	2007-01-28 14:15:37.000000000 -0800
+++ prodpatches/Bugzilla/Bug.pm	2007-02-10 16:24:57.000000000 -0800
@@ -1500,7 +1500,6 @@
         my %comment = %$comment_ref;
 
         $comment{'email'} .= Bugzilla->params->{'emailsuffix'};
-        $comment{'name'} = $comment{'name'} || $comment{'email'};
 
         # If raw data is requested, do not format 'special' comments.
         $comment{'body'} = format_comment(\%comment) unless $raw;
diff -ur /var/www/html/prodpatches/template/en/default/bug/comments.html.tmpl prodpatches/template/en/default/bug/comments.html.tmpl
--- /var/www/html/prodpatches/template/en/default/bug/comments.html.tmpl	2006-12-21 19:54:50.000000000 -0800
+++ prodpatches/template/en/default/bug/comments.html.tmpl	2007-02-10 17:18:48.000000000 -0800
@@ -99,8 +99,11 @@
             [<a href="#add_comment" onclick="replyToComment([% count %]);">reply</a>]
           [% END %]
         </span>
-        <a href="mailto:[% comment.email FILTER html %]">
-          [% comment.name FILTER html %]</a>
+        <span class="vcard">
+          <a class="fn email" href="mailto:[% comment.email FILTER html %]">
+            [% (comment.name || comment.email) FILTER html %]
+          </a>
+        </span>
         &nbsp;[%+ comment.time FILTER time %]
       </div>
         
diff -ur /var/www/html/prodpatches/template/en/default/bug/edit.html.tmpl prodpatches/template/en/default/bug/edit.html.tmpl
--- /var/www/html/prodpatches/template/en/default/bug/edit.html.tmpl	2007-01-15 00:02:00.000000000 -0800
+++ prodpatches/template/en/default/bug/edit.html.tmpl	2007-02-10 16:22:55.000000000 -0800
@@ -466,9 +466,7 @@
       <b><a href="page.cgi?id=fields.html#assigned_to">Assigned&nbsp;To</a></b>:
     </td>
     <td colspan="2">
-      <a href="mailto:[% bug.assigned_to.email FILTER html %]"
-         title="[% bug.assigned_to.identity FILTER html %]">
-         [% bug.assigned_to.display_name FILTER html %]</a>
+      [% PROCESS user_identity user => bug.assigned_to %]
     </td>
   </tr>
 
@@ -479,9 +477,7 @@
     </td>
     <td colspan="2">
       [% IF bug.check_can_change_field("qa_contact", 0, 1) %]
-        <a href="mailto:[% bug.qa_contact.email FILTER html %]"
-           title="[% bug.qa_contact.identity FILTER html %]">
-          [% bug.qa_contact.display_name FILTER html %]</a>
+        [% PROCESS user_identity user => bug.qa_contact %]
         <small>(<a href="javascript:toggleField('qa_contact');">edit</a>)</small>
     </td>
   </tr>
@@ -499,9 +495,7 @@
       [% ELSE %]
         <input type="hidden" name="qa_contact" id="qa_contact"
                value="[% bug.qa_contact.login FILTER html %]">
-        <a href="mailto:[% bug.qa_contact.email FILTER html %]"
-           title="[% bug.qa_contact.identity FILTER html %]">
-          [% bug.qa_contact.display_name FILTER html %]</a>
+        [% PROCESS user_identity user => bug.qa_contact %]
       [% END %]
     </td>
   </tr>
@@ -540,9 +534,7 @@
     </td>
     <td>
       [% bug.creation_ts FILTER time %] by
-      <a href="mailto:[% bug.reporter.email FILTER html %]"
-         title="[% bug.reporter.identity FILTER html %]">
-        [% bug.reporter.display_name FILTER truncate(33) FILTER html %]</a>
+      [% PROCESS user_identity user => bug.reporter %]
     </td>
   </tr>
 
@@ -851,3 +843,23 @@
   [% size = 0 %]
   [% value = undef %]
 [% END %]
+
+[%############################################################################%]
+[%# Block for user identities. Wraps the information inside of an hCard.     #%]
+[%############################################################################%]
+
+[% BLOCK user_identity %]
+  [% fn = user.name.replace('^\s+|\s+$', '') %]
+  <span class="vcard">
+    [% IF fn %]
+      <a class="email" href="mailto:[% user.email FILTER html %]">
+        <span class="fn">[% fn FILTER html %]</span>
+        &lt;[% user.email FILTER html %]&gt;
+      </a>
+    [% ELSE %]
+      <a class="fn email" href="mailto:[% user.email FILTER html %]">
+        [% user.email FILTER html %]
+      </a>
+    [% END %]
+  </span>
+[% END %]
