--- a/src/com/beem/project/beem/service/BeemChatManager.java	Tue Apr 21 19:08:32 2009 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Tue Apr 21 20:10:21 2009 +0200
@@ -188,7 +188,6 @@
 		for (int i = 0; i < n; i++) {
 		    IMessageListener listener = mRemoteMessageListeners.getBroadcastItem(i);
 		    listener.processMessage(newchat, new com.beem.project.beem.service.Message(message));
-
 		}
 		mRemoteMessageListeners.finishBroadcast();
 	    } catch (RemoteException e) {
@@ -201,6 +200,7 @@
 	@Override
 	public void stateChanged(Chat chat, ChatState state) {
 	    try {
+		Log.d(TAG, "state changed");
 		mChats.get(chat.getParticipant()).setState(state.name());
 	    } catch (RemoteException e) {
 		e.printStackTrace();

--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Tue Apr 21 19:08:32 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Tue Apr 21 20:10:21 2009 +0200
@@ -10,6 +10,7 @@
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.XMPPError;
+import org.jivesoftware.smackx.ChatStateManager;
 import org.jivesoftware.smackx.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.jingle.JingleManager;
 import android.os.RemoteCallbackList;
@@ -82,9 +83,11 @@
 	    mAdaptee.connect();
 	    mAdaptee.addConnectionListener(mConListener);
 	    mAdaptee.login(mLogin, mPassword, "BEEM");
+	    
 	    mChatManager = new BeemChatManager(mAdaptee.getChatManager(), mService);
 	    // TODO find why this cause a null pointer exception
-	    // this.initFeatures(); // pour declarer les features xmpp qu'on supporte
+	    this.initFeatures(); // pour declarer les features xmpp qu'on supporte
+	    ChatStateManager.getInstance(mAdaptee);
 	    mLastException = null;
 	    triggerAsynchronousConnectEvent();
 	    return true;
@@ -177,6 +180,8 @@
     private void initFeatures() {
 	JingleManager.setJingleServiceEnabled();
 	ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(mAdaptee);
+	if (sdm == null)
+	    sdm = new ServiceDiscoveryManager(mAdaptee);
 	sdm.addFeature("http://jabber.org/protocol/disco#info");
 	// sdm.addFeature("http://jabber.org/protocol/nick");
 

--- a/src/com/beem/project/beem/service/aidl/IMessageListener.aidl	Tue Apr 21 19:08:32 2009 +0200
+++ b/src/com/beem/project/beem/service/aidl/IMessageListener.aidl	Tue Apr 21 20:10:21 2009 +0200
@@ -5,5 +5,5 @@
 
 interface IMessageListener {
 
-	void processMessage(in IChat chat, in Message msg); 
+	void processMessage(in IChat chat, in Message msg);
 }