2 files changed, 10 insertions, 1 deletions

diff --git a/hyperkitty/lib/__init__.py b/hyperkitty/lib/__init__.py
index 0ae2a7f..1ab04cd 100644
--- a/hyperkitty/lib/__init__.py
+++ b/hyperkitty/lib/__init__.py
@@ -59,3 +59,12 @@ def get_months(store, list_name):
 
 def get_store(request):
     return request.environ["kittystore.store"]
+
+
+def stripped_subject(mlist, subject):
+    if mlist is None:
+        return subject
+    list_name = mlist.display_name or mlist.name[:mlist.name.index("@")]
+    if subject.lower().startswith("[%s] " % list_name.lower()):
+        subject = subject[len(list_name)+3 : ]
+    return subject
diff --git a/hyperkitty/lib/archiver.py b/hyperkitty/lib/archiver.py
index 3a2e7a7..2e21e27 100644
--- a/hyperkitty/lib/archiver.py
+++ b/hyperkitty/lib/archiver.py
@@ -88,7 +88,7 @@ class Archiver(object):
         """
         if self.store is None:
             self.store = get_store(self.store_url)
-        msg.message_id_hash = self.store.add_to_list(mlist.fqdn_listname, msg)
+        msg.message_id_hash = self.store.add_to_list(mlist, msg)
         self.store.commit()
         # TODO: Update karma
         return msg.message_id_hash