--- a/Modules/Config.lua	Sun Mar 10 15:59:03 2013 -0700
+++ b/Modules/Config.lua	Sun Mar 10 16:08:39 2013 -0700
@@ -174,9 +174,12 @@
 		-- Set a nice default size
 		AceConfigDialog:SetDefaultSize("Mail Opener", 950, 600);
 		
-		 -- In case the addon is loaded from another condition, always call the remove interface options
-		if AddonLoader and AddonLoader.RemoveInterfaceOptions then
-			AddonLoader:RemoveInterfaceOptions("Mail Opener");
+		 -- Remove our old config tab
+		for k, f in ipairs(INTERFACEOPTIONS_ADDONCATEGORIES) do
+			if f == "Mail Opener" or f.name == "Mail Opener" then
+				tremove(INTERFACEOPTIONS_ADDONCATEGORIES, k);
+				break;
+			end
 		end
 		
 		-- Add to the blizzard addons options thing
@@ -400,7 +403,16 @@
 						},
 						get = function() return MailOpener.db.profile.general.defaultQAStatus; end,
 						set = function(i, v) MailOpener.db.profile.general.defaultQAStatus = v; end,
-						hidden = (not MailOpener.QuickAuctionsEnabled),
+						hidden = (not MailOpener.ZeroAuctionsEnabled),
+					},
+					overrideCheckInbox = {
+						order = 12,
+						type = "toggle",
+						name = L["Don't refresh the mailbox while there is still mail waiting to be opened"],
+						desc = L["Having this option toggled on will prevent the mailbox from automatically refreshing while there is still openable mail remaining.\n\nIf you close the mailbox while there is still mail remaining, your client will always try to refresh the inbox when you reopen it. This feature will wait with refreshing until there is no openable mail remaining, possibly saving a few seconds."],
+						width = "full",
+						get =  function() return MailOpener.db.profile.general.overrideCheckInbox; end,
+						set = function(i, v) MailOpener.db.profile.general.overrideCheckInbox = v; end,
 					},
 					continueOpeningStackableItems = {
 						order = 15,
@@ -428,7 +440,7 @@
 						width = "full",
 						get =  function() return MailOpener.db.profile.general.autoDisableQAAutoMail; end,
 						set = function(i, v) MailOpener.db.profile.general.autoDisableQAAutoMail = v; end,
-						hidden = (not MailOpener.QuickAuctionsEnabled),
+						hidden = (not MailOpener.ZeroAuctionsEnabled),
 					},
 					autoReenableQAAutoMail = {
 						order = 30,
@@ -438,7 +450,7 @@
 						width = "full",
 						get = function() return MailOpener.db.profile.general.autoReenableQAAutoMail; end,
 						set = function(i, v) MailOpener.db.profile.general.autoReenableQAAutoMail = v; end,
-						hidden = (not MailOpener.QuickAuctionsEnabled),
+						hidden = (not MailOpener.ZeroAuctionsEnabled),
 						disabled = function() return (MailOpener.db.profile.general.autoSetBackQAAutoMail and not MailOpener.db.profile.general.autoReenableQAAutoMail); end,
 					},
 					autoSetBackQAAutoMail = {
@@ -449,7 +461,7 @@
 						width = "full",
 						get = function() return MailOpener.db.profile.general.autoSetBackQAAutoMail; end,
 						set = function(i, v) MailOpener.db.profile.general.autoSetBackQAAutoMail = v; end,
-						hidden = (not MailOpener.QuickAuctionsEnabled),
+						hidden = (not MailOpener.ZeroAuctionsEnabled),
 						disabled = function() return (MailOpener.db.profile.general.autoReenableQAAutoMail and not MailOpener.db.profile.general.autoSetBackQAAutoMail); end,
 					},
 				},