--- a/en/confirm	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/confirm	Tue Feb 22 10:40:00 2011 +1100
@@ -1,7 +1,7 @@
-%ifaction sub%Subject: Confirm subscription to $listaddr$%endif%
-%ifaction unsub%Subject: Confirm unsubscribe from $listaddr$%endif%
+%ifaction sub%Subject: Confirm subscription to $list$@$domain$%endif%
+%ifaction unsub%Subject: Confirm unsubscribe from $list$@$domain$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifaction sub%

--- a/en/deny	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/deny	Tue Feb 22 10:40:00 2011 +1100
@@ -1,9 +1,9 @@
-%ifaction sub%Subject: Unable to subscribe to $listaddr$%endif%
-%ifaction unsub%Subject: Unable to unsubscribe from $listaddr$%endif%
-%ifaction release reject%Subject: Unable to moderate $listaddr$%endif%
-%ifaction permit obstruct%Subject: Unable to gatekeep $listaddr$%endif%
+%ifaction sub%Subject: Unable to subscribe to $list$@$domain$%endif%
+%ifaction unsub%Subject: Unable to unsubscribe from $list$@$domain$%endif%
+%ifaction release reject%Subject: Unable to moderate $list$@$domain$%endif%
+%ifaction permit obstruct%Subject: Unable to gatekeep $list$@$domain$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifaction sub%
@@ -42,12 +42,12 @@
     %iftype digest%
       Or perhaps you are subscribed to the normal version of the list. To
       unsubscribe from that version of the list, send a message to
-      $listunsubaddr$
+      $list+$unsubscribe@$domain$
     %endif
     %iftype normal%
       Or perhaps you are subscribed to the digest version of the list. To
       unsubscribe from that version of the list, send a message to
-      $digestunsubaddr$
+      $list+$unsubscribe-digest@$domain$
     %endif
   %endif%
 %endif%

--- a/en/deny-post	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/deny-post	Tue Feb 22 10:40:00 2011 +1100
@@ -1,4 +1,4 @@
-Subject: Post to $listaddr$ denied: $subject$
+Subject: Post to $list$@$domain$ denied: $subject$
 MIME-Version: 1.0
 Content-Type: multipart/mixed;
  boundary="=_$random0$$random1$_="
@@ -8,7 +8,7 @@
 Content-Type: text/plain; charset=utf8
 Content-Transfer-Encoding: 8bit
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%The message from $posteraddr$ with subject "$subject" was unable
 to be delivered to the list
@@ -55,7 +55,8 @@
   %endif%%endif%
   %ifcontrol closedlist closedlistsub%
     If you wish to become a subscriber, you will need to contact a list
-    administrator. You can email $listowner$ to contact the list owner.
+    administrator. You can email $list+$owner@$domain$ to contact the list
+    owner.
   %endif%
 
 %wrap%

--- a/en/digest	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/digest	Tue Feb 22 10:40:00 2011 +1100
@@ -1,4 +1,4 @@
-Subject: Digest of $listaddr$ issue $digestissue$ ($digestinterval$)
+Subject: Digest of $list$@$domain$ issue $digestissue$ ($digestinterval$)
 
 Topics (messages $digestfirst$ through $digestlast$):
 - %digestthreads%

--- a/en/faq	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/faq	Tue Feb 22 10:40:00 2011 +1100
@@ -1,4 +1,4 @@
-Subject: Frequently asked questions of $listaddr$
+Subject: Frequently asked questions of $list$@$domain$
 
 Sorry, no FAQ available yet.
 

--- a/en/finish	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/finish	Tue Feb 22 10:40:00 2011 +1100
@@ -1,9 +1,9 @@
-%ifaction unsub%Subject: Goodbye from $listaddr$%endif%
-%ifaction release reject%Subject: Moderated $listaddr$: $subject$%endif%
-%ifaction permit obstruct%Subject: Guarded $listaddr$: $subaddr$%endif%
-%ifaction post%Subject: Posted to $listaddr$: $subject$%endif%
+%ifaction unsub%Subject: Goodbye from $list$@$domain$%endif%
+%ifaction release reject%Subject: Moderated $list$@$domain$: $subject$%endif%
+%ifaction permit obstruct%Subject: Guarded $list$@$domain$: $subaddr$%endif%
+%ifaction post%Subject: Posted to $list$@$domain$: $subject$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifaction unsub%

