Index: src/common/utils.c
===================================================================
RCS file: //claws/src/common/utils.c,v
retrieving revision 1.36.2.196
retrieving revision 1.36.2.197
diff -u -r1.36.2.196 -r1.36.2.197
--- src/common/utils.c	11 May 2012 16:53:23 -0000	1.36.2.196
+++ src/common/utils.c	16 May 2012 08:00:55 -0000	1.36.2.197
@@ -2322,6 +2322,17 @@
 	gchar *prev_dir;
 	gint file_no;
 
+	if (first == last) {
+		/* Skip all the dir reading part. */
+		gchar *filename = g_strdup_printf("%s%s%u", dir, G_DIR_SEPARATOR_S, first);
+		if (claws_unlink(filename) < 0) {
+			FILE_OP_ERROR(filename, "unlink");
+			g_free(filename);
+			return -1;
+		}
+		return 0;
+	}
+
 	prev_dir = g_get_current_dir();
 
 	if (g_chdir(dir) < 0) {