1 files changed, 15 insertions, 0 deletions

diff --git a/src/ui/chat.c b/src/ui/chat.c
index a8547ba..42ccb9e 100644
--- a/src/ui/chat.c
+++ b/src/ui/chat.c
@@ -26,6 +26,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include "message.h"
 #include "messenger.h"
 #include "picker.h"
 #include "profile_entry.h"
@@ -252,6 +253,8 @@ ui_chat_new(MESSENGER_Application *app)
   UI_CHAT_Handle *handle = g_malloc(sizeof(UI_CHAT_Handle));
   UI_MESSENGER_Handle *messenger = &(app->ui.messenger);
 
+  handle->messages = NULL;
+
   handle->builder = gtk_builder_new_from_file(
       "resources/ui/chat.ui"
   );
@@ -552,5 +555,17 @@ ui_chat_delete(UI_CHAT_Handle *handle)
 
   g_object_unref(handle->builder);
 
+  GList *list = handle->messages;
+
+  while (list) {
+    if (list->data)
+      ui_message_delete((UI_MESSAGE_Handle*) list->data);
+
+    list = list->next;
+  }
+
+  if (handle->messages)
+    g_list_free(handle->messages);
+
   g_free(handle);
 }