--- Mailman/MailList.py	2004-12-01 20:21:12.000000000 +0100
+++ Mailman/MailList.py.new	2004-12-01 22:08:25.913279752 +0100
@@ -207,9 +207,15 @@
             } + '@' + self.host_name
 
 
-    def GetConfirmSubject(self, listname, cookie, verb):
+    def GetConfirmJoinSubject(self, listname, cookie):
         if mm_cfg.VERP_CONFIRMATIONS and cookie:
-            return _( 'Your confirmation is required to %(verb)s the %(listname)s mailing list' )
+            return _( 'Your confirmation is required to join the %(listname)s mailing list' )
+        else:
+            return 'confirm ' + cookie
+	    
+    def GetConfirmLeaveSubject(self, listname, cookie):
+        if mm_cfg.VERP_CONFIRMATIONS and cookie:
+            return _( 'Your confirmation is required to leave the %(listname)s mailing list' )
         else:
             return 'confirm ' + cookie
 
@@ -769,7 +775,7 @@
              'cookie'     : cookie,
              'listowner'  : self.GetOwnerEmail(),
              }, mlist=self)
-        subj = self.GetConfirmSubject(listname, cookie, 'join')
+        subj = self.GetConfirmJoinSubject(listname, cookie)
         sender = self.GetRequestEmail(cookie)
         msg = Message.UserNotification(
             invitee, sender, subj,
@@ -890,7 +896,7 @@
                 text=text, lang=lang)
             # BAW: See ChangeMemberAddress() for why we do it this way...
             del msg['subject']
-            msg['Subject'] = self.GetConfirmSubject(realname, cookie, 'join')
+            msg['Subject'] = self.GetConfirmJoinSubject(realname, cookie)
             msg['Reply-To'] = self.GetRequestEmail(cookie)
             msg.send(self)
             who = formataddr((name, email))
@@ -1084,7 +1090,7 @@
             newaddr, self.GetRequestEmail(cookie),
             text=text, lang=lang)
         del msg['subject']
-        msg['Subject'] = self.GetConfirmSubject(realname, cookie, 'join')
+        msg['Subject'] = self.GetConfirmJoinSubject(realname, cookie)
         msg['Reply-To'] = self.GetRequestEmail(cookie)
         msg.send(self)
 
@@ -1277,7 +1283,7 @@
             text=text, lang=lang)
             # BAW: See ChangeMemberAddress() for why we do it this way...
         del msg['subject']
-        msg['Subject'] = self.GetConfirmSubject(realname, cookie, 'leave')
+        msg['Subject'] = self.GetConfirmLeaveSubject(realname, cookie)
         msg['Reply-To'] = self.GetRequestEmail(cookie)
         msg.send(self)