Index: notification.py
===================================================================
--- notification.py	(revision 9942)
+++ notification.py	(working copy)
@@ -139,9 +139,11 @@
                             new = obfuscate_email_address(new)
                         newv = new
                         l = 7 + len(field)
-                        chg = wrap('%s => %s' % (old, new), self.COLS - l, '',
-                                   l * ' ', CRLF)
-                        changes_body += '  * %s:  %s%s' % (field, chg, CRLF)
+                        chg = ('* %s:  %s => %s' % (field, old, new)).replace(
+                            CRLF, CRLF + l * ' ')
+                        chg = wrap(chg, self.COLS, '', l * ' ', CRLF)
+                        
+                        changes_body += ' %s%s' % (chg, CRLF)
                     if newv:
                         change_data[field] = {'oldvalue': old, 'newvalue': new}