diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php
index 52f0075..6cb73bc 100644
--- a/app/Classes/FTN/Message.php
+++ b/app/Classes/FTN/Message.php
@@ -8,6 +8,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 use Illuminate\Validation\Validator as ValidatorResult;
 
 use App\Classes\FTN as FTNBase;
@@ -534,9 +535,9 @@ class Message extends FTNBase
 			$this->mo->date->format('d M y  H:i:s'),
 		);
 
-		$return .= $this->mo->to."\00";
-		$return .= $this->mo->from."\00";
-		$return .= $this->mo->subject."\00";
+		$return .= Str::limit($this->mo->to,self::USER_TO_LEN,'')."\00";
+		$return .= Str::limit($this->mo->from,self::USER_FROM_LEN,'')."\00";
+		$return .= Str::limit($this->mo->subject,self::SUBJECT_LEN-3)."\00";
 
 		// Add our FMPT/TOPT kludges for netmails to a point
 		if ($this->mo instanceof Netmail) {