Generated mail from the hub wont have defined

app/Classes/FTN/Message.php

@@ -539,8 +539,10 @@ class Message extends FTNBase
 				$this->mo->kludges->put('TOPT',$this->mo->tftn->point_id);
 		}
 
-		$this->mo->kludges->put($this->mo->isFlagSet(self::FLAG_LOCAL) ? 'PID:' : 'TID:',sprintf('%s %s',Setup::PRODUCT_NAME_SHORT,$s->version));
-		$this->mo->kludges->put('DBID:',$this->mo->id);
+		if ($this->mo->isFlagSet(self::FLAG_LOCAL))
+			$this->mo->kludges->put('PID',sprintf('clrghouz %s',$s->version));
+		else
+			$this->mo->kludges->put('TID',sprintf('clrghouz %s',$s->version));
 
 		if ($this->mo instanceof Echomail)
 			$return .= sprintf("AREA:%s\r",strtoupper($this->mo->echoarea->name));
@@ -563,10 +565,10 @@ class Message extends FTNBase
 				$return .= sprintf("\x01Via %s\r",$this->mo->via($ao));
 
 			// Add our address
-			$return .= sprintf("\x01Via %s @%s.UTC %s %s\r",
+			$return .= sprintf("\x01Via %s @%s.UTC %s (%04X)\r",
 				$this->us->ftn3d,
 				Carbon::now()->format('Ymd.His'),
-				Setup::PRODUCT_NAME_SHORT,$s->version);
+				Setup::PRODUCT_NAME,Setup::PRODUCT_ID);
 
 		} else {
 			// FTS-0004.001/FSC-0068.001 The message SEEN-BY lines

app/Models/Setup.php

@@ -20,7 +20,6 @@ use App\Classes\Protocol\{Binkp,DNS,EMSI};
 class Setup extends Model
 {
 	public const PRODUCT_NAME			= 'Clearing Houz';
-	public const PRODUCT_NAME_SHORT		= 'clrghouz';
 	public const PRODUCT_ID				= 0xAB8D;
 	public const PRODUCT_VERSION_MAJ	= 0;
 	public const PRODUCT_VERSION_MIN	= 0;

app/Traits/MessageAttributes.php

@@ -60,7 +60,7 @@ trait MessageAttributes
 		if ($this->origin)
 			$result .= sprintf("%s",$this->origin);
 
-		return rtrim($result,"\r");
+		return rtrim($result,"\r").'xx';
 	}
 
 	public function getDateAttribute(): Carbon

resources/views/layouts/partials/footer.blade.php

@@ -1,6 +1,6 @@
 <span>
 	<small>
 		<a href="/" class="goback float-start p-0">{{ request()->getHost() }}</a> &copy {{ \Carbon\Carbon::now()->year }} Deon George
-		<span class="float-end"><strong class="highlight">{{ \App\Models\Setup::PRODUCT_NAME_SHORT }}</strong> <small>[<strong class="gray">{{ gethostname() }}</strong>@if (File::exists('../VERSION')) @ <strong class="success">{{ chop(File::get('../VERSION')) }}</strong>@endif]</small></span>
+		<span class="float-end"><strong class="highlight">clrghouz</strong> <small>[<strong class="gray">{{ gethostname() }}</strong>@if (File::exists('../VERSION')) @ <strong class="success">{{ chop(File::get('../VERSION')) }}</strong>@endif]</small></span>
 	</small>
 </span>