--- a/src/com/beem/project/beem/ui/ContactList.java	Thu Aug 16 11:52:52 2012 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Tue Aug 21 13:22:19 2012 +0200
@@ -58,7 +58,6 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Filterable;
 import android.widget.Gallery;
 import android.widget.ImageView;
 import android.widget.ListView;
@@ -71,6 +70,7 @@
 import com.beem.project.beem.providers.MUCs;
 import com.beem.project.beem.service.BeemAvatarCache;
 import com.beem.project.beem.ui.wizard.AccountConfigure;
+import com.beem.project.beem.utils.Status;
 
 /**
  * The contact list activity displays the roster of the user.
@@ -397,7 +397,8 @@
 		Cursor cursorContact = context.getContentResolver().query(
 		    ContactLookupUri,
 		    new String[] { ContactsContract.Contacts._ID, ContactsContract.Contacts.DISPLAY_NAME,
-			ContactsContract.Contacts.CONTACT_STATUS }, null, null, null);
+			ContactsContract.Contacts.CONTACT_STATUS, ContactsContract.Contacts.CONTACT_PRESENCE }, null,
+		    null, null);
 
 		if (cursorContact.moveToFirst()) {
 		    String name = cursorContact.getString(cursorContact
@@ -412,12 +413,10 @@
 		    String jid = cursor.getString(cursor.getColumnIndex(ContactsContract.RawContacts.SOURCE_ID));
 		    view.setTag(jid);
 
+		    //TODO: Set back avatar darisk did in the trunk
 		    ImageView img = (ImageView) view.findViewById(R.id.avatar);
-		    int contactStatus = 1;
-		    //TODO: set the jid instead of null then debug
-		    Drawable avatar = getAvatarStatusDrawable(null);
-		    img.setImageDrawable(mContext.getResources().getDrawable(R.drawable.beem_launcher_icon_silver));
-		    img.setImageLevel(contactStatus);
+		    int contactStatus = cursorContact.getInt(cursorContact.getColumnIndex(ContactsContract.Contacts.CONTACT_PRESENCE));		    
+		    img.setImageResource(Status.getIconBarFromStatus(contactStatus));		  
 
 		}
 		cursorContact.close();