diff --git a/xdoc/src/plugin-resources/templates/mail-lists.xml b/xdoc/src/plugin-resources/templates/mail-lists.xml
index 6ae675f9..fe863180 100644
--- a/xdoc/src/plugin-resources/templates/mail-lists.xml
+++ b/xdoc/src/plugin-resources/templates/mail-lists.xml
@@ -19,18 +19,18 @@
 
 
 #macro (displayLink $label $link)
-<td>
     #if ($link && $link.length() != 0) 
         #if ($link.trim().startsWith("http://"))
-            <a href="$escape.getText($link)">$label</a>
+            <a href="$escape.getText($link)"><message key="$label"
+                    bundle="plugin-resources.templates.templates" /></a>
         #else
-            <a href="mailto:$link">$label</a>
+            <a href="mailto:$link"><message key="$label"
+                    bundle="plugin-resources.templates.templates" /></a>
         #end 
     #else
         <message key="template.mail_lists.not_available"
             bundle="plugin-resources.templates.templates" />
     #end
-</td>
 #end
 
 <document>
@@ -71,19 +71,33 @@
                             <message key="template.mail_lists.section.unsubscribe"
                                 bundle="plugin-resources.templates.templates" />
                         </th>
+                        <th>
+                            <message key="template.mail_lists.section.post"
+                                bundle="plugin-resources.templates.templates" />
+                        </th>
                         <th>
                             <message key="template.mail_lists.section.archive"
                                 bundle="plugin-resources.templates.templates" />
                         </th>
+                        <th>
+                            <message key="template.mail_lists.section.otherArchives"
+                                bundle="plugin-resources.templates.templates" />
+                        </th>
                     </tr>
                 </thead>
                 <tbody>
                     #foreach ($list in $project.mailingLists)
                     <tr>
                         <td>$list.name</td>
-                        #displayLink("Subscribe" $list.subscribe)
-                        #displayLink("Unsubscribe" $list.unsubscribe)
-                        #displayLink("Archive" $list.archive)
+                        <td>#displayLink("template.mail_lists.section.subscribe" $list.subscribe)</td>
+                        <td>#displayLink("template.mail_lists.section.unsubscribe" $list.unsubscribe)</td>
+                        <td>#displayLink("template.mail_lists.section.post" $list.post)</td>
+                        <td>#displayLink("template.mail_lists.section.archive" $list.archive)</td>
+                        <td>
+                          #foreach ($otherArchive in $list.otherArchives)
+                            #displayLink("template.mail_lists.section.otherArchive" $otherArchive)
+                          #end
+                        </td>
                     </tr>
                     #end
                 </tbody>
diff --git a/xdoc/src/plugin-resources/templates/templates.properties b/xdoc/src/plugin-resources/templates/templates.properties
index 9cef2d17..b6634d65 100644
--- a/xdoc/src/plugin-resources/templates/templates.properties
+++ b/xdoc/src/plugin-resources/templates/templates.properties
@@ -99,7 +99,10 @@ template.mail_lists.section.mail_lists=These are the mailing lists that have bee
 template.mail_lists.section.list_name=List Name
 template.mail_lists.section.subscribe=Subscribe
 template.mail_lists.section.unsubscribe=Unsubscribe
+template.mail_lists.section.post=Post
 template.mail_lists.section.archive=Archive
+template.mail_lists.section.otherArchives=Other Archives
+template.mail_lists.section.otherArchive=Other Archive
 
 # For maven-reports.xml
 template.maven_reports.title=Project Reports
diff --git a/xdoc/src/plugin-resources/templates/templates_de.properties b/xdoc/src/plugin-resources/templates/templates_de.properties
index 2c10c41d..0d7d2f01 100644
--- a/xdoc/src/plugin-resources/templates/templates_de.properties
+++ b/xdoc/src/plugin-resources/templates/templates_de.properties
@@ -100,7 +100,10 @@ template.mail_lists.section.mail_lists = Dies sind die Mailinglisten, die f
 template.mail_lists.section.list_name = Name der Mailingliste
 template.mail_lists.section.subscribe = Abonnieren
 template.mail_lists.section.unsubscribe = Abbestellen
+template.mail_lists.section.post = Anschreiben
 template.mail_lists.section.archive = Archiv
+template.mail_lists.section.otherArchives = Andere Archive
+template.mail_lists.section.otherArchive = Anderes Archiv
 
 # For maven-reports.xml
 template.maven_reports.title = Projekt Reporte
diff --git a/xdoc/src/plugin-resources/templates/templates_fr.properties b/xdoc/src/plugin-resources/templates/templates_fr.properties
index 0f35d1c1..9faeecb4 100644
--- a/xdoc/src/plugin-resources/templates/templates_fr.properties
+++ b/xdoc/src/plugin-resources/templates/templates_fr.properties
@@ -100,7 +100,10 @@ template.mail_lists.section.mail_lists=Ce sont les listes de diffusion qui ont 
 template.mail_lists.section.list_name=Nom de la liste
 template.mail_lists.section.subscribe=Souscription
 template.mail_lists.section.unsubscribe=Annulation de souscription
+template.mail_lists.section.post=Poster
 template.mail_lists.section.archive=Archive
+template.mail_lists.section.otherArchives=Autres Archives
+template.mail_lists.section.otherArchive=Autre Archive
 
 # For maven-reports.xml
 template.maven_reports.title=Rapports sur le projet