--- a/src/com/beem/project/beem/ui/Chat.java	Thu Jan 21 01:46:57 2010 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Thu Jan 21 02:52:06 2010 +0100
@@ -299,7 +299,7 @@
 	    public void onClick(DialogInterface dialog, int item) {
 		Intent chatIntent = new Intent(getApplicationContext(), com.beem.project.beem.ui.Chat.class);
 		chatIntent.setData((openedChats.get(item)).toUri());
-		Chat.this.onNewIntent(chatIntent);
+		startActivity(chatIntent);
 	    }
 	});
 	AlertDialog chatSwitcherDialog = builder.create();
@@ -330,9 +330,9 @@
 	mChat.setOpen(true);
 	mChatManager.deleteChatNotification(mChat);
 
-	// TODO thecontact isnotnecesarrely ubn the roseter.
-	// this can leadtoa null exception
 	mContact = mRoster.getContact(contact.getJID());
+	if (mContact == null)
+	    mContact = contact;
 	updateContactInformations();
 	updateContactStatusIcon();