--- a/src/com/beem/project/beem/ui/Chat.java	Sat Feb 13 18:36:10 2010 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Sat Feb 13 21:11:50 2010 +0100
@@ -369,9 +369,11 @@
 	    } else if (m.getType() == Message.MSG_TYPE_CHAT) {
 		if (fromBareJid == null) { //nofrom or from == yours
 		    name = localName;
+		    fromBareJid = "";
 		}
+
 		if (m.getBody() != null) {
-		    if (lastMessage == null || !lastMessage.getBareJid().equals(fromBareJid)) {
+		    if (lastMessage == null || ! fromBareJid.equals(lastMessage.getBareJid())) {
 			lastMessage = new MessageText(fromBareJid, name, m.getBody());
 			result.add(lastMessage);
 		    } else {
@@ -498,8 +500,10 @@
 
 		    @Override
 		    public void run() {
-			//TODO gerer les messages de types error
-			if (msg.getBody() != null && msg.getType() != Message.MSG_TYPE_ERROR) {
+			if (msg.getType() == Message.MSG_TYPE_ERROR) {
+			    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;
 
@@ -509,9 +513,6 @@
 			    } else if (msg.getBody() != null)
 				mListMessages.add(new MessageText(fromBareJid, mContact.getName(), msg.getBody()));
 			    mMessagesListAdapter.notifyDataSetChanged();
-			} else if (msg.getType() == Message.MSG_TYPE_ERROR) {
-			    mListMessages.add(new MessageText(fromBareJid, mContact.getName(), msg.getBody(), true));
-			    mMessagesListAdapter.notifyDataSetChanged();
 			}
 		    }
 		});