Index: mail/em-filter-i18n.h
===================================================================
--- mail/em-filter-i18n.h	(revision 37017)
+++ mail/em-filter-i18n.h	(working copy)
@@ -46,6 +46,7 @@ char *s = N_("Message Body");
 char *s = N_("Message Header");
 char *s = N_("Message is Junk");
 char *s = N_("Message is not Junk");
+char *s = N_("Message Location");
 char *s = N_("Move to Folder");
 char *s = N_("Pipe to Program");
 char *s = N_("Play Sound");
Index: widgets/table/e-cell-text.c
===================================================================
--- widgets/table/e-cell-text.c	(revision 37017)
+++ widgets/table/e-cell-text.c	(working copy)
@@ -107,6 +107,11 @@ static guint signals [LAST_SIGNAL] = { 0
 
 static GdkAtom clipboard_atom = GDK_NONE;
 
+/* The vertical padding for ECellText can be reverted to the older,
+ * more tightly packed value of 1 by setting the environment variable
+ * ETABLE_PACKED.  A concession made for bug #565780. */
+static gint VERTICAL_PADDING = 4;
+
 G_DEFINE_TYPE (ECellText, e_cell_text, E_CELL_TYPE)
 
 #define UTF8_ATOM  gdk_atom_intern ("UTF8_STRING", FALSE)
@@ -750,9 +755,9 @@ ect_draw (ECellView *ecell_view, GdkDraw
 	gdk_gc_set_foreground (text_view->gc, foreground);
 
 	x1 += 4;
-	y1 += 1;
+	y1 += VERTICAL_PADDING;
 	x2 -= 4;
-	y2 -= 1;
+	y2 -= VERTICAL_PADDING;
 
 	x_origin = x1 + ect->x + text_view->xofs - (edit ? edit->xofs_edit : 0);
 	y_origin = y1 + ect->y + text_view->yofs - (edit ? edit->yofs_edit : 0);
@@ -1149,7 +1154,7 @@ ect_height (ECellView *ecell_view, int m
 	layout = generate_layout (text_view, model_col, view_col, row, 0);
 	pango_layout_get_pixel_size (layout, NULL, &height);
 	g_object_unref (layout);
-	return height + 2;
+	return height + (VERTICAL_PADDING * 2);
 }
 
 /*
@@ -1844,6 +1849,10 @@ e_cell_text_class_init (ECellTextClass *
 	}
 
 	gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_TEXT_TYPE, gal_a11y_e_cell_text_new);
+
+	/* Allow reverting to the older, more tightly packed ETables. */
+	if (g_getenv ("ETABLE_PACKED") != NULL)
+		VERTICAL_PADDING = 1;
 }
 
 
