1 files changed, 13 insertions, 6 deletions

diff --git a/Mailman/Deliverer.py b/Mailman/Deliverer.py
index 33afd030c..04a5c71d3 100644
--- a/Mailman/Deliverer.py
+++ b/Mailman/Deliverer.py
@@ -10,16 +10,23 @@ Your message entitled:
 was successfully received by %s.
 '''
 
-SUBSCRIBEACKTEXT = '''Welcome to %s! 
+SUBSCRIBEACKTEXT = '''Welcome to the %s@%s mailing list! 
 
 If you ever want to unsubscribe or change your options (eg, switch to  
 or from digest mode), visit the web page:
 
-      %s  
+      %s
+
+You can also make these adjustments via email - send a message to
+
+      %s-request@%s
 
-You must know your password to change your options or unsubscribe.
+with the text "help" in the subject or body, and you will get back a
+message with instructions.
 
-Your password is "%s" (no quotes around it).
+You must know your password to change your options or unsubscribe.  It is:
+
+      %s
 
 If you forget your password, don't worry, you will receive a monthly 
 reminder telling you what your password is, and how to unsubscribe or 
@@ -28,7 +35,6 @@ change your options.
 You may also have your password mailed to you automatically off of 
 the web page noted above.
 
-
 To post to this list, send your email to:
 
       %s
@@ -143,8 +149,9 @@ class Deliverer:
 	    header = ''
 	    welcome = ''
 
-	body = SUBSCRIBEACKTEXT % (self.real_name,
+	body = SUBSCRIBEACKTEXT % (self.real_name, self.host_name,
 				   self.GetScriptURL('listinfo'),
+				   self.real_name, self.host_name,
 				   password,
 				   self.GetListEmail(),
 				   header,