diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c
index b309e35929..1bd3ee0803 100644
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -88,9 +88,23 @@ GType      gtk_message_row_get_type  (void) G_GNUC_CONST;
 
 G_DEFINE_TYPE (GtkMessage, gtk_message, G_TYPE_OBJECT);
 
+static void
+gtk_message_finalize (GObject *obj)
+{
+  GtkMessage *msg = GTK_MESSAGE (obj);
+
+  g_free (msg->sender_name);
+  g_free (msg->sender_nick);
+  g_free (msg->message);
+  g_free (msg->resent_by);
+
+  G_OBJECT_CLASS (gtk_message_parent_class)->finalize (obj);
+}
 static void
 gtk_message_class_init (GtkMessageClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  object_class->finalize = gtk_message_finalize;
 }
 
 static void
@@ -247,10 +261,21 @@ gtk_message_row_state_flags_changed (GtkWidget    *widget,
   GTK_WIDGET_CLASS (gtk_message_row_parent_class)->state_flags_changed (widget, previous_state_flags);
 }
 
+static void
+gtk_message_row_finalize (GObject *obj)
+{
+  GtkMessageRowPrivate *priv = GTK_MESSAGE_ROW (obj)->priv;
+  g_object_unref (priv->message);
+  G_OBJECT_CLASS (gtk_message_row_parent_class)->finalize(obj);
+}
+
 static void
 gtk_message_row_class_init (GtkMessageRowClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gtk_message_row_finalize;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/listbox/listbox.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkMessageRow, content_label);