2 files changed, 8 insertions, 0 deletions

diff --git a/src/mailman/handlers/decorate.py b/src/mailman/handlers/decorate.py
index 7f09c74e4..0bdce7545 100644
--- a/src/mailman/handlers/decorate.py
+++ b/src/mailman/handlers/decorate.py
@@ -28,10 +28,12 @@ import re
 import logging
 
 from email.mime.text import MIMEText
+from mailman.config import config
 from mailman.core.i18n import _
 from mailman.email.message import Message
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.templates import ITemplateLoader
+from mailman.interfaces.archiver import IArchiver
 from mailman.utilities.string import expand
 from urllib.error import URLError
 from zope.component import getUtility
@@ -59,6 +61,11 @@ def process(mlist, msg, msgdata):
                           if member.user.display_name
                           else member.address.original_email)
         d['user_optionsurl'] = member.options_url
+
+    archivers = [archiver for archiver in config.archivers
+                 if archiver.is_enabled]
+    d['archive_url'] = ("\n").join([archiver.permalink(mlist, msg)
+                                     for archiver in archivers])
     # These strings are descriptive for the log file and shouldn't be i18n'd
     d.update(msgdata.get('decoration-data', {}))
     try:
diff --git a/src/mailman/templates/en/footer-generic.txt b/src/mailman/templates/en/footer-generic.txt
index d31e885f0..e383dd013 100644
--- a/src/mailman/templates/en/footer-generic.txt
+++ b/src/mailman/templates/en/footer-generic.txt
@@ -2,3 +2,4 @@ _______________________________________________
 $display_name mailing list
 $fqdn_listname
 ${listinfo_uri}
+${archive_url}