#1484966: place Message-Id below Received header

program/steps/mail/sendmail.inc

@@ -210,9 +210,6 @@ if (!empty($_POST['_receipt']))
   }
 
 // additional headers
-$headers['Message-ID'] = $message_id;
-$headers['X-Sender'] = $from;
-
 if ($CONFIG['http_received_header'])
 {
   $nldlm = rcmail_header_delm() . "\t";
@@ -223,6 +220,9 @@ if ($CONFIG['http_received_header'])
     69, $nldlm);
 }
 
+$headers['Message-ID'] = $message_id;
+$headers['X-Sender'] = $from;
+
 if (!empty($CONFIG['useragent']))
   $headers['User-Agent'] = $CONFIG['useragent'];