--- f:/test-mailman-2.2/Mailman/Utils.py 2009-03-12 15:28:34.000000000 -0700 +++ f:/test-mailman/Mailman/Utils.py 2009-03-21 20:10:12.593750000 -0700 @@ -425,8 +425,10 @@ +_ampre = re.compile('&((?:#[0-9]+|[a-z]+);)', re.IGNORECASE) def websafe(s): - return cgi.escape(s, quote=True) + # Don't double escape html entities + return _ampre.sub(r'&\1', cgi.escape(s, quote=True)) def nntpsplit(s):