diff --git a/ChangeLog.claws b/ChangeLog.claws
index c074e1a0b..1a06b9645 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-09-02 [alfons]	0.8.2claws20
+
+	* src/folder.c
+	* src/mh.c
+		revert change of 0.8.2claws16 and use the mh_folder_destroy
+		as folder->destroy virtual as suggested by Hiro
+		(the mh.c code seems to have been lost around mh.c.1.21)
+
 2002-09-02 [paul]	0.8.2claws19
 
 	* po/pt_BR.po
diff --git a/configure.in b/configure.in
index 61c08ce5d..6afb21262 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws19
+EXTRA_VERSION=claws20
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/folder.c b/src/folder.c
index ac954fe46..33d1498d8 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -144,9 +144,9 @@ void folder_remote_folder_init(Folder *folder, const gchar *name,
 void folder_destroy(Folder *folder)
 {
 	g_return_if_fail(folder != NULL);
-	
-	if (folder->destroy)
-		folder->destroy(folder);
+	g_return_if_fail(folder->destroy != NULL);
+
+	folder->destroy(folder);
 
 	folder_list = g_list_remove(folder_list, folder);
 
diff --git a/src/mh.c b/src/mh.c
index 865ed8548..12bfe6820 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -130,9 +130,7 @@ static void mh_folder_init(Folder *folder, const gchar *name, const gchar *path)
 
 	folder_local_folder_init(folder, name, path);
 
-/*
-	folder->get_msg_list        = mh_get_msg_list;
-*/
+/*	folder->get_msg_list        = mh_get_msg_list; */
 	folder->fetch_msg           = mh_fetch_msg;
 	folder->fetch_msginfo       = mh_fetch_msginfo;
 	folder->add_msg             = mh_add_msg;
@@ -143,15 +141,14 @@ static void mh_folder_init(Folder *folder, const gchar *name, const gchar *path)
 	folder->remove_msg          = mh_remove_msg;
 	folder->remove_all_msg      = mh_remove_all_msg;
 	folder->is_msg_changed      = mh_is_msg_changed;
-/*
-	folder->scan                = mh_scan_folder;
-*/
+/*	folder->scan                = mh_scan_folder; */
 	folder->get_num_list	    = mh_get_num_list;
 	folder->scan_tree           = mh_scan_tree;
 	folder->create_tree         = mh_create_tree;
 	folder->create_folder       = mh_create_folder;
 	folder->rename_folder       = mh_rename_folder;
 	folder->remove_folder       = mh_remove_folder;
+	folder->destroy             = mh_folder_destroy;
 }
 
 void mh_get_last_num(Folder *folder, FolderItem *item)