This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of
its recipients. This is a permanent error.

The following address failed:

lilypond-user-fr(at)gnu(dot)org:
SMTP error from remote server for TEXT command, host: eggs.gnu.org (209.51.188.92) reason: 550 Message headers fail syntax check


--- The header of the original message is following. ---

Received: from fudforum.localhost ([90.29.105.171]) by
 mrelayeu.kundenserver.de (mreue012 [212.227.15.168]) with ESMTPA (Nemesis) id
 1M91Tq-1m1abU45Xa-006Agp for <lilypond-user-fr(at)gnu(dot)org>; Fri, 16 Jul 2021
 10:55:07 +0200
Subject: Nouveau test
Date: Fri, 16 Jul 2021 10:55:07 +0200
To: lilypond-user-fr(at)gnu(dot)org
From: Administrator <jean(at)abou-samra(dot)fr>
Errors-To: Administrator <jean(at)abou-samra(dot)fr>
Return-Path: Administrator <jean(at)abou-samra(dot)fr>
X-Mailer: FUDforum v3.1.1
MIME-Version: 1.0
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: 8bit
Organization: My forum, my way!
X-FUDforum: 8c9495fe7974471f9dc0168115731210 <3>
Message-ID: <3(dot)60f14969(at)fudforum(dot)localhost>
X-Provags-ID: V03:K1:5IUNE5rBW50JR/81TCYz9GTY3JGrtugb39n86zLqkbinTWxPotE
 owOWlfK8g3pgNPnzxyaqlpyCTdT+TeBj1gr3YM8RMRKuiRVfQ8QIgb41M0UMY/7DXVLrtvq
 3MHiMocFi3A7+Vjon+ge8BM91x8Fnoxb0DUeyT7BzHQaxKRyMofv7Vg2G3y8dSZGU+9cueq
 spNsB1YCzToaDWI2+TUZQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:4NmddZixQBc=:/dw3WJVXlOVY7tb70itGXS
 LECVjiuOoQmVVXykcbJ7AweIKtZZEFUxDOBKpkDl2X6oklMlNDBw1vtUyE4HF37IERuCpZ53b
 5oY8c7Sfw7XO2TVrYEsZzqCdG/Slp3Muv2duOmlJTZwtsAAD58foGWJGq4kZKVPCoJ5Bu1zNR
 Zjkb0PzKIpE0ltvjD0Hfv97FW0r5Ek5EAtHxLYr2kSx8ljxgS1oZwoAYkym4yc5QR6Axqk1+6
 KyptLRUacejA2uH/OC/RCoDnpTeIkjsSkHZhPQRiRm8lcvuZn2P0sZ5niXXZZodpUq1A564l+
 GIdQYg/PmmfkwAA+ZfNMYQabU0bWwlTrPhg6NDrkMaa7iL00Sq9+ILLxYPmxMGt/hZ3a9FJWl
 MVL7nWGzNKYiixb1OVpH7sAxudPusu+VsjQwjxlfnffu4C5QjjatOlh27eTvc5jjp0sLSE0cz
 A8niGgemci4sIUgSoXTpCe2Z3ZYh1cBF8vV6s6tqDsfd5Bgl4YaAeJFZQ1YODDDprF9A4S5Ml
 UQLQw4AtoESIc1jAZS7iKmTPnSdQJhtpXWK3psYgbQ1N+lVIz5nVjfiM9Qqh2CKqYgBAbj4fg
 Nnt6KhI35uYMyjYofbRLMALTisAcUWXg9yh3idjnRdjyNJtmE1q2znKZlSx3gVP0AOZBIh17z
 UZvv8D5J6uzQ+VuaeNcp+qWv4e3RAuQmpRDIBURvhq+qrhtHh4Jol8hDgzSC6ify2bkU5bRmO
 w7xW+z5G5US5QQ89/qSOBl5OeLeYTAED7qC+ZaEETHY8vPTi6ZVXJ90sRaapl6qk76GXgj11j
 E0m3IvtVSG5p8giWoia/UgsEK2XZ6jkNLia5lNitaS3yxZ7XA7R9BLUEosn+FSz+g1+D/5g

diff --git a/install/forum_data/src/iemail.inc.t b/install/forum_data/src/iemail.inc.t
index be9d35037..ccff78d51 100644
--- a/install/forum_data/src/iemail.inc.t
+++ b/install/forum_data/src/iemail.inc.t
@@ -63,7 +63,14 @@ function send_email($from, $to, $subj, $body, $header='', $munge_newlines=1)
        if (strpos($header, 'MIME-Version') === false) {
                $extra_header = "\nMIME-Version: 1.0\nContent-Type: text/plain; charset={TEMPLATE: iemail_CHARSET}\nContent-Transfer-Encoding: 8bit". $header;
        }
-       $header = 'From: '. $from ."\nErrors-To: ". $from ."\nReturn-Path: ". $from ."\nX-Mailer: FUDforum v". $GLOBALS['FORUM_VERSION']. $extra_header. $header;
+
+    $addronly = preg_replace(".*<", "<", $from);
+    $header =
+        "From: $from\n" .
+        "Errors-To: $addronly\n" .
+        "Return-Path: $addronly\n" .
+        "X-Mailer: FUDforum v" . $GLOBALS['FORUM_VERSION'] .
+        $extra_header . $header;
 
        $body = str_replace("\r", '', $body);
        if ($munge_newlines) {
diff --git a/install/www_root/adm/admmassemail.php b/install/www_root/adm/admmassemail.php
index 4972fe148..9a96c02bc 100644
--- a/install/www_root/adm/admmassemail.php
+++ b/install/www_root/adm/admmassemail.php
@@ -71,8 +71,15 @@
                        $email_batch_cnt = 0;
                        $to = array();
 
+            $addronly = preg_replace(".*<", "<", $ADMIN_EMAIL);
                        if (!($FUD_OPT_1 & 512)) {      // Not USE_SMTP.
-                               $header = 'From: '. $ADMIN_EMAIL. "\r\nErrors-To: ". $ADMIN_EMAIL. "\r\nReply-To: ". $ADMIN_EMAIL. "\r\nX-Mailer: FUDforum v". $GLOBALS['FORUM_VERSION']. "\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset=". $charset. "\r\nContent-Transfer-Encoding: 8bit";
+                               $header =
+                  'From: '. $addronly.
+                  "\r\nErrors-To: ". $addronly.
+                  "\r\nReply-To: ". $addronly.
+                  "\r\nX-Mailer: FUDforum v". $GLOBALS['FORUM_VERSION'].
+                  "\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset=". $charset.
+                  "\r\nContent-Transfer-Encoding: 8bit";
                        
                                $_POST['body'] = str_replace("\n.", "\n..", $_POST['body']);
 
@@ -113,7 +120,7 @@
                                        }
                                }
                        } else {
-                               $header = 'Errors-To: '. $ADMIN_EMAIL. "\r\nReply-To: ". $ADMIN_EMAIL. "\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset=". $charset. "\r\nContent-Transfer-Encoding: 8bit";
+                               $header = 'Errors-To: '. $addronly. "\r\nReply-To: ". $addronly. "\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset=". $charset. "\r\nContent-Transfer-Encoding: 8bit";
 
                                $smtp = new fud_smtp;
                                $smtp->msg = str_replace("\n.", "\n..", $_POST['body']);