--- a/core/modulemanager.lua	Thu Jun 04 21:12:36 2009 +0500
+++ b/core/modulemanager.lua	Thu Jun 04 21:25:05 2009 +0500
@@ -70,8 +70,13 @@
 				disabled_set[module] = true;
 			end
 		end
+		for _, module in ipairs({"presence", "message", "iq"}) do
+			if not disabled_set[module] then
+				load(host, module);
+			end
+		end
 		for _, module in ipairs(modules_enabled) do
-			if not disabled_set[module] then
+			if not disabled_set[module] and not is_loaded(host, module) then
 				load(host, module);
 			end
 		end