--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Aug 12 11:13:15 2011 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Sun Aug 21 23:48:54 2011 +0200
@@ -139,15 +139,16 @@
 	setContentView(R.layout.contactlist);
 
 	mInflater = getLayoutInflater();
-	getIntent().getExtras().getString(BeemIntent.EXTRA_ACCOUNT);
+	mAccountName = getIntent().getExtras().getString(BeemIntent.EXTRA_ACCOUNT);
 
 	//Get Groups list 
 	final Cursor cursorGroup = getContentResolver().query(ContactsContract.Groups.CONTENT_URI,
-	    new String[] { ContactsContract.Groups._ID, ContactsContract.Groups.TITLE }, null, null, null);
+	    new String[] { ContactsContract.Groups._ID, ContactsContract.Groups.TITLE }, ContactsContract.Groups.ACCOUNT_NAME + "=?", new String[] {mAccountName}, null);
 	mAdapterBanner = new BeemBanner(this, R.layout.contactlist_group, cursorGroup,
 	    new String[] { ContactsContract.Groups.TITLE }, new int[] { R.id.contactlist_group });
 
 	//Get Contacts list
+	//TODO: Get contact list by account
 	final Cursor cursorContact = getContentResolver().query(
 	    ContactsContract.Contacts.CONTENT_URI,
 	    new String[] { ContactsContract.Contacts._ID, ContactsContract.Contacts.DISPLAY_NAME,