From 013f6be1625f6b7ca5f38e55875f5ba886c17f7f Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Sat, 14 Mar 2026 07:14:15 -0700
Subject: [PATCH] fix(mail): correct WotLK mail list attachment parsing

---
 src/game/world_packets.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/game/world_packets.cpp b/src/game/world_packets.cpp
index 398cfb2a..659003d7 100644
--- a/src/game/world_packets.cpp
+++ b/src/game/world_packets.cpp
@@ -5141,10 +5141,9 @@ bool PacketParsers::parseMailList(network::Packet& packet, std::vector<MailMessa
         msg.expirationTime = packet.readFloat();
         msg.mailTemplateId = packet.readUInt32();
         msg.subject = packet.readString();
-
-        if (msg.mailTemplateId == 0) {
-            msg.body = packet.readString();
-        }
+        // WotLK 3.3.5a always includes body text in SMSG_MAIL_LIST_RESULT.
+        // mailTemplateId != 0 still carries a (possibly empty) body string.
+        msg.body = packet.readString();
 
         uint8_t attachCount = packet.readUInt8();
         msg.attachments.reserve(attachCount);
@@ -5164,6 +5163,8 @@ bool PacketParsers::parseMailList(network::Packet& packet, std::vector<MailMessa
             att.stackCount = packet.readUInt32();
             att.chargesOrDurability = packet.readUInt32();
             att.maxDurability = packet.readUInt32();
+            packet.readUInt32(); // durability/current durability
+            packet.readUInt8();  // unknown WotLK trailing byte per attachment
             msg.attachments.push_back(att);
         }