diff --git a/gnome/gcliplabel.c b/gnome/gcliplabel.c
index 87d0fb031..607f6c8f3 100644
--- a/gnome/gcliplabel.c
+++ b/gnome/gcliplabel.c
@@ -61,34 +61,7 @@ void
 gtk_clip_label_set (GtkLabel *label,
 		    const char *str)
 {
-	char* p;
-	
-	g_return_if_fail (label != NULL);
-	g_return_if_fail (GTK_IS_LABEL (label));
-	g_return_if_fail (str != NULL);
-	
-	if (label->label)
-		g_free (label->label);
-	label->label = g_strdup (str);
-	
-	if (label->row)
-		g_slist_free (label->row);
-	label->row = NULL;
-	label->row = g_slist_append (label->row, label->label);
-	p = label->label;
-	while ((p = strchr(p, '\n')))
-		label->row = g_slist_append (label->row, ++p);
-	
-	if (GTK_WIDGET_VISIBLE (label))
-	{
-		if (GTK_WIDGET_MAPPED (label))
-			gdk_window_clear_area (GTK_WIDGET (label)->window,
-					       GTK_WIDGET (label)->allocation.x,
-					       GTK_WIDGET (label)->allocation.y,
-					       GTK_WIDGET (label)->allocation.width,
-					       GTK_WIDGET (label)->allocation.height);
-		gtk_widget_queue_draw (GTK_WIDGET (label));
-    }
+	gtk_label_set (label, str);
 }
 
 GtkWidget*
diff --git a/gnome/gnome.TODO b/gnome/gnome.TODO
index ce871a027..e0e725a52 100644
--- a/gnome/gnome.TODO
+++ b/gnome/gnome.TODO
@@ -1,5 +1,54 @@
+Other features requested:
 
+	- Make the default action on drop configurable.
 
+	- Remove extra space on the panels (the in-between
+	  icons)
+
+	- Default font for the icon list 
+
+	- Remove the bottom scrollabar on the views.
+
+	- Status line uses too much space, it might be fixed
+	  by changing it to merge both status in a single
+	  status line.
+
+	[   Status        | 0 bytes in nnnnnnn ]
+	   ^		    ^
+	   |		    + miniinfo.
+	   |
+	   print_vfs_message
+	  
+	- The input line and the navigations icons should be part of an
+	  expert mode.
+
+	- Layout of dialog boxes suck.
+
+	- Add help button to dialog boxes.
+
+	- Add an advanced/simple checkbox.
+
+	- Al of the configuration pages should be in a single
+	  GnomePropertyBox.
+
+	- Optional "hidden menu" option.
+
+	- Fix the progress dialog box to be nicer.
+
+	- Adding more things to the toolbar.
+
+	- Dialogs are popping in the wrong place, this should be fixed
+	  by using:
+
+		gtk_window_position (GDK_WINDOW_POSITION)
+
+	- Entering compressed tar files crashes the program.
+
+	- Substructure notify is taking too much time of processing
+	  I need to a dd a filter and discard everything non-ClientMessage
+	  that is sent to the wroot window.
+
+	
 IMPORTANTE:
 
 >>>>> When something is dragged, the panel is not being refreshed <<<<