diff --git a/docs/mail.html b/docs/mail.html
index a60ef914a..8c438cf46 100644
--- a/docs/mail.html
+++ b/docs/mail.html
@@ -169,8 +169,11 @@
       the Jakarta Project</a> before subscribing and posting to any of
       the lists below.  They apply to Ant's lists as well.</p>
                                 <p>The user and dev list are subscriber only lists, this means
-      you have to subscribe before you can post to the list.  These
-      lists are archived at</p>
+      you have to subscribe before you can post to the list.  Please
+      note that any HTML parts sent to the lists will be removed by our
+      mailing list software - you shouldn't be sending HTML mails
+      anyway.</p>
+                                <p>These lists are archived at</p>
                                 <ul>
           <li><a href="http://archives.apache.org/eyebrowse/ViewLists">List Index on archives.apache.org</a></li>
           <li><a href="http://ant.apache.org/mail/">Full mbox archives of all lists</a></li>
@@ -184,7 +187,10 @@
           <b>Medium Traffic</b> 
           <a href="mailto:user-subscribe@ant.apache.org">Subscribe</a>  
           <a href="mailto:user-unsubscribe@ant.apache.org">Unsubscribe</a> 
+<!--
           <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=user@ant.apache.org">Archive</a> 
+-->
+          <a href="http://marc.theaimsgroup.com/?l=ant-user&amp;r=1&amp;w=2">Archive</a> 
         </p>
                                 <p>This list is for developers that are using Ant in their own
         projects to ask questions, share knowledge, and discuss issues
@@ -197,7 +203,10 @@
           <b>High Traffic</b> 
           <a href="mailto:dev-subscribe@ant.apache.org">Subscribe</a>  
           <a href="mailto:dev-unsubscribe@ant.apache.org">Unsubscribe</a> 
+<!--
           <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=dev@ant.apache.org">Archive</a> 
+-->
+          <a href="http://marc.theaimsgroup.com/?l=ant-dev&amp;r=1&amp;w=2">Archive</a> 
         </p>
                                 <p>This is the list where participating developers of the Ant
         build tool meet and discuss issues, code changes/additions,
diff --git a/xdocs/mail.xml b/xdocs/mail.xml
index 37c048df5..8cd5b5636 100644
--- a/xdocs/mail.xml
+++ b/xdocs/mail.xml
@@ -15,8 +15,12 @@
       the lists below.  They apply to Ant's lists as well.</p>
 
       <p>The user and dev list are subscriber only lists, this means
-      you have to subscribe before you can post to the list.  These
-      lists are archived at</p>
+      you have to subscribe before you can post to the list.  Please
+      note that any HTML parts sent to the lists will be removed by our
+      mailing list software - you shouldn&apos;t be sending HTML mails
+      anyway.</p>
+        
+      <p>These lists are archived at</p>
 
         <ul>
           <li><a href="http://archives.apache.org/eyebrowse/ViewLists">List Index on archives.apache.org</a></li>
@@ -29,7 +33,10 @@
           <b>Medium Traffic</b> 
           <a href="mailto:user-subscribe@ant.apache.org">Subscribe</a>  
           <a href="mailto:user-unsubscribe@ant.apache.org">Unsubscribe</a> 
+<!--
           <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=user@ant.apache.org">Archive</a> 
+-->
+          <a href="http://marc.theaimsgroup.com/?l=ant-user&amp;r=1&amp;w=2">Archive</a> 
         </p>
 
         <p>This list is for developers that are using Ant in their own
@@ -42,7 +49,10 @@
           <b>High Traffic</b> 
           <a href="mailto:dev-subscribe@ant.apache.org">Subscribe</a>  
           <a href="mailto:dev-unsubscribe@ant.apache.org">Unsubscribe</a> 
+<!--
           <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=dev@ant.apache.org">Archive</a> 
+-->
+          <a href="http://marc.theaimsgroup.com/?l=ant-dev&amp;r=1&amp;w=2">Archive</a> 
         </p>
 
         <p>This is the list where participating developers of the Ant