diff --git a/Mail.lua b/Mail.lua
index 1cac1d0..e6e7dda 100644
--- a/Mail.lua
+++ b/Mail.lua
@@ -207,6 +207,7 @@ do
 			elseif Inbox_Skip or COD > 0 then
 				Inbox_Skip = false
 				i = i + 1
+				update = true
 			else
 				Inbox_Open(i)
 			end
@@ -232,37 +233,6 @@ do
 	end
 end
 
-do
-	local i
-	local function update()
-		local _, _, _, _, _, COD = GetInboxHeaderInfo(i)
-		if i > GetInboxNumItems() then
-			Inbox_Abort()
-		elseif Inbox_Skip or COD > 0 then
-			Inbox_Skip = false
-			i = i + 1
-		else
-			Inbox_Open(i)
-		end
-	end
-	function MAIL_INBOX_UPDATE()
-		if Inbox_opening then
-			update()
-		end
-	end
-	function Inbox_OpenAll()
-		Inbox_opening = true
-		Inbox_UpdateLock()
-		i = 1
-		Inbox_skip = false
-		update()
-	end
-	function Inbox_Abort()
-		Inbox_opening = false
-		Inbox_UpdateLock()
-	end
-end
-
 do
 	local TakeInboxMoney, TakeInboxItem, DeleteInboxItem = TakeInboxMoney, TakeInboxItem, DeleteInboxItem -- hack to prevent beancounter from deleting mail
 	function Inbox_Open(i)