1 files changed, 2 insertions, 4 deletions

diff --git a/Mailman/Message.py b/Mailman/Message.py
index ebbe328b5..ac7c347d7 100644
--- a/Mailman/Message.py
+++ b/Mailman/Message.py
@@ -154,10 +154,7 @@ class UserNotification(Message):
         charset = None
         if lang is not None:
             charset = Charset(Utils.GetCharSet(lang))
-        if text is None:
-            self.set_charset(charset)
-        else:
-            # Implies a set_charset() call
+        if text is not None:
             self.set_payload(text, charset)
         if subject is None:
             subject = '(no subject)'
@@ -190,4 +187,5 @@ class UserNotification(Message):
         virginq.enqueue(self,
                         listname = mlist.internal_name(),
                         recips = self.recips,
+                        nodecorate = 1,
                         **_kws)