2 files changed, 4 insertions, 4 deletions

diff --git a/src/mailman/mta/decorating.py b/src/mailman/mta/decorating.py
index bf7472327..6093971f8 100644
--- a/src/mailman/mta/decorating.py
+++ b/src/mailman/mta/decorating.py
@@ -36,10 +36,10 @@ class DecoratingMixin:
 
     def decorate(self, mlist, msg, msgdata):
         """Add recipient-specific headers and footers."""
+        decorator = config.handlers['decorate']
+        decorator.process(mlist, msg, msgdata)
         # Do not decorate a message more than once.
-        if not msgdata.get('decorated', False):
-            decorator = config.handlers['decorate']
-            decorator.process(mlist, msg, msgdata)
+        msgdata['nodecorate'] = True
 
 
 
diff --git a/src/mailman/mta/docs/decorating.txt b/src/mailman/mta/docs/decorating.txt
index f588eed5e..490974913 100644
--- a/src/mailman/mta/docs/decorating.txt
+++ b/src/mailman/mta/docs/decorating.txt
@@ -157,7 +157,7 @@ Decorate only once
 Do not decorate a message twice.  Decorators must insert the 'decorated' key
 into the message metadata.
 
-    >>> msgdata['decorated'] = True
+    >>> msgdata['nodecorate'] = True
     >>> decorating.deliver(mlist, msg, msgdata)
     {}
     >>> messages = list(smtpd.messages)