1 files changed, 5 insertions, 0 deletions

diff --git a/src/gnunet_chat_message.c b/src/gnunet_chat_message.c
index e044415..d3c1385 100644
--- a/src/gnunet_chat_message.c
+++ b/src/gnunet_chat_message.c
@@ -37,6 +37,7 @@ message_create_from_msg (struct GNUNET_CHAT_Context *context,
   struct GNUNET_CHAT_Message *message = GNUNET_new(struct GNUNET_CHAT_Message);
 
   message->context = context;
+  message->task = NULL;
 
   GNUNET_memcpy(&(message->hash), hash, sizeof(message->hash));
   message->flags = flags;
@@ -55,6 +56,7 @@ message_create_internally (struct GNUNET_CHAT_Context *context,
   struct GNUNET_CHAT_Message *message = GNUNET_new(struct GNUNET_CHAT_Message);
 
   message->context = context;
+  message->task = NULL;
 
   memset(&(message->hash), 0, sizeof(message->hash));
   message->flags = GNUNET_MESSENGER_FLAG_PRIVATE;
@@ -70,5 +72,8 @@ message_destroy (struct GNUNET_CHAT_Message* message)
 {
   GNUNET_assert(message);
 
+  if (message->task)
+    GNUNET_SCHEDULER_cancel(message->task);
+
   GNUNET_free(message);
 }