--- /usr/local/src/jabberd-2.0s5/sm/mod_offline.c	Sat Nov 13 18:08:33 2004
+++ sm/mod_offline.c	Mon Dec  6 15:51:37 2004
@@ -132,9 +132,12 @@
                 os_free(os);
 
                 /* send offline events if they asked for it */
+                /* if there's an id element, then this is a notification, not a request, so ignore it */
+
                 if((ns = nad_find_scoped_namespace(pkt->nad, uri_EVENT, NULL)) >= 0 &&
                    (elem = nad_find_elem(pkt->nad, 1, ns, "x", 1)) >= 0 &&
-                   nad_find_elem(pkt->nad, elem, ns, "offline", 1) >= 0) {
+                   nad_find_elem(pkt->nad, elem, ns, "offline", 1) >= 0 && 
+                   nad_find_elem(pkt->nad, elem, ns, "id", 1) < 0) {
 
                     event = pkt_create(user->sm, "message", NULL, jid_full(pkt->from), jid_full(pkt->to));