diff --git a/src/lib/Sympa/Message.pm b/src/lib/Sympa/Message.pm
index 3d811ffe6..079eae7df 100644
--- a/src/lib/Sympa/Message.pm
+++ b/src/lib/Sympa/Message.pm
@@ -134,6 +134,9 @@ sub new {
         my $addr = $1;
         if ($addr =~ /<>/) {    # special: null envelope sender
             $self->{'envelope_sender'} = '<>';
+        } elsif ($addr =~ /<MAILER-DAEMON>/) {
+            # Same as above, but a workaround for pipe(8) of Postfix 2.3+.
+            $self->{'envelope_sender'} = '<>';
         } else {
             my @addrs = Mail::Address->parse($addr);
             if (@addrs
@@ -4377,6 +4380,10 @@ Prepending C<Return-Path:> is available by default.
 
 Add C<R> to the C<flags=> attributes in master.cf.
 
+Additionally with Postfix 2.3 or later, add an empty C<null_sender=>
+attribute.
+Or "null envelope sender" would be replaced with C<E<lt>MAILER-DAEMONE<gt>>.
+
 =back
 
 =item Exim