diff --git a/Guda.toc b/Guda.toc
index 7a071d5..dab2d1e 100644
--- a/Guda.toc
+++ b/Guda.toc
@@ -2,7 +2,7 @@
 ## Title: Guda
 ## Notes: All-in-one bag and bank addon for Turtle WoW
 ## Author: Vati
-## Version: 1.4.8
+## Version: 1.5.0
 ## SavedVariables: Guda_DB
 ## SavedVariablesPerCharacter: Guda_CharDB
 
diff --git a/UI/ItemButton.lua b/UI/ItemButton.lua
index ec4bae8..96e1b0e 100644
--- a/UI/ItemButton.lua
+++ b/UI/ItemButton.lua
@@ -381,6 +381,15 @@ function Guda_ItemButton_OnLoad(self)
         
         -- Default behavior
         if ContainerFrameItemButton_OnClick then
+            -- Mailbox clicks should be ignored except for Ctrl+Click (preview)
+            -- OR if it's a live mail item for the current player and Shift+Click (loot)
+            if this.isMail then
+                if IsControlKeyDown() then
+                    ContainerFrameItemButton_OnClick(arg1)
+                end
+                return
+            end
+
             ContainerFrameItemButton_OnClick(arg1)
         end
     end)
@@ -1000,6 +1009,9 @@ function Guda_ItemButton_OnEnter(self)
         elseif self.itemData and self.itemData.name then
             -- Money or generic mail
             GameTooltip:AddLine(self.itemData.name, 1, 1, 1)
+        elseif self.mailData and self.mailData.money and self.mailData.money > 0 then
+            -- Fallback for money only mail
+            GameTooltip:AddLine("Money", 1, 1, 1)
         end
 
         -- Add mailbox metadata if available