Fix passthrough netmail.

app/Classes/FTN/Message.php

@@ -252,9 +252,9 @@ class Message extends FTNBase
 			// To Addresses
 			// Echomail doesnt have a zone, so we'll use the source zone
 			case 'tz': return Arr::get($this->echoarea ? $this->src : $this->dst,'z');
-			case 'tn': return $this->echoarea ? Arr::get($this->header,'dnet') : Arr::get($this->dst,'n');
-			case 'tf': return $this->echoarea ? Arr::get($this->header,'dnode') : Arr::get($this->dst,'f');
-			case 'tp': return Arr::get($this->dst,'p');
+			case 'tn': return Arr::get($this->header,'dnet');
+			case 'tf': return Arr::get($this->header,'dnode');
+			case 'tp': return Arr::get($this->dst,'p');	// @todo this wont work for netmails, since dst is not set for in transit messages
 
 			case 'fftn':
 			case 'fftn_o':
@@ -757,7 +757,11 @@ class Message extends FTNBase
 
 				// The message is the rest?
 				} elseif (strlen($kl) > $retpos+1) {
-					$this->message .= substr($kl,$retpos+1);
+					// Since netmail doesnt have an origin - our source:
+					$this->message .= substr($message, 0, $msgpos);
+
+					$this->message_src = substr($kl,$retpos+1);
+
 					$kl = substr($kl,0,$retpos);
 				}
 

app/Models/Echomail.php

@@ -35,6 +35,7 @@ final class Echomail extends Model implements Packet
 		'from',
 		'subject',
 		'msg',
+		'msg_src',
 		'origin',
 		'tearline',
 		'tagline',

app/Models/Netmail.php

@@ -22,6 +22,7 @@ final class Netmail extends Model implements Packet
 		'from',
 		'subject',
 		'msg',
+		'msg_src',
 		'origin',
 		'tearline',
 		'tagline',