X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Ffolder.c;h=49370dd62710d9cd232b35ae49b68717dbc448d4;hp=58aaeb2186cabda9c51c02d1ae9ed96699f94b15;hb=9f32e753523ed612a63f26e9577a0c995ad03242;hpb=4665e52c1d9073e7f806677620e83b144250aa43

diff --git a/src/folder.c b/src/folder.c
index 58aaeb218..49370dd62 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -1565,11 +1565,13 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
 	while (srcnode != NULL) {
 		if (srcnode && srcnode->data) {
 			next_item = (FolderItem*) srcnode->data;
+			srcnode = srcnode->next;
 			if (folder_item_move_recursive(next_item, new_item) == NULL)
 				return NULL;
 		}
-		srcnode = srcnode->next;
 	}
+	src->folder->remove_folder(src->folder, src);
+
 	return new_item;
 }
 
@@ -1617,7 +1619,6 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
 	}
 	
 	/* update rules */
-	src->folder->remove_folder(src->folder, src);
 	src_node = g_node_find(src->folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, src);
 	if (src_node) 
 		g_node_destroy(src_node);