4 files changed, 7 insertions, 10 deletions

diff --git a/Mailman/Handlers/Acknowledge.py b/Mailman/Handlers/Acknowledge.py
index e50d08455..a3e4869e4 100644
--- a/Mailman/Handlers/Acknowledge.py
+++ b/Mailman/Handlers/Acknowledge.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001 by the Free Software Foundation, Inc.
+# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -63,7 +63,5 @@ def process(mlist, msg, msgdata):
     # queue.
     subject = _('%(realname)s post acknowledgement')
     usermsg = Message.UserNotification(sender, mlist.GetAdminEmail(),
-                                       subject, text)
-    usermsg.add_header('Content-Type', 'text/plain',
-                       charset=Utils.GetCharSet(lang))
+                                       subject, text, lang)
     usermsg.send(mlist)
diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py
index 0f9b2caff..672a5881c 100644
--- a/Mailman/Handlers/Hold.py
+++ b/Mailman/Handlers/Hold.py
@@ -217,9 +217,7 @@ def hold_for_approval(mlist, msg, msgdata, exc):
         lang = msgdata.get('lang', mlist.getMemberLanguage(sender))
         subject = _('Your message to %(listname)s awaits moderator approval')
         text = Utils.maketext('postheld.txt', d, lang=lang, mlist=mlist)
-        nmsg = Message.UserNotification(sender, adminaddr, subject, text)
-        nmsg.add_header('Content-Type', 'text/plain',
-                        charset=Utils.GetCharSet(lang))
+        nmsg = Message.UserNotification(sender, adminaddr, subject, text, lang)
         nmsg.send(mlist)
     # Now the message for the list owners.  Be sure to include the list
     # moderators in this message.  This one should appear to come from
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py
index de19e3c5d..8395cf88b 100644
--- a/Mailman/Handlers/Moderate.py
+++ b/Mailman/Handlers/Moderate.py
@@ -135,7 +135,8 @@ def do_discard(mlist, msg):
                   mlist.GetScriptURL('admin', absolute=1)
         nmsg = Message.UserNotification(mlist.GetOwnerEmail(),
                                         mlist.GetAdminEmail(),
-                                        _('Auto-discard notification'))
+                                        _('Auto-discard notification'),
+                                        mlist.preferred_language)
         nmsg['Content-Type'] = 'multipart/mixed'
         nmsg['MIME-Version'] = '1.0'
         text = MIMEText(Utils.wrap(_("""\
diff --git a/Mailman/Handlers/Replybot.py b/Mailman/Handlers/Replybot.py
index 7e3a3be4b..30217211a 100644
--- a/Mailman/Handlers/Replybot.py
+++ b/Mailman/Handlers/Replybot.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001 by the Free Software Foundation, Inc.
+# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -90,7 +90,7 @@ def process(mlist, msg, msgdata):
     # Wrap the response.
     text = Utils.wrap(text)
     outmsg = Message.UserNotification(sender, mlist.GetAdminEmail(),
-                                      subject, text)
+                                      subject, text, mlist.preferred_language)
     outmsg['X-Mailer'] = _('The Mailman Replybot')
     # prevent recursions and mail loops!
     outmsg['X-Ack'] = 'No'