*** Mailman/Cgi/confirm.py.orig	Sun Sep 30 16:11:00 2007
--- Mailman/Cgi/confirm.py	Fri Jan  4 10:53:32 2008
***************
*** 628,635 ****
              # the user who posted the message.
              op, id = mlist.pend_confirm(cookie)
              ign, sender, msgsubject, ign, ign, ign = mlist.GetRecord(id)
-             subject = Utils.websafe(msgsubject)
              lang = mlist.getMemberLanguage(sender)
              i18n.set_language(lang)
              doc.set_language(lang)
              # Discard the message
--- 628,636 ----
              # the user who posted the message.
              op, id = mlist.pend_confirm(cookie)
              ign, sender, msgsubject, ign, ign, ign = mlist.GetRecord(id)
              lang = mlist.getMemberLanguage(sender)
+             subject = Utils.websafe(Utils.oneline(msgsubject,
+                                                   Utils.GetCharSet(lang)))
              i18n.set_language(lang)
              doc.set_language(lang)
              # Discard the message
***************
*** 694,700 ****
      i18n.set_language(lang)
      doc.set_language(lang)
  
!     subject = Utils.websafe(msgsubject)
      reason = Utils.websafe(_(givenreason))
      listname = mlist.real_name
      table.AddRow([_('''Your confirmation is required in order to cancel the
--- 695,701 ----
      i18n.set_language(lang)
      doc.set_language(lang)
  
!     subject = Utils.websafe(Utils.oneline(msgsubject, Utils.GetCharSet(lang)))
      reason = Utils.websafe(_(givenreason))
      listname = mlist.real_name
      table.AddRow([_('''Your confirmation is required in order to cancel the
*** Mailman/Handlers/Scrubber.py.orig	Sun Sep 30 16:11:02 2007
--- Mailman/Handlers/Scrubber.py	Sat Jan  5 12:19:03 2008
***************
*** 270,275 ****
--- 270,276 ----
              finally:
                  os.umask(omask)
              subject = submsg.get('subject', _('no subject'))
+             subject = Utils.oneline(subject, lcset)
              date = submsg.get('date', _('no date'))
              who = submsg.get('from', _('unknown sender'))
              size = len(str(submsg))
*** Mailman/ListAdmin.py.orig	Sun Sep 30 16:11:02 2007
--- Mailman/ListAdmin.py	Thu Jan  3 22:18:37 2008
***************
*** 292,300 ****
          elif value == mm_cfg.REJECT:
              # Rejected
              rejection = 'Refused'
              self.__refuse(_('Posting of your message titled "%(subject)s"'),
                            sender, comment or _('[No reason given]'),
!                           lang=self.getMemberLanguage(sender))
          else:
              assert value == mm_cfg.DISCARD
              # Discarded
--- 292,302 ----
          elif value == mm_cfg.REJECT:
              # Rejected
              rejection = 'Refused'
+             lang = self.getMemberLanguage(sender)
+             subject = Utils.oneline(subject, Utils.GetCharSet(lang))
              self.__refuse(_('Posting of your message titled "%(subject)s"'),
                            sender, comment or _('[No reason given]'),
!                           lang=lang)
          else:
              assert value == mm_cfg.DISCARD
              # Discarded