diff --git a/app/Models/Address.php b/app/Models/Address.php
index 60cddff..e472f25 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -544,10 +544,18 @@ class Address extends Model
 		if ($echomail)
 			return $this->getPacket($echomail);
 
+		$s = Setup::findOrFail(config('app.id'));
+
 		if (($x=$this->echomailWaiting())
 			->count())
 		{
-			Log::debug(sprintf('%s:= Got [%d] echomails for [%s] for sending',self::LOGKEY,$x->count(),$this->ftn));
+			// Limit to max messages
+			Log::info(sprintf('%s:= Got [%d] echomails for [%s] for sending',self::LOGKEY,$x->count(),$this->ftn));
+
+			if ($x->count() > $s->max_msgs_pkt) {
+				$x = $x->take($s->max_msgs_pkt);
+				Log::alert(sprintf('%s:= Only sending [%d] echomails for [%s]',self::LOGKEY,$x->count(),$this->ftn));
+			}
 
 			$pkt = $this->getPacket($x);
 
@@ -593,12 +601,13 @@ class Address extends Model
 	/**
 	 * Return a packet of mail
 	 *
-	 * @param Collection $c of message models (Echomail/Netmail)
+	 * @param Collection $msgs of message models (Echomail/Netmail)
 	 * @return Packet|null
 	 */
-	private function getPacket(Collection $c): ?Packet
+	private function getPacket(Collection $msgs): ?Packet
 	{
-		$ao = Setup::findOrFail(config('app.id'))->system->match($this->zone)->first();
+		$s = Setup::findOrFail(config('app.id'));
+		$ao = $s->system->match($this->zone)->first();
 
 		// If we dont match on the address, we cannot pack mail for that system
 		if (! $ao)
@@ -607,8 +616,14 @@ class Address extends Model
 		$o = new Packet($ao,$this);
 
 		// $oo = Netmail/Echomail Model
-		foreach ($c as $oo)
+		$c = 0;
+		foreach ($msgs as $oo) {
+			// Only bundle up to max messages
+			if (++$c > $s->max_msgs_pkt)
+				break;
+
 			$o->addMail($oo->packet($this));
+		}
 
 		return $o;
 	}
diff --git a/app/Models/Setup.php b/app/Models/Setup.php
index 2e80a70..a7e811e 100644
--- a/app/Models/Setup.php
+++ b/app/Models/Setup.php
@@ -44,6 +44,8 @@ class Setup extends Model
 	public const PRODUCT_VERSION_MAJ	= 0;
 	public const PRODUCT_VERSION_MIN	= 0;
 
+	public const MAX_MSGS_PKT			= 50;
+
 	public const hexdigitslower			= '0123456789abcdef';
 
 	// Our non model attributes and values
@@ -81,6 +83,9 @@ class Setup extends Model
 			case 'do_prevent':
 				return $this->internal[$key] ?? FALSE;
 
+			case 'max_msgs_pkt':
+				return self::MAX_MSGS_PKT;
+
 			case 'version':
 				return File::exists('VERSION') ? chop(File::get('VERSION')) : 'dev';
 
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index bfba81f..7e332e4 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -1,3 +1,4 @@
+<!-- $o = Setup::class -->
 @php
 use App\Models\Setup;
 @endphp
@@ -171,6 +172,21 @@ use App\Models\Setup;
 					</div>
 
 					<div class="row">
+						<div class="col-6">
+							<h3>Echomail Settings</h3>
+
+							<div class="form-group row pt-0">
+								<div class="col-2">
+									<input class="form-control text-end" type="text" id="msgs_pkt" name="msgs_pkt" value="{{ old('msgs_pkt',$o->max_msgs_pkt) }}" disabled>
+								</div>
+								<div class="col-10">
+									<label class="col-form-label pt-2" for="msgs_pkt">Max Messages per Packet</label>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div class="row pt-5">
 						<div class="col-2">
 							<a href="{{ url('ftn/domain') }}" class="btn btn-danger">Cancel</a>
 						</div>