--- a/src/com/beem/project/beem/ui/Chat.java	Thu Jan 21 00:22:43 2010 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Thu Jan 21 00:32:27 2010 +0100
@@ -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();