When decompressing compressed messages, dont barf if we try to decompress the same attribute twice

app/Casts/CompressedString.php

@@ -28,7 +28,13 @@ class CompressedString implements CastsAttributes
 			? stream_get_contents($value)
 			: $value;
 
+		// If we get an error decompressing, it might not be zstd (or its already been done)
+		try {
 			return $value ? zstd_uncompress(base64_decode($value)) : '';
+
+		} catch (\ErrorException $e) {
+			return $value;
+		}
 	}
 
 	/**

app/Jobs/MessageProcess.php

@@ -116,8 +116,12 @@ class MessageProcess implements ShouldQueue
 			$o->cost = $this->msg->cost;
 			$o->msgid = $this->msg->msgid;
 
+			$o->tagline = $this->msg->tagline;
+			$o->tearline = $this->msg->tearline;
+			$o->origin = $this->msg->origin;
+
 			$o->subject = $this->msg->subject;
-			$o->msg = $this->msg->message;
+			$o->msg = $this->msg->message_src."\r";
 
 			foreach ($this->msg->via as $v)
 				$o->msg .= sprintf("\01Via %s\r",$v);
@@ -372,6 +376,10 @@ class MessageProcess implements ShouldQueue
 			$o->msgid = $this->msg->msgid;
 			$o->replyid = $this->msg->replyid;
 
+			$o->tagline = $this->msg->tagline;
+			$o->tearline = $this->msg->tearline;
+			$o->origin = $this->msg->origin;
+
 			$o->msg = $this->msg->message_src."\r";
 			$o->msg_src = $this->msg->message_src;
 			$o->msg_crc = md5($this->msg->message);

database/migrations/2024_05_13_154308_add_origin_to_netmail.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('netmails', function (Blueprint $table) {
+			$table->string('origin')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('netmail', function (Blueprint $table) {
+			$table->dropColumn('origin');
+        });
+    }
+};

public/css/fixes.css

@@ -134,3 +134,8 @@ h1>small.success:after {
 	margin-right: 0;
 	margin-left: 0;
 }
+
+/* Enable smaller text in h1, but not tiny as used at the float-end */
+h1 > small:not(.float-end) {
+	font-size: 50% !important;
+}

resources/views/echomail/view.blade.php

@@ -6,7 +6,7 @@
 @section('content')
 	<div class="row">
 		<div class="col-12">
-			<h1>Echomail [{{ $o->msgid ?: '-' }}] <small class="float-end">#{{ $o->id }}</small></h1>
+			<h1>Echomail <small>[{{ $o->msgid ?: '-' }}]</small> <small class="float-end">#{{ $o->id }}</small></h1>
 
 			@include('widgets.message',['msg'=>$o])
 		</div>

resources/views/netmail/view.blade.php

@@ -6,7 +6,7 @@
 @section('content')
 	<div class="row">
 		<div class="col-12">
-			<h1>Netmail [{{ $o->msgid ?: '-' }}] <small class="float-end">#{{ $o->id }}</small></h1>
+			<h1>Netmail <small>[{{ $o->msgid ?: '-' }}]</small> <small class="float-end">#{{ $o->id }}</small></h1>
 
 			@include('widgets.message',['msg'=>$o])
 		</div>