1 files changed, 7 insertions, 0 deletions

diff --git a/Mailman/Archiver/pipermail.py b/Mailman/Archiver/pipermail.py
index 7e49fcb36..b3195a800 100644
--- a/Mailman/Archiver/pipermail.py
+++ b/Mailman/Archiver/pipermail.py
@@ -6,6 +6,7 @@ import re
 import sys
 import time
 import email.Utils
+import email.Errors
 import cPickle as pickle
 from cStringIO import StringIO
 from string import lowercase
@@ -531,6 +532,9 @@ class T:
                 m = mbox.next()
             except Errors.DiscardMessage:
                 continue
+            except email.Errors.MessageParseError:
+                # Probably a missing terminating boundary
+                continue
             if not m:
                 return
             counter += 1
@@ -539,6 +543,9 @@ class T:
                 m = mbox.next()
             except Errors.DiscardMessage:
                 continue
+            except email.Errors.MessageParseError:
+                # Probably a missing terminating boundary
+                continue
 	    if not m:
                 break
             msgid = m.get('message-id', 'n/a')