--- a/plugins/mod_message.lua	Mon Dec 27 06:10:34 2010 +0500
+++ b/plugins/mod_message.lua	Thu Dec 09 12:23:37 2010 -0600
@@ -14,7 +14,6 @@
 local jid_bare = require "util.jid".bare;
 local jid_split = require "util.jid".split;
 local user_exists = require "core.usermanager".user_exists;
-local offlinemanager = require "core.offlinemanager";
 local t_insert = table.insert;
 
 local function process_to_bare(bare, origin, stanza)
@@ -47,7 +46,11 @@
 		local node, host = jid_split(bare);
 		if user_exists(node, host) then
 			-- TODO apply the default privacy list
-			offlinemanager.store(node, host, stanza);
+
+                        module:fire_event('message/offline/store', {
+                            origin = origin,
+                            stanza = stanza,
+                        });
 		else
 			origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 		end