--- a/src/com/beem/project/beem/service/RosterAdapter.java	Tue Jun 23 14:01:00 2009 +0200
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Tue Jun 23 12:30:18 2009 +0200
@@ -207,7 +207,6 @@
 	 * Constructor.
 	 */
 	public RosterListenerAdapter() {
-	    // TODO Auto-generated constructor stub
 	}
 
 	/**

--- a/src/com/beem/project/beem/ui/ContactList.java	Tue Jun 23 14:01:00 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Tue Jun 23 12:30:18 2009 +0200
@@ -52,7 +52,7 @@
     private List<String> groupName;
     private List<Contact> mListContact;
     private Handler mHandler;
-    public IXmppFacade xmppFacade = null;
+    private IXmppFacade xmppFacade = null;
     private final ServiceConnection mServConn = new BeemServiceConnection();
     private int REQUEST_CODE = 1;
 
@@ -118,6 +118,8 @@
     protected void onStop() {
 	super.onStop();
 	unbindService(mServConn);
+	groupName.clear();
+	groupMap.clear();
     }
 
     class ComparatorContactListByName<T> implements Comparator<T> {
@@ -146,7 +148,6 @@
 	    for (String group : contact.getGroups()) {
 		if (!groupMap.containsKey(group)) {
 		    groupMap.put(group, new ArrayList<Contact>());
-		    Collections.sort(groupMap.get(group), new ComparatorContactListByStatusAndName<Contact>());
 		    groupName.add(group);
 		}
 		try {