1 files changed, 3 insertions, 0 deletions

diff --git a/src/ui/message.c b/src/ui/message.c
index 5cbafcc..4dbddf1 100644
--- a/src/ui/message.c
+++ b/src/ui/message.c
@@ -249,6 +249,7 @@ ui_message_new(MESSENGER_Application *app,
   handle->type = type;
 
   handle->timestamp = GNUNET_TIME_absolute_get_zero_();
+  handle->msg = NULL;
 
   const char *ui_builder_file;
 
@@ -403,6 +404,8 @@ ui_message_update(UI_MESSAGE_Handle *handle,
 {
   struct GNUNET_CHAT_File *file = NULL;
 
+  handle->msg = msg;
+
   if (msg)
   {
     file = GNUNET_CHAT_message_get_file(msg);