--- a/en/finish-sub	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/finish-sub	Tue Feb 22 10:40:00 2011 +1100
@@ -1,6 +1,6 @@
-Subject: Welcome to $listaddr$
+Subject: Welcome to $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifreason request%
@@ -23,16 +23,17 @@
 %wrap%
 %ifcontrol closedlist%
   If you ever wish to unsubscribe, you will need to contact a list
-  administrator. You can email $listowner$ to contact the list owner.
+  administrator. You can email $list+$owner@$domain$ to contact the list
+  owner.
 %else%
   If you ever wish to unsubscribe, send a message to
-  %iftype normal%$listunsubaddr$%endif%
-  %iftype digest%$digestunsubaddr$%endif%
-  %iftype nomail%$nomailunsubaddr$%endif%
+  %iftype normal%$list+$unsubscribe@$domain$%endif%
+  %iftype digest%$list+$unsubscribe-digest@$domain$%endif%
+  %iftype nomail%$list+$unsubscribe-nomail@$domain$%endif%
   using this email address. The subject and the body of the message can be
   anything. You will then receive confirmation or further instructions.
 %endif%
 
 %wrap%For other information and help about this list, send a message to
-$helpaddr$
+$list+$help@$domain$
 

--- a/en/gatekeep-sub	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/gatekeep-sub	Tue Feb 22 10:40:00 2011 +1100
@@ -1,6 +1,6 @@
-Subject: Subscription request for $listaddr$: $subaddr$
+Subject: Subscription request for $list$@$domain$: $subaddr$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%There has been a request from $subaddr$ to join
 %iftype normal%%endif%

--- a/en/help	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/help	Tue Feb 22 10:40:00 2011 +1100
@@ -1,6 +1,6 @@
-Subject: Information for $listaddr$
+Subject: Information for $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 Here is some information about the list.
 
@@ -11,12 +11,12 @@
 %ifcontrol closedlist closedlistsub%
   - Subscribe by contacting a list administrator.
 %else%
-  - %wrap%Subscribe by emailing: $listsubaddr$
+  - %wrap%Subscribe by emailing: $list+$subscribe@$domain$
 %endif%
 %ifcontrol closedlist%
   - Unsubscribe by contacting a list administrator.
 %else%
-  - %wrap%Unsubscribe by emailing: $listunsubaddr$
+  - %wrap%Unsubscribe by emailing: $list+$unsubscribe@$domain$
 %endif%
 
 %ifncontrol nodigestsub%
@@ -25,12 +25,12 @@
 %ifcontrol closedlist closedlistsub%
   - Subscribe by contacting a list administrator.
 %else%
-  - %wrap%Subscribe by emailing: $digestsubaddr$
+  - %wrap%Subscribe by emailing: $list+$subscribe-digest@$domain$
 %endif%
 %ifcontrol closedlist%
   - Unsubscribe by contacting a list administrator.
 %else%
-  - %wrap%Unsubscribe by emailing: $digestunsubaddr$
+  - %wrap%Unsubscribe by emailing: $list+$unsubscribe-digest@$domain$
 %endif%
 
 %endif%
@@ -42,12 +42,12 @@
 %ifcontrol closedlist closedlistsub%
   - Subscribe by contacting a list administrator.
 %else%
-  - %wrap%Subscribe by emailing: $nomailsubaddr$
+  - %wrap%Subscribe by emailing: $list+$subscribe-nomail@$domain$
 %endif%
 %ifcontrol closedlist%
   - Unsubscribe by contacting a list administrator.
 %else%
