--- a/src/com/beem/project/beem/ui/Chat.java	Sat Mar 13 18:06:22 2010 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Sat Mar 13 18:11:17 2010 +0100
@@ -521,8 +521,9 @@
 			    mListMessages.add(new MessageText(fromBareJid, mContact.getName(), msg.getBody(), true));
 			    mMessagesListAdapter.notifyDataSetChanged();
 			} else if (msg.getBody() != null) {
-			    MessageText lastMessage = mListMessages.size() != 0 ? mListMessages.get(mListMessages
-				.size() - 1) : null;
+			    MessageText lastMessage = null;
+			    if (mListMessages.size() != 0)
+				lastMessage = mListMessages.get(mListMessages.size() - 1);
 
 			    if (lastMessage != null && lastMessage.getBareJid().equals(fromBareJid)) {
 				lastMessage.setMessage(lastMessage.getMessage().concat("\n" + msg.getBody()));
@@ -810,7 +811,9 @@
 	    }
 
 	    final String self = getString(R.string.chat_self);
-	    MessageText lastMessage = mListMessages.size() != 0 ? mListMessages.get(mListMessages.size() - 1) : null;
+	    MessageText lastMessage = null;
+	    if (mListMessages.size() != 0)
+		lastMessage = mListMessages.get(mListMessages.size() - 1);
 
 	    if (lastMessage != null && lastMessage.getName().equals(self)) {
 		lastMessage.setMessage(lastMessage.getMessage().concat("\n" + inputContent));