2 files changed, 17 insertions, 5 deletions

diff --git a/src/chat/messenger.c b/src/chat/messenger.c
index 27ba1bd..c0f16be 100644
--- a/src/chat/messenger.c
+++ b/src/chat/messenger.c
@@ -95,6 +95,16 @@ _chat_messenger_message(void *cls,
       application_call_event(app, event_update_profile);
       break;
     }
+    case GNUNET_CHAT_KIND_UPDATE:
+    {
+      application_call_message_event(
+          app,
+          event_update_chats,
+          context,
+          message
+      );
+      break;
+    }
     case GNUNET_CHAT_KIND_JOIN:
     {
       application_call_message_event(
@@ -160,7 +170,7 @@ chat_messenger_run(void *cls,
 
   app->chat.messenger.handle = GNUNET_CHAT_start(
       cfg,
-      "messenger-gtk",
+      ".messenger",
       app->chat.identity,
       &_chat_messenger_message,
       app
diff --git a/src/event.c b/src/event.c
index b10045f..c3e4ac6 100644
--- a/src/event.c
+++ b/src/event.c
@@ -149,12 +149,14 @@ event_update_chats(MESSENGER_Application *app,
                    struct GNUNET_CHAT_Context *context,
                    const struct GNUNET_CHAT_Message *msg)
 {
-  if (GNUNET_CHAT_context_get_user_pointer(context))
-    return;
+  UI_CHAT_ENTRY_Handle *handle = GNUNET_CHAT_context_get_user_pointer(context);
 
-  contact_create_info(GNUNET_CHAT_message_get_sender(msg));
+  if (!handle)
+    _add_new_chat_entry(app, context);
+  else
+    ui_chat_entry_update(handle, app, context);
 
-  _add_new_chat_entry(app, context);
+  contact_create_info(GNUNET_CHAT_message_get_sender(msg));
 }
 
 static void