--- a/ChangeLog	Mon Sep 20 02:31:03 2010 +1000
+++ b/ChangeLog	Mon Sep 20 02:52:22 2010 +1000
@@ -1,3 +1,4 @@
+ o Richer MIME list texts with inline messages (English only so far)
  o Add $random0$ through $random5$ substitutions
  o Add a $subject$ substitution for list texts
  o Changes to how $originalmail$ works -- existing installations will change

--- a/listtexts/en/access	Mon Sep 20 02:31:03 2010 +1000
+++ b/listtexts/en/access	Mon Sep 20 02:52:22 2010 +1000
@@ -1,14 +1,32 @@
 Subject: Post to $listaddr$ denied
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-I'm sorry to inform you that your message could not be delivered to the
-list. Your mail was rejected because it matched a rule set up by the
-list administrator.
+I'm sorry to inform you that your message with subject line
+
+$subject$
+
+could not be delivered to the list. Your mail was rejected because it
+matched a rule set up by the list administrator.
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--

--- a/listtexts/en/maxmailsize	Mon Sep 20 02:31:03 2010 +1000
+++ b/listtexts/en/maxmailsize	Mon Sep 20 02:52:22 2010 +1000
@@ -1,4 +1,12 @@
 Subject: Post to $listaddr$ denied due to size limit
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
@@ -9,5 +17,12 @@
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
+(The beginning of the denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
  $originalmail$
+--=_$random0$$random1$_=--

--- a/listtexts/en/moderation	Mon Sep 20 02:31:03 2010 +1000
+++ b/listtexts/en/moderation	Mon Sep 20 02:52:22 2010 +1000
@@ -1,4 +1,12 @@
 Subject: Moderation needed for $listaddr$
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hello,
 
@@ -6,6 +14,12 @@
 
 $listaddr$
 
+with subject line:
+
+$subject$
+
+It is below.
+
 To accept it send a message to:
 
 $moderateaddr$
@@ -18,5 +32,10 @@
 
 $moderators$
 
---- Below this line are the first 100 lines of the message up for moderation --->
- $originalmail$
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--

--- a/listtexts/en/moderation-poster	Mon Sep 20 02:31:03 2010 +1000
+++ b/listtexts/en/moderation-poster	Mon Sep 20 02:52:22 2010 +1000
@@ -1,11 +1,30 @@
 Subject: Post waiting for approval
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-This list is configured to have moderated posts, the post has been queued
-for approval.
+This list is configured to have moderated posts. Your post with subject
+line
+
+$subject$
+
+has been queued for approval.
 
---- Below this line are the first 100 lines of the message up for moderation --->
- $originalmail$
+(The queued message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--

--- a/listtexts/en/notintocc	Mon Sep 20 02:31:03 2010 +1000
+++ b/listtexts/en/notintocc	Mon Sep 20 02:52:22 2010 +1000
@@ -1,16 +1,34 @@
 Subject: Posts to $listaddr$ denied
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-I'm sorry to inform you that your message could not be delivered to the
-list.
+I'm sorry to inform you that your message with subject line
+
+$subject$
+
+could not be delivered to the list.
 
 In order to post to this list, the list address must be contained
 in either the To: or Cc: header.
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--

--- a/listtexts/en/subonlypost	Mon Sep 20 02:31:03 2010 +1000
+++ b/listtexts/en/subonlypost	Mon Sep 20 02:52:22 2010 +1000
@@ -1,14 +1,26 @@
 Subject: $listaddr$ is a subscribers only list
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-You have tried to post from this email address:
+Your post with subject line
+
+$subject$
+
+came from the email address
 
 $posteraddr$
 
-But this address is not subscribed, and only subscribers may post to
+but this address is not subscribed, and only subscribers may post to
 the list.
 
 If you believe you are correctly subscribed, please check the email address
@@ -18,5 +30,12 @@
 If you want to be able to post from more than one email address, you
 can subscribe the other addresses to the nomail version of the list.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--