2 files changed, 4 insertions, 5 deletions
diff --git a/src/mailman/pipeline/calculate_recipients.py b/src/mailman/pipeline/calculate_recipients.py
index 36f391fd0..d2527e608 100644
--- a/src/mailman/pipeline/calculate_recipients.py
+++ b/src/mailman/pipeline/calculate_recipients.py
@@ -32,12 +32,12 @@ __all__ = [
 
 from zope.interface import implements
 
-from mailman import Utils
 from mailman.config import config
 from mailman.core import errors
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.member import DeliveryStatus
+from mailman.utilities.string import wrap
 
 
 
@@ -89,7 +89,7 @@ class CalculateRecipients:
 Your urgent message to the $realname mailing list was not authorized for
 delivery.  The original message as received by Mailman is attached.
 """)
-                raise errors.RejectMessage(Utils.wrap(text))
+                raise errors.RejectMessage(wrap(text))
         # Calculate the regular recipients of the message
         recipients = set(member.address.email
                          for member in mlist.regular_members.members
diff --git a/src/mailman/pipeline/replybot.py b/src/mailman/pipeline/replybot.py
index 5f17160c1..dffffbf47 100644
--- a/src/mailman/pipeline/replybot.py
+++ b/src/mailman/pipeline/replybot.py
@@ -30,7 +30,6 @@ import logging
 from zope.component import getUtility
 from zope.interface import implements
 
-from mailman import Utils
 from mailman.core.i18n import _
 from mailman.email.message import UserNotification
 from mailman.interfaces.autorespond import (
@@ -38,7 +37,7 @@ from mailman.interfaces.autorespond import (
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.datetime import today
-from mailman.utilities.string import expand
+from mailman.utilities.string import expand, wrap
 
 
 log = logging.getLogger('mailman.error')
@@ -113,7 +112,7 @@ class Replybot:
                  owneremail     = mlist.owner_address,
                  )
         # Interpolation and Wrap the response text.
-        text = Utils.wrap(expand(response_text, d))
+        text = wrap(expand(response_text, d))
         outmsg = UserNotification(msg.sender, mlist.bounces_address,
                                   subject, text, mlist.preferred_language)
         outmsg['X-Mailer'] = _('The Mailman Replybot')