# HG changeset patch
# User Zerotorescue
# Date 1284042914 -7200
# Node ID 5b6f2dccb9ce650e1f40f57c9f9359dcaa071b66
# Parent  fb952805d8b7cc47d4b4b1970004f3833b511f7b# Parent  a344263c0238cd6fa5f5287e41ab98d734b8c697
Merge

diff -r a344263c0238 -r 5b6f2dccb9ce Core.lua
--- a/Core.lua	Thu Sep 09 12:45:44 2010 +0000
+++ b/Core.lua	Thu Sep 09 16:35:14 2010 +0200
@@ -352,9 +352,9 @@
 	local tempLastAmount = lastAmount;
 	lastAmount = currentMailWithAttachments;
 	
-	if currentMailWithAttachments ~= tempLastAmount then
-		self:Debug("MAIL_INBOX_UPDATE - lastAmount:" .. tempLastAmount .. " - current:" .. currentMailWithAttachments);
-	end
+	--if currentMailWithAttachments ~= tempLastAmount then
+	--	self:Debug("MAIL_INBOX_UPDATE - lastAmount:" .. tempLastAmount .. " - current:" .. currentMailWithAttachments);
+	--end
 	
 	if currentMailWithAttachments > tempLastAmount then
 		-- New messages arrived in our mailbox, so this was a refresh, so set a timer
diff -r a344263c0238 -r 5b6f2dccb9ce Modules/FailSafe.lua
--- a/Modules/FailSafe.lua	Thu Sep 09 12:45:44 2010 +0000
+++ b/Modules/FailSafe.lua	Thu Sep 09 16:35:14 2010 +0200
@@ -56,6 +56,7 @@
 function FailSafe:MO_OPENING_MAIL()
 	-- Single mail being opened
 	
+	self:CancelTimer(self.tmrTimeout, true); -- insurance
 	self.tmrTimeout = self:ScheduleTimer("Continue", self.db.profile.timeout);
 end
 
diff -r a344263c0238 -r 5b6f2dccb9ce Modules/OpenAll.lua
--- a/Modules/OpenAll.lua	Thu Sep 09 12:45:44 2010 +0000
+++ b/Modules/OpenAll.lua	Thu Sep 09 16:35:14 2010 +0200
@@ -438,7 +438,7 @@
 				else
 					continue = false;
 			
-					self:Debug("MO_OPENING_MAIL");
+					self:Debug("MO_OPENING_MAIL (#" .. index .. ")");
 					
 					-- Notifiy other modules of opening
 					self:SendMessage("MO_OPENING_MAIL");