diff --git a/configure.in b/configure.in
index a0daebf..b71f711 100644
--- a/configure.in
+++ b/configure.in
@@ -339,7 +339,7 @@ AC_SUBST(CORE_CFLAGS)
 CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
 AC_SUBST(CORE_LIBS)
 
-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
+DISABLE_DEPRECATED_CFLAGS=""
 AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 
 dnl Multimedia keys
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index 8c0b8fc..5c535fa 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -138,13 +138,28 @@ append_label (GtkWidget *vbox,
 	gtk_label_set_markup (GTK_LABEL (label), str);
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+	gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR);
+	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+	gtk_label_set_single_line_mode (GTK_LABEL (label), FALSE);
+	gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
 
 	/* setting can_focus to FALSE will allow to make the label
 	 * selectable but without the cursor showing.
 	 */
 	gtk_widget_set_can_focus (label, FALSE);
 
-	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+	guint rows;
+	g_object_get (vbox, "n-rows", &rows, NULL);
+
+	gtk_table_resize (GTK_TABLE (vbox), rows + 1, 1);
+
+	gtk_table_attach (GTK_TABLE (vbox), label,
+			0, 1,
+			rows - 1, rows,
+			GTK_FILL | GTK_EXPAND, GTK_FILL, // | GTK_EXPAND
+			0, 2);
+
+	//gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
 	gtk_widget_show (label);
 
 	return label;
@@ -609,6 +624,7 @@ nautilus_image_properties_page_class_init (NautilusImagePropertiesPageClass *cla
 static void
 nautilus_image_properties_page_init (NautilusImagePropertiesPage *page)
 {
+	GtkWidget *scroll;
 	page->details = G_TYPE_INSTANCE_GET_PRIVATE (page,
 						     NAUTILUS_TYPE_IMAGE_PROPERTIES_PAGE,
 						     NautilusImagePropertiesPageDetails);
@@ -617,12 +633,19 @@ nautilus_image_properties_page_init (NautilusImagePropertiesPage *page)
 	gtk_box_set_spacing (GTK_BOX (page), 2);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 6);
 
-	page->details->vbox = gtk_vbox_new (FALSE, 6);
+	page->details->vbox = gtk_table_new (1, 1, FALSE);// gtk_vbox_new (FALSE, 6);
 	page->details->loading_label =
 		append_label (page->details->vbox,_("loading..."));
+
+	scroll = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), page->details->vbox);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
+					GTK_POLICY_NEVER,
+					GTK_POLICY_AUTOMATIC);
+
 	gtk_box_pack_start (GTK_BOX (page),
-			    page->details->vbox,
-			    FALSE, TRUE, 2);
+			    scroll,
+			    TRUE, TRUE, 2);
 
 	gtk_widget_show_all (GTK_WIDGET (page));
 }
