diff --git a/UI/ItemButton.lua b/UI/ItemButton.lua
index 758fa5d..99a1562 100644
--- a/UI/ItemButton.lua
+++ b/UI/ItemButton.lua
@@ -774,7 +774,7 @@ function Guda_ItemButton_SetItem(self, bagID, slotID, itemData, isBank, otherCha
                 -- Special border for keyring items (cyan/blue)
                 self.qualityBorder:SetBackdropBorderColor(0.2, 0.8, 1.0, 1)
                 self.qualityBorder:Show()
-            elseif itemQuality and itemLink then
+            elseif itemQuality then
                 -- Check settings to determine if we should show borders (nil-safe)
                 local showEquipmentBorder, showOtherBorder
                 if addon and addon.Modules and addon.Modules.DB and addon.Modules.DB.GetSetting then
@@ -795,10 +795,12 @@ function Guda_ItemButton_SetItem(self, bagID, slotID, itemData, isBank, otherCha
 
                 -- Check if item is equipment (nil-safe)
                 local isEquipment = false
-                if addon and addon.Modules and addon.Modules.Utils and addon.Modules.Utils.IsEquipment then
-                    isEquipment = addon.Modules.Utils:IsEquipment(itemLink)
-                elseif Guda and Guda.Modules and Guda.Modules.Utils and Guda.Modules.Utils.IsEquipment then
-                    isEquipment = Guda.Modules.Utils:IsEquipment(itemLink)
+                if itemLink then
+                    if addon and addon.Modules and addon.Modules.Utils and addon.Modules.Utils.IsEquipment then
+                        isEquipment = addon.Modules.Utils:IsEquipment(itemLink)
+                    elseif Guda and Guda.Modules and Guda.Modules.Utils and Guda.Modules.Utils.IsEquipment then
+                        isEquipment = Guda.Modules.Utils:IsEquipment(itemLink)
+                    end
                 end
 
                 -- Determine if we should show the border based on item type and settings
diff --git a/UI/MailboxFrame.lua b/UI/MailboxFrame.lua
index 8c604ae..4f8eb29 100644
--- a/UI/MailboxFrame.lua
+++ b/UI/MailboxFrame.lua
@@ -220,8 +220,15 @@ function MailboxFrame:DisplayItems(items, charFullName, totalMails)
         end
         
         -- Fill row data
-        getglobal(row:GetName() .. "_Sender"):SetText(mail.sender or "Unknown")
-        getglobal(row:GetName() .. "_Subject"):SetText(mail.subject or "No Subject")
+        local sender = mail.sender or "Unknown"
+        getglobal(row:GetName() .. "_Sender"):SetText(sender)
+
+        local subject = mail.subject or "No Subject"
+        if mail.item and mail.item.quality then
+            local r, g, b = addon.Modules.Utils:GetQualityColor(mail.item.quality)
+            subject = addon.Modules.Utils:ColorText(subject, r, g, b)
+        end
+        getglobal(row:GetName() .. "_Subject"):SetText(subject)
         
         local expireText = ""
         if mail.daysLeft then