Complete rework of packet parsing and packet generation

app/Models/Address.php

@@ -1053,6 +1053,8 @@ class Address extends Model
 			if ($passpos > 8)
 				Log::alert(sprintf('%s:! Password would be greater than 8 chars? [%d]',self::LOGKEY,$passpos));
 
+			// @todo Do the strip pass where, if we dont want the password in the netmail
+
 			$pkt = $this->getPacket($x,substr($x->last()->subject,0,$passpos));
 
 			if ($pkt && $pkt->count() && $update)
@@ -1091,8 +1093,9 @@ class Address extends Model
 	 * @param string|null $passwd Override password used in packet
 	 * @return Packet|null
 	 * @throws \Exception
+	 * @deprecated
 	 */
-	public function getPacket(Collection $msgs,string $passwd=NULL): ?Packet
+	private function getPacket(Collection $msgs,string $passwd=NULL): ?Packet
 	{
 		$s = Setup::findOrFail(config('app.id'));
 		$ao = our_address($this);
@@ -1104,7 +1107,7 @@ class Address extends Model
 		}
 
 		// Get packet type
-		$o = $ao->system->packet();
+		$o = $ao->system->packet($this);
 		$o->addressHeader($ao,$this,$passwd);
 
 		// $oo = Netmail/Echomail Model