6 files changed, 21 insertions, 5 deletions

diff --git a/src/mailman/docs/registration.txt b/src/mailman/docs/registration.txt
index 6b1ff0c18..a66544fc7 100644
--- a/src/mailman/docs/registration.txt
+++ b/src/mailman/docs/registration.txt
@@ -158,6 +158,7 @@ message is sent to the user in order to verify the registered address.
     >>> dump_msgdata(qdata)
     _parsemsg           : False
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'aperson@example.com']
     reduced_list_headers: True
     version             : 3
diff --git a/src/mailman/docs/requests.txt b/src/mailman/docs/requests.txt
index 5dcfa922a..1bf981859 100644
--- a/src/mailman/docs/requests.txt
+++ b/src/mailman/docs/requests.txt
@@ -299,6 +299,7 @@ The message can be rejected, meaning it is bounced back to the sender.
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'aperson@example.org']
     reduced_list_headers: True
     version             : 3
@@ -404,6 +405,7 @@ moderators.
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'zperson@example.com']
     reduced_list_headers: True
     version             : 3
@@ -474,6 +476,7 @@ queue when the message is held.
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'alist-owner@example.com']
     reduced_list_headers: True
     tomoderators        : True
@@ -529,6 +532,7 @@ subscriber.
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'cperson@example.org']
     reduced_list_headers: True
     version             : 3
@@ -573,6 +577,7 @@ subscription and the fact that they may need to approve it.
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'alist-owner@example.com']
     reduced_list_headers: True
     tomoderators        : True
@@ -646,6 +651,7 @@ The welcome message is sent to the person who just subscribed.
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'fperson@example.org']
     reduced_list_headers: True
     verp                : False
@@ -752,6 +758,7 @@ unsubscription holds can send the list's moderators an immediate notification.
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'alist-owner@example.com']
     reduced_list_headers: True
     tomoderators        : True
@@ -810,6 +817,7 @@ and the person remains a member of the mailing list.
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'hperson@example.com']
     reduced_list_headers: True
     version             : 3
@@ -865,6 +873,7 @@ The goodbye message...
     _parsemsg           : False
     listname            : alist@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'gperson@example.com']
     reduced_list_headers: True
     verp                : False
diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py
index 458f4070c..73bc8c8be 100644
--- a/src/mailman/email/message.py
+++ b/src/mailman/email/message.py
@@ -207,6 +207,7 @@ class UserNotification(Message):
             recipients=self.recips,
             nodecorate=True,
             reduced_list_headers=True,
+            original_size=len(self.as_string()),
             )
         if mlist is not None:
             enqueue_kws['listname'] = mlist.fqdn_listname
diff --git a/src/mailman/pipeline/docs/replybot.txt b/src/mailman/pipeline/docs/replybot.txt
index f02b90254..7d0db010c 100644
--- a/src/mailman/pipeline/docs/replybot.txt
+++ b/src/mailman/pipeline/docs/replybot.txt
@@ -49,6 +49,7 @@ response.
     _parsemsg           : False
     listname            : _xtest@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'aperson@example.com']
     reduced_list_headers: True
     version             : 3
@@ -137,6 +138,7 @@ header is ignored.
     _parsemsg           : False
     listname            : _xtest@example.com
     nodecorate          : True
+    original_size       : ...
     recipients          : [u'asystem@example.com']
     reduced_list_headers: True
     version             : 3
diff --git a/src/mailman/queue/docs/command.txt b/src/mailman/queue/docs/command.txt
index ae5b2612d..7c989ac67 100644
--- a/src/mailman/queue/docs/command.txt
+++ b/src/mailman/queue/docs/command.txt
@@ -58,10 +58,14 @@ And now the response is in the virgin queue.
     <BLANKLINE>
     - Done.
     <BLANKLINE>
-    >>> sorted(item.msgdata.items())
-    [..., ('listname', u'test@example.com'), ...,
-     ('recipients', [u'aperson@example.com']),
-     ...]
+    >>> dump_msgdata(item.msgdata)
+    _parsemsg           : False
+    listname            : test@example.com
+    nodecorate          : True
+    original_size       : 532
+    recipients          : [u'aperson@example.com']
+    reduced_list_headers: True
+    version             : ...
 
 
 A command in the body
diff --git a/src/mailman/testing/helpers.py b/src/mailman/testing/helpers.py
index a10898d5d..66b14d898 100644
--- a/src/mailman/testing/helpers.py
+++ b/src/mailman/testing/helpers.py
@@ -46,7 +46,6 @@ from mailman.utilities.mailbox import Mailbox
 
 
 STARTUP_WAIT = datetime.timedelta(seconds=5)
-log = logging.getLogger('mailman.debug')