--- a/Core.lua	Wed Oct 20 22:32:51 2010 +0200
+++ b/Core.lua	Wed Oct 20 22:37:35 2010 +0200
@@ -298,6 +298,15 @@
 		end
 	end
 	
+	if select(6, GetAddOnInfo("AuctionProfitMaster")) == nil then
+		self.ZeroAuctionsEnabled = true; -- Set this as an object variable so we can use it in our modules
+		
+		-- Ensure this addon is loaded if AddonLoader is installed
+		if AddonLoader and AddonLoader.LoadAddOn and not IsAddOnLoaded("AuctionProfitMaster") then
+			AddonLoader:LoadAddOn("AuctionProfitMaster");
+		end
+	end
+	
 	
 	
 	
@@ -431,13 +440,16 @@
 	InboxTooMuchMail.Show = function() end
 	
 	if self.ZeroAuctionsEnabled then
-		local QAMail = LibStub("AceAddon-3.0"):GetAddon("ZeroAuctions", true):GetModule("Mail", true)
-		
-		if QAMail then
-			-- Hide the open all button
-			QAMail.massOpening:Hide();
-			-- Hide the x mail remaining text
-			QAMail.totalMail:Hide();
+		local AHAddon = LibStub("AceAddon-3.0"):GetAddon("ZeroAuctions", true) or LibStub("AceAddon-3.0"):GetAddon("AuctionProfitMaster", true);
+		if AHAddon then
+			local QAMail = AHAddon:GetModule("Mail", true);
+			
+			if QAMail then
+				-- Hide the open all button
+				QAMail.massOpening:Hide();
+				-- Hide the x mail remaining text
+				QAMail.totalMail:Hide();
+			end
 		end
 	end