Android Application (XMPP intergration)

I have an android application developed, and I have integrated XMPP for instant messaging between the users. I have a bug, and I am not sure how to go about solving it. BUG: User A is chatting with User B. User A sends User B a message, and User B receive this message. User B goes underground, so loses connection, thus the chat server disconnects User B from the chat service. Meanwhile, User A is sending User B messages, but User B will never get them. I have added a ping which is sent every 30 seconds from the device to the chat server, to see if the user is still online, if the user isn't online, the server holds the messages until the user's device is online again, and pushes it to the device. The only problem with this is, when User B comes back online, he never receives these messages. I have noticed that messages sent under 30 seconds of going offline are never delivered (ping timeout), where as messages delivered 30 seconds after user is offline are delivered (they are pushed to the server to hold until user is online). The messages send under 30 seconds are lost in void. I’m not thinking about changing ping frequency less than 30 secs. It will be too hard for server, and it will eat client’s phone battery. I have used Stream Management, the application connects back almost instantly (less than 10 seconds), but majority of the messages not delivered when I turn this on. When I disable Stream Management, the re-connection to the server is slower (~ 45 seconds on Edge network), but majority of the messages are delivered. Need someone who can solve this so that the re-connection time is faster, and messages are properly delivered. YOU MUST HAVE EXPERIENCE WITH XMPP, JAVA, ANDROID DEVELOPMENT, AND I WANT TO SEE PREVIOUS WORK USING THESE 3