--- a/src/com/beem/project/beem/ui/ContactList.java	Wed Apr 18 15:46:21 2012 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Sun Apr 22 12:56:33 2012 +0200
@@ -227,15 +227,13 @@
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
 	super.onCreateContextMenu(menu, v, menuInfo);
 	MenuInflater inflater = getMenuInflater();
-	inflater.inflate(R.menu.contactlist_context, menu);
-	AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
-	// Contact c = new Contact();
-	// try {
-	// mSelectedContact = mRoster.getContact(c.getJID());
-	// } catch (RemoteException e) {
-	// e.printStackTrace();
-	// }
-	// menu.setHeaderTitle(mSelectedContact.getJID());
+	if (mAdapterContactList.getClass() == BeemMucList.class)
+	    inflater.inflate(R.menu.contactlistmuc_context, menu);
+	else
+	    inflater.inflate(R.menu.contactlist_context, menu);
+	AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
+
+	menu.setHeaderTitle(info.targetView.getTag().toString());
     }
 
     /**