Further enhancement with #9063a2a - to ensure our message addressing and content picks the right address

app/Models/Netmail.php

@@ -206,12 +206,11 @@ final class Netmail extends Model implements Packet
 			$o->tearline = $this->tearline;
 
 			// VIA kludge
-			$sysaddress = Setup::findOrFail(config('app.id'))->system->match($this->fftn->zone)->first();
 			$via = $this->via ?: collect();
 			// Add our address to the VIA line
 			$via->push(
 				sprintf('%s @%s.UTC %s %d.%d/%s %s',
-					$sysaddress->ftn3d,
+					our_address($this->fftn->zone->domain,$this->fftn)->ftn3d,
 					Carbon::now()->utc()->format('Ymd.His'),
 					str_replace(' ','_',Setup::PRODUCT_NAME),
 					Setup::PRODUCT_VERSION_MAJ,