diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c
index 16a4b40..938253e 100644
--- a/shell/ev-sidebar-attachments.c
+++ b/shell/ev-sidebar-attachments.c
@@ -41,6 +41,7 @@
 enum {
 	COLUMN_ICON,
 	COLUMN_NAME,
+	COLUMN_LABEL,
 	COLUMN_DESCRIPTION,
 	COLUMN_ATTACHMENT,
 	N_COLS
@@ -553,6 +554,7 @@ ev_sidebar_attachments_init (EvSidebarAttachments *ev_attachbar)
 	/* Data Model */
 	ev_attachbar->priv->model = gtk_list_store_new (N_COLS,
 							GDK_TYPE_PIXBUF, 
+							G_TYPE_STRING,
 							G_TYPE_STRING,  
 							G_TYPE_STRING,
 							EV_TYPE_ATTACHMENT);
@@ -564,8 +566,9 @@ ev_sidebar_attachments_init (EvSidebarAttachments *ev_attachbar)
 					  GTK_SELECTION_MULTIPLE);
 	gtk_icon_view_set_columns (GTK_ICON_VIEW (ev_attachbar->priv->icon_view), -1);
 	g_object_set (G_OBJECT (ev_attachbar->priv->icon_view),
-		      "text-column", COLUMN_NAME,
+		      "markup-column", COLUMN_LABEL,
 		      "pixbuf-column", COLUMN_ICON,
+		      "tooltip-column", COLUMN_DESCRIPTION,
 		      NULL);
 	g_signal_connect_swapped (ev_attachbar->priv->icon_view,
 				  "button-press-event",
@@ -632,19 +635,26 @@ job_finished_callback (EvJobAttachments     *job,
 		GtkTreeIter   iter;
 		GdkPixbuf    *pixbuf = NULL;
 		const gchar  *mime_type;
+		gchar            *label;
 
 		attachment = EV_ATTACHMENT (l->data);
 
 		mime_type = ev_attachment_get_mime_type (attachment);
 		pixbuf = ev_sidebar_attachments_icon_cache_get (ev_attachbar,
 								mime_type);
+		label =  g_markup_printf_escaped ("%s\n<small><span style=\"italic\">%s</span></small>",
+ 									 ev_attachment_get_name (attachment),
+									 ev_attachment_get_description (attachment));
 
 		gtk_list_store_append (ev_attachbar->priv->model, &iter);
 		gtk_list_store_set (ev_attachbar->priv->model, &iter,
 				    COLUMN_NAME, ev_attachment_get_name (attachment),
+				    COLUMN_LABEL, label,
+				    COLUMN_DESCRIPTION, ev_attachment_get_description (attachment),
 				    COLUMN_ICON, pixbuf,
 				    COLUMN_ATTACHMENT, attachment, 
 				    -1);
+		g_free (label);
 	}
 
 	g_object_unref (job);
