--- U:\Python24\Lib\site-packages\trac\ticket\notification-old.py	Tue Jun 12 15:34:31 2007
+++ U:\Python24\Lib\site-packages\trac\ticket\notification.py	Tue Jun 12 17:13:27 2007
@@ -68,6 +68,7 @@
         self.hdf.set_unescaped('email.ticket_props', self.format_props())
         self.hdf.set_unescaped('email.ticket_body_hdr', self.format_hdr())
         self.hdf['ticket.new'] = self.newticket
+        BRCRLF = '<br />' + CRLF
         subject = self.format_subj()
         link = self.env.abs_href.ticket(ticket.id)
         if not self.newticket:
@@ -92,23 +93,23 @@
                     pfx = 'ticket.change.%s' % field
                     newv = ''
                     if field == 'description':
-                        new_descr = wrap(new, self.COLS, ' ', ' ', CRLF)
-                        old_descr = wrap(old, self.COLS, '> ', '> ', CRLF)
-                        old_descr = old_descr.replace(2*CRLF, CRLF + '>' + CRLF)
+                        new_descr = wrap(new, self.COLS, ' ', ' ', BRCRLF)
+                        old_descr = wrap(old, self.COLS, '&gt; ', '&gt; ', BRCRLF)
+                        old_descr = old_descr.replace(2*CRLF, CRLF + '&gt;' + BRCRLF)
                         cdescr = CRLF
-                        cdescr += 'Old description:' + 2*CRLF + old_descr + 2*CRLF
-                        cdescr += 'New description:' + 2*CRLF + new_descr + CRLF
+                        cdescr += 'Old description:' + 2*CRLF + old_descr + CRLF + BRCRLF
+                        cdescr += 'New description:' + 2*CRLF + new_descr + CRLF + BRCRLF
                         self.hdf.set_unescaped('email.changes_descr', cdescr)
                     elif field == 'cc':
                         (addcc, delcc) = self.diff_cc(old, new)
                         chgcc = ''
                         if delcc:
-                            chgcc += wrap(" * cc: %s (removed)" % ', '.join(delcc), 
-                                          self.COLS, ' ', ' ', CRLF)
+                            chgcc += '<li>' + wrap("cc: %s (removed)" % ', '.join(delcc), 
+                                          self.COLS, ' ', ' ', BRCRLF) + '</li>'
                             chgcc += CRLF
                         if addcc:
-                            chgcc += wrap(" * cc: %s (added)" % ', '.join(addcc), 
-                                          self.COLS, ' ', ' ', CRLF)
+                            chgcc += '<li>' + wrap("cc: %s (added)" % ', '.join(addcc), 
+                                          self.COLS, ' ', ' ', BRCRLF) + '</li>'
                             chgcc += CRLF
                         if chgcc:
                             changes += chgcc
@@ -116,20 +117,21 @@
                     else:
                         newv = new
                         l = 7 + len(field)
-                        chg = wrap('%s => %s' % (old, new), self.COLS - l, '',
+                        chg = wrap('%s &rarr; %s' % (old, new), self.COLS - l, '',
                                    l * ' ', CRLF)
-                        changes += '  * %s:  %s%s' % (field, chg, CRLF)
+                        changes += '<li>' + '%s:  %s%s' % (field, chg, CRLF) + '</li>'
                     if newv:
                         self.hdf.set_unescaped('%s.oldvalue' % pfx, old)
                         self.hdf.set_unescaped('%s.newvalue' % pfx, newv)
             if changes:
-                self.hdf.set_unescaped('email.changes_body', changes)
+                self.hdf.set_unescaped('email.changes_body', '<ul>' + changes + '</ul>')
         self.ticket['link'] = link
         self.hdf.set_unescaped('ticket', self.ticket.values)
         NotifyEmail.notify(self, ticket.id, subject)
 
     def format_props(self):
         tkt = self.ticket
+        BRCRLF = '<br />' + CRLF
         fields = [f for f in tkt.fields if f['name'] not in ('summary', 'cc')]
         width = [0, 0, 0, 0]
         i = 0
@@ -147,9 +149,12 @@
             i += 1
         format = ('%%%is:  %%-%is  |  ' % (width[0], width[1]),
                   ' %%%is:  %%-%is%s' % (width[2], width[3], CRLF))
+        format = ('<tr valign="top"><td align="right"><em>%s:</em></td><td align="left">%s</td>','<td align="right"><em>%s:</em></td><td align="left">%s</td></tr>'+CRLF)
         l = (width[0] + width[1] + 5)
         sep = l * '-' + '+' + (self.COLS - l) * '-'
+        sep = CRLF
         txt = sep + CRLF
+        txt = '<table border="0" cellpadding="2" cellspacing="0">' + CRLF
         big = []
         i = 0
         for f in [f for f in fields if f['name'] != 'description']:
@@ -163,12 +168,15 @@
                 txt += format[i % 2] % (fname.capitalize(), fval)
                 i += 1
         if i % 2:
+            txt += '<td colspan="2">&nbsp;</td></tr>' + CRLF
             txt += CRLF
         if big:
             txt += sep
             for name, value in big:
-                txt += CRLF.join(['', name + ':', value, '', ''])
+                txt += CRLF.join(['<tr align="left"><td colspan="2"><em>' + name + ':' + '</em></td></tr>', '<tr align="left"><td colspan="2">' + value + '</td></tr>'])
+                """txt += CRLF.join(['', name + ':', value, '', ''])"""
         txt += sep
+        txt += '</table>' + CRLF
         return txt
 
     def parse_cc(self, txt):
@@ -267,6 +275,7 @@
         hdrs = {}
         hdrs['Message-ID'] = self.get_message_id(dest, self.modtime)
         hdrs['X-Trac-Ticket-ID'] = str(self.ticket.id)
+        hdrs['Content-Type'] = 'text/html; charset=utf-8'
         hdrs['X-Trac-Ticket-URL'] = self.ticket['link']
         if not self.newticket:
             msgid = self.get_message_id(dest)