X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=3c0b0bcf38d123d9b1c696691626bdc31d5ead30;hp=5e113d9baaee13766f8cbba791e8c171c8d97fd4;hb=8f7aad0dd79ba73052e58292a8b76582b8fdfa23;hpb=594387ddd061af8176bcdf5b1710702725e621fa

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 5e113d9..3c0b0bc 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -804,10 +804,14 @@ modest_msg_edit_window_finalize (GObject *obj)
 		g_object_unref (priv->outbox_msg);
 		priv->outbox_msg = NULL;
 	}
-	if (priv->msg_uid != NULL) {
-		g_free (priv->msg_uid);
-		priv->msg_uid = NULL;
-	}
+	g_free (priv->msg_uid);
+	g_free (priv->last_search);
+	g_slist_free (priv->font_items_group);
+	g_slist_free (priv->size_items_group);
+	g_list_foreach (priv->attachments, (GFunc) g_object_unref, NULL);
+	g_list_free (priv->attachments);
+	g_list_foreach (priv->images, (GFunc) g_object_unref, NULL);
+	g_list_free (priv->images);
 
 	/* This had to stay alive for as long as the combobox that used it: */
 	modest_pair_list_free (priv->from_field_protos);