diff -pur gthumb-2.10.12/libgthumb/file-utils.c gthumb-2.10.12.new/libgthumb/file-utils.c
--- gthumb-2.10.12/libgthumb/file-utils.c	2010-05-05 09:03:15.000000000 +0200
+++ gthumb-2.10.12.new/libgthumb/file-utils.c	2010-05-05 23:31:59.205637822 +0200
@@ -2488,7 +2488,7 @@ get_temp_file_name (const char *tmpdir, 
 
 	g_static_mutex_lock (&count_mutex);
 	if (ext != NULL)
-		name = g_strdup_printf ("%d%s", count++, ext);
+		name = g_strdup_printf ("%d.%s", count++, ext);
 	else
 		name = g_strdup_printf ("%d", count++);
 	g_static_mutex_unlock (&count_mutex);
diff -pur gthumb-2.10.12/src/dlg-photo-importer.c gthumb-2.10.12.new/src/dlg-photo-importer.c
--- gthumb-2.10.12/src/dlg-photo-importer.c	2010-05-05 09:03:16.000000000 +0200
+++ gthumb-2.10.12.new/src/dlg-photo-importer.c	2010-05-06 00:07:36.985640783 +0200
@@ -810,13 +810,19 @@ load_images_preview__step (AsyncOperatio
 
 	camera_folder = remove_level_from_path (camera_path);
 	camera_filename = file_name_from_path (camera_path);
-	gp_camera_file_get (data->camera,
-			    camera_folder,
-			    camera_filename,
-			    GP_FILE_TYPE_PREVIEW,
-			    file,
-			    data->context);
-
+	if (gp_camera_file_get (data->camera,
+	                        camera_folder,
+	                        camera_filename,
+	                        GP_FILE_TYPE_PREVIEW,
+	                        file,
+	                        data->context) < 0) {
+		/* clear error flag if thumbnail generation failed (e.g. for 
+		 * movies), this should not stop the import*/
+		g_mutex_lock (data->data_mutex);
+		data->error = FALSE;
+		g_mutex_unlock (data->data_mutex);		
+	}
+		
 	tmp_dir = get_temp_dir_name ();
 	if (tmp_dir == NULL) 
 		/* should we display an error message here? */
@@ -830,7 +836,9 @@ load_images_preview__step (AsyncOperatio
 		FileData  *fdata;
 
 		tmp_file = file_data_new_from_local_path (tmp_filename);
-		file_data_update_mime_type (tmp_file, FALSE); /* FIXME: always slow mime type ? */
+		/* fast mime type should even work for empty files (if thumbnail creation failed) 
+		 * by using the extension*/		
+		file_data_update_mime_type (tmp_file, TRUE); 
 		
 		pixbuf = gth_pixbuf_new_from_file (tmp_file, NULL, THUMB_SIZE, THUMB_SIZE, NULL);
 		if (pixbuf == NULL)
