1 files changed, 2 insertions, 7 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 36913c926..4254870c4 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -31,10 +31,9 @@ import urlparse
 import sha
 import errno
 import time
+import email.Iterators
 from string import whitespace as WHITESPACE
 
-from mimelib.MsgReader import MsgReader
-
 from Mailman import mm_cfg
 from Mailman import Errors
 from Mailman.SafeDict import SafeDict
@@ -501,13 +500,9 @@ ADMINDATA = {
 # unsubscribe, etc).  The test must be a good guess -- messages that return
 # true get sent to the list admin instead of the entire list.
 def is_administrivia(msg):
-    reader = MsgReader(msg)
     linecnt = 0
     lines = []
-    while 1:
-        line = reader.readline()
-        if not line:
-            break
+    for line in email.Iterators.body_line_iterator(msg):
         # Strip out any signatures
         if line == '-- ':
             break