Ticket #5396: trunc_email.2.diff

html.py

@@ -86 +86 @@
             if middle.startswith('http://') or middle.startswith('https://'):
                 middle = '<a href="%s"%s>%s</a>' % (middle, nofollow_attr, trim_url(middle))
             if '@' in middle and not middle.startswith('www.') and not ':' in middle \
-                and simple_email_re.match(middle):
-                middle = '<a href="mailto:%s">%s</a>' % (middle, middle)
+                and simple_email_re.match(middle) and len(middle.split('@')) == 2:
+                name, domain = middle.split('@')
+                middle = '<a href="mailto:%s">%s@%s</a>' % (middle, trim_url(name), domain)
             if lead + middle + trail != word:
                 words[i] = lead + middle + trail
     return u''.join(words)