diff --git a/src/e-util/e-import-assistant.c b/src/e-util/e-import-assistant.c
index f3f605fc42..b859ea4bf1 100644
--- a/src/e-util/e-import-assistant.c
+++ b/src/e-util/e-import-assistant.c
@@ -151,7 +151,7 @@ filename_changed (GtkWidget *widget,
 {
 	EImportAssistantPrivate *priv;
 	ImportFilePage *page;
-	const gchar *filename;
+	gchar *filename;
 	gint fileok;
 
 	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
@@ -219,6 +219,8 @@ filename_changed (GtkWidget *widget,
 
 	widget = gtk_assistant_get_nth_page (assistant, PAGE_FILE_CHOOSE);
 	gtk_assistant_set_page_complete (assistant, widget, fileok);
+
+	g_free (filename);
 }
 
 static void
diff --git a/src/modules/mail/e-mail-shell-backend.c b/src/modules/mail/e-mail-shell-backend.c
index 05d823c6db..6403a347e3 100644
--- a/src/modules/mail/e-mail-shell-backend.c
+++ b/src/modules/mail/e-mail-shell-backend.c
@@ -119,8 +119,10 @@ message_parsed_cb (GObject *source_object,
 	display = g_object_get_data (preview, "mbox-imp-display");
 
 	parts_list = e_mail_parser_parse_finish (parser, res, NULL);
-	if (!parts_list)
+	if (!parts_list) {
+		g_object_unref (parser);
 		return;
+	}
 
 	folder = e_mail_part_list_get_folder (parts_list);
 	message_uid = e_mail_part_list_get_message_uid (parts_list);
@@ -144,6 +146,7 @@ message_parsed_cb (GObject *source_object,
 	e_mail_display_load (display, NULL);
 
 	g_object_unref (parts_list);
+	g_object_unref (parser);
 }
 
 static void