--- a/src/com/beem/project/beem/service/RosterAdapter.java	Wed Dec 23 02:04:42 2009 +0100
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Sat Dec 26 17:38:52 2009 +0100
@@ -147,7 +147,7 @@
 	try {
 	    mAdaptee.createGroup(groupname);
 	} catch (IllegalArgumentException e) {
-	    Log.e(TAG, "Error while creating group", e);
+	    Log.v(TAG, "Error while creating group", e);
 	}
     }
 

--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Wed Dec 23 02:04:42 2009 +0100
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Sat Dec 26 17:38:52 2009 +0100
@@ -69,6 +69,7 @@
 import com.beem.project.beem.service.aidl.IXmppFacade;
 import com.beem.project.beem.utils.BeemBroadcastReceiver;
 import com.beem.project.beem.utils.Status;
+import com.beem.project.beem.utils.BeemConnectivity;
 
 /**
  * This Activity is used to change the status.
@@ -147,6 +148,9 @@
     @Override
     protected void onResume() {
 	super.onResume();
+	if (!BeemConnectivity.isConnected(getApplicationContext())) {
+	    startActivity(new Intent(this, Login.class));
+	}
 	bindService(new Intent(this, BeemService.class), mServConn, BIND_AUTO_CREATE);
     }
 

--- a/src/com/beem/project/beem/ui/ContactList.java	Wed Dec 23 02:04:42 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Sat Dec 26 17:38:52 2009 +0100
@@ -266,7 +266,6 @@
     @Override
     protected void onCreate(Bundle saveBundle) {
 	super.onCreate(saveBundle);
-	Log.v(TAG, "onCreate");
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
 	setContentView(R.layout.contactlist);
 
@@ -282,9 +281,12 @@
     @Override
     protected void onResume() {
 	super.onResume();
-	Log.d(TAG, "onResume");
 	if (mXmppFacade == null)
 	    bindService(SERVICE_INTENT, mServConn, BIND_AUTO_CREATE);
+	else {
+	    buildContactList();
+	    buildBanner();
+	}
     }
 
     /**
@@ -299,11 +301,10 @@
 		mRoster = null;
 	    }
 	} catch (RemoteException e) {
-	    Log.d("ContactList", "Remode exception", e);
+	    Log.d("ContactList", "Remote exception", e);
 	}
 	unbindService(mServConn);
 	mXmppFacade = null;
-	Log.e(TAG, "onPause activity");
     }
 
     /*
@@ -515,19 +516,19 @@
 	    for (String cToDelete : addresses) {
 		for (Contact c : mListContact) {
 		    if (c.getJID().equals(cToDelete)) {
-			mListContact.remove(c);
 			for (String group : mListGroup) {
 			    mContactOnGroup.get(group).remove(c);
 			    if (mContactOnGroup.get(group).size() == 0) {
-				mContactOnGroup.remove(group);
-				mListGroup.remove(group);
-				mListContact = mContactOnGroup.get(getString(R.string.contact_list_all_contact));
+				//mContactOnGroup.remove(group);
+				//mListGroup.remove(group);
 			    }
 			}
+			mListContact.remove(c);
 			break;
 		    }
 		}
 	    }
+	    mListContact = mContactOnGroup.get(getString(R.string.contact_list_all_contact));
 	    mHandler.post(new RunnableChange());
 	}