1 files changed, 6 insertions, 9 deletions

diff --git a/mailman/archiving/mailarchive.py b/mailman/archiving/mailarchive.py
index 3edeb8c39..ded402ab4 100644
--- a/mailman/archiving/mailarchive.py
+++ b/mailman/archiving/mailarchive.py
@@ -32,7 +32,6 @@ from zope.interface import implements
 
 from mailman.config import config
 from mailman.interfaces.archiver import IArchiver
-from mailman.queue import Switchboard
 
 
 
@@ -73,15 +72,13 @@ class MailArchive:
         message_id_hash = urlsafe_b64encode(sha.digest())
         del msg['x-message-id-hash']
         msg['X-Message-ID-Hash'] = message_id_hash
-        return urljoin(config.MAIL_ARCHIVE_BASEURL, message_id_hash)
+        return urljoin(config.archiver.mail_archive.base_url, message_id_hash)
 
     @staticmethod
     def archive_message(mlist, msg):
         """See `IArchiver`."""
-        if mlist.archive_private:
-            return
-        outq = Switchboard(config.OUTQUEUE_DIR)
-        outq.enqueue(
-            msg,
-            listname=mlist.fqdn_listname,
-            recips=[config.MAIL_ARCHIVE_RECIPIENT])
+        if not mlist.archive_private:
+            config.switchboards['out'].enqueue(
+                msg,
+                listname=mlist.fqdn_listname,
+                recips=[config.archiver.mail_archive.recipient])