-  - %wrap%Unsubscribe by emailing: $nomailunsubaddr$
+  - %wrap%Unsubscribe by emailing: $list+$unsubscribe-nomail@$domain$
 %endif%
 
 %endif%
@@ -56,7 +56,7 @@
 permitting new members.
 
 %endif%
-Posts are made by emailing $listaddr$
+Posts are made by emailing $list$@$domain$
 
 %ifcontrol subonlypost%%ifncontrol modnonsubposts%
 However, only subscribers may post to the list.
@@ -86,8 +86,13 @@
 Subscribers
 %endif%
 can retrieve message number N from the list's archive by sending a message
-to $listgetN$ (and changing the N to the number of the desired message).
+to $list+$get-N@$domain$ (change the N to the number of the desired message).
 
 %endif%%endif%
-To contact the list owner, send a message to $listowner$
+%wrap%
+You can retrieve the frequently asked questions document for the list by
+sending a message to $list+$faq@$domain$
 
+%wrap%
+To contact the list owner, send a message to $list+$owner@$domain$
+

--- a/en/list	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/list	Tue Feb 22 10:40:00 2011 +1100
@@ -1,6 +1,6 @@
-Subject: Subscribers to $listaddr$
+Subject: Subscribers to $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%Here is the list of subscribers
 %iftype all%

--- a/en/moderate-post	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/moderate-post	Tue Feb 22 10:40:00 2011 +1100
@@ -1,4 +1,4 @@
-Subject: Please moderate $listaddr$: $subject$
+Subject: Please moderate $list$@$domain$: $subject$
 MIME-Version: 1.0
 Content-Type: multipart/mixed;
  boundary="=_$random0$$random1$_="
@@ -8,7 +8,7 @@
 Content-Type: text/plain; charset=utf8
 Content-Transfer-Encoding: 8bit
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%A message from $posteraddr$ with subject "$subject$" has been
 submitted for posting. You are being asked to moderate

--- a/en/notify	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/notify	Tue Feb 22 10:40:00 2011 +1100
@@ -1,7 +1,7 @@
-%ifaction sub%Subject: Subscribed to $listaddr$: $subaddr$%endif%
-%ifaction unsub%Subject: Unsubscribed from $listaddr$: $subaddr$%endif%
+%ifaction sub%Subject: Subscribed to $list$@$domain$: $subaddr$%endif%
+%ifaction unsub%Subject: Unsubscribed from $list$@$domain$: $subaddr$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifaction sub%

--- a/en/probe	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/probe	Tue Feb 22 10:40:00 2011 +1100
@@ -1,6 +1,6 @@
-Subject: Bouncing messages from $listaddr$
+Subject: Bouncing messages from $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 Some messages to you could not be delivered. If you're seeing this
 message it means things are back to normal, and it's merely for your

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/prologue	Tue Feb 22 10:40:00 2011 +1100
@@ -0,0 +1,2 @@
+%wrap%Hi, this is the Mlmmj program managing the $list$@$domain$ mailing
+list.

--- a/en/wait-post	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/wait-post	Tue Feb 22 10:40:00 2011 +1100
@@ -1,4 +1,4 @@
-Subject: Awaiting release to $listaddr$: $subject$
+Subject: Awaiting release to $list$@$domain$: $subject$
 MIME-Version: 1.0
 Content-Type: multipart/mixed;
  boundary="=_$random0$$random1$_="
@@ -8,7 +8,7 @@
 Content-Type: text/plain; charset=utf8
 Content-Transfer-Encoding: 8bit
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%The message from $posteraddr$ with subject "$subject$" has been
 submitted to the list. However, the moderators are being asked to review it

--- a/en/wait-sub	Mon Feb 21 22:18:05 2011 +1100
+++ b/en/wait-sub	Tue Feb 22 10:40:00 2011 +1100
@@ -1,6 +1,6 @@
-Subject: Awaiting permission to join $listaddr$
+Subject: Awaiting permission to join $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%Your request to join the list has been received. However, the
 gatekeepers are being asked to review it before permitting you to join.