diff --git a/camel/ChangeLog b/camel/ChangeLog
index 27a5d22262..ef9aebeb76 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-07  Dan Winship  <danw@helixcode.com>
+
+	* camel-folder.c (camel_folder_free_deep): Fix this to not require
+	NULL-termination of the array.
+
 2000-08-04  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* providers/imap/camel-imap-store.c (imap_connect): If we fail to
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index caac803ce8..047c814e5e 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1241,6 +1241,9 @@ camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array)
 void
 camel_folder_free_deep (CamelFolder *folder, GPtrArray *array)
 {
-	g_strfreev ((gchar **)array->pdata);
-	g_ptr_array_free (array, FALSE);
+	int i;
+
+	for (i = 0; i < array->len; i++)
+		g_free (array->pdata[i]);
+	g_ptr_array_free (array, TRUE);
 }