--- a/src/com/beem/project/beem/BeemApplication.java	Tue Apr 21 22:49:38 2009 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Tue Apr 21 23:41:09 2009 +0200
@@ -64,6 +64,13 @@
 		    mProgressDialog.show();
 		    mConnection.addConnectionListener(mConnectionListener);
 		    mApplicationContext.startService(BeemApplication.SERVICE_INTENT);
+		}else {
+		    synchronized (mQueue) {
+			for (Message msg : mQueue) {
+			    msg.sendToTarget();
+			}
+			mQueue.clear();
+		    }
 		}
 	    } catch (RemoteException e) {
 		// TODO Auto-generated catch block
@@ -123,12 +130,10 @@
     }
 
     public synchronized void unbindBeemService() {
-	
 	if (mIsConnected) {
 	    mApplicationContext.unbindService(mServConn);
 	    mIsConnected = false;
 	}
-	
      }
 
     /**

--- a/src/com/beem/project/beem/BeemService.java	Tue Apr 21 22:49:38 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Tue Apr 21 23:41:09 2009 +0200
@@ -136,6 +136,7 @@
 	} else {
 	    mConnectionConfiguration = new ConnectionConfiguration(mHost);
 	}
+	mConnectionConfiguration.setDebuggerEnabled(false);
 	mConnectionConfiguration.setSendPresence(true);
     }
 

--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Tue Apr 21 22:49:38 2009 +0200
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Tue Apr 21 23:41:09 2009 +0200
@@ -77,7 +77,7 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-//        mBeemApplication.unbindBeemService();
+        mBeemApplication.unbindBeemService();
     }
 
     private OnClickListener mOnClickOk = new OnClickListener() {

--- a/src/com/beem/project/beem/ui/ContactList.java	Tue Apr 21 22:49:38 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Tue Apr 21 23:41:09 2009 +0200
@@ -79,7 +79,7 @@
     protected void onDestroy() {
         // TODO Auto-generated method stub
         super.onDestroy();
- //       mBeemApplication.unbindBeemService();
+        mBeemApplication.unbindBeemService();
     }
 
     @Override

--- a/src/com/beem/project/beem/ui/SendIM.java	Tue Apr 21 22:49:38 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Tue Apr 21 23:41:09 2009 +0200
@@ -136,6 +136,13 @@
     }
 
     @Override
+    protected void onStop() {
+        // TODO Auto-generated method stub
+        super.onStop();
+        mBeemApplication.unbindBeemService();
+    }
+    
+    @Override
     protected void onDestroy() {
 	super.onDestroy();
 	if (mChatManager != null) {
@@ -147,7 +154,6 @@
 		e.printStackTrace();
 	    }
 	}
-//	mBeemApplication.unbindBeemService();
     }
 
     /**