update

ts/mail/delivery/smtpserver/data-handler.ts

@@ -356,10 +356,12 @@ export class DataHandler implements IDataHandler {
       to: to.split(',').map(addr => addr.trim()),
       subject: subject,
       text: bodyText,
-      messageId: messageId,
-      // Add original session envelope data for accurate routing
-      originalMailFrom: session.envelope.mailFrom.address,
-      originalRcptTo: session.envelope.rcptTo.map(r => r.address)
+      // Add original session envelope data for accurate routing as headers
+      headers: {
+        'X-Original-Mail-From': session.envelope.mailFrom.address,
+        'X-Original-Rcpt-To': session.envelope.rcptTo.map(r => r.address).join(', '),
+        'Message-Id': messageId
+      }
     });
     
     // Add received header
@@ -553,5 +555,4 @@ export class DataHandler implements IDataHandler {
       }
     }, 100); // Short delay before retry
     }
-  }
-}
+  }