--- /var/lib/mailman/Mailman/Archiver/HyperArch.py	2009-01-26 19:26:56.000000000 +0000
+++ HyperArch.py	2009-02-26 03:00:10.000000000 +0000
@@ -285,6 +285,11 @@ class Article(pipermail.Article):
                                                       self.email)
                 else:
                     self.email = re.sub('@', _(' at '), self.email)
+                # replace all after the @ by xxxx to make email harvesting more difficult
+                mstr = self.email
+                pos = mstr.find(' at ')
+                mlen = len(mstr)
+                self.email =  mstr.replace(mstr[pos+4:len(mstr)], "xxxxx")
             finally:
                 i18n.set_translation(otrans)
 
@@ -468,6 +473,12 @@ class Article(pipermail.Article):
                 # Point the mailto url back to the list
                 author = re.sub('@', _(' at '), self.author)
                 emailurl = self._mlist.GetListEmail()
+		# replace all after the @ by xxxx to make email harvesting more difficult
+		astr = author
+		apos = astr.find(' at ')
+		if apos != -1:
+    		    alen = len(astr)
+		    author =  astr.replace(astr[apos+4:len(astr)], "xxxxx")
             else:
                 author = self.author
                 emailurl = self.email
@@ -821,6 +832,7 @@ class HyperArchive(pipermail.T):
         else:
             # there's no archive file at all... hmmm.
             textlink = ''
+        textlink = ''
         return quick_maketext(
             'archtocentry.html',
             {'archive': arch,