--- a/Core.lua	Mon Dec 19 13:30:59 2011 +0100
+++ b/Core.lua	Mon Dec 19 13:54:48 2011 +0100
@@ -440,15 +440,10 @@
 		self.cbOpenAll:SetChecked(false);
 	end
 	
-	hasOpenedMailAlready = nil;
-	mailboxEmptySoundPlayed = nil;
-	mailboxEmptySoundPlayedThisVisit = nil;
-	
 	if IsShiftKeyDown() then
 		self:Print(L["|cffff0000Disabling|r automatic opening of mail, shift key was down when opening the mailbox."]);
 		
 		AutoOpenMail = false;
-		hasOpenedMailAlready = true;
 		self.cbOpenAll:SetChecked(false);
 	end
 	
@@ -476,6 +471,10 @@
 		end
 	end
 	
+	hasOpenedMailAlready = nil;
+	mailboxEmptySoundPlayed = nil;
+	mailboxEmptySoundPlayedThisVisit = nil;
+	
 	self:Recheck();
 	
 	if self.db.profile.general.continueOpening then