diff --git a/app/Classes/File/Mail.php b/app/Classes/File/Mail.php
index 519b52d..f0f05c9 100644
--- a/app/Classes/File/Mail.php
+++ b/app/Classes/File/Mail.php
@@ -20,7 +20,7 @@ class Mail extends Item
 		switch ($action) {
 			case self::I_SEND:
 				$this->file = $mail;
-				$this->file_name = sprintf('%08x.pkt',Carbon::now()->timestamp);
+				$this->file_name = sprintf('%s.pkt',$mail->name);
 				$this->file_size = strlen($mail);
 				$this->file_mtime = Carbon::now()->timestamp;	// @todo This timestamp should be consistent incase of retries
 
diff --git a/app/Models/Address.php b/app/Models/Address.php
index 1b5c0a1..54f5026 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -424,7 +424,7 @@ class Address extends Model
 	 * Return a packet of mail
 	 *
 	 * @param Collection $c
-	 * @return Packet
+	 * @return Packet|null
 	 */
 	private function getPacket(Collection $c): ?Packet
 	{