--- evolution-2.9.3/mail/em-folder-properties.c.unread-messages	2006-12-09 09:00:08.000000000 -0500
+++ evolution-2.9.3/mail/em-folder-properties.c	2006-12-09 09:00:09.000000000 -0500
@@ -145,27 +145,27 @@
 	gtk_widget_show (table);
 	gtk_box_pack_start ((GtkBox *) parent, table, TRUE, TRUE, 0);
 
-	/* TODO: can this be done in a loop? */
 	/* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */
-	label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total));
+	label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
 	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
 	
-	sprintf(countstr, "%d", prop_data->total);
+	sprintf(countstr, "%d", prop_data->unread);
 	label = gtk_label_new (countstr);
 	gtk_widget_show (label);
 	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
 	gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	row++;
 
+	/* TODO: can this be done in a loop? */
 	/* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */
-	label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread));
+	label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
 	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
 	
-	sprintf(countstr, "%d", prop_data->unread);
+	sprintf(countstr, "%d", prop_data->total);
 	label = gtk_label_new (countstr);
 	gtk_widget_show (label);
 	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
--- evolution-2.9.3/mail/mail-component.c.unread-messages	2006-12-09 09:00:08.000000000 -0500
+++ evolution-2.9.3/mail/mail-component.c	2006-12-09 09:00:09.000000000 -0500
@@ -544,6 +544,9 @@
 			    || g_ascii_strcasecmp(emfv->folder->full_name, ".") == 0)
 				bits |= 8;
 
+			if (selected->len > 1)
+				g_string_append_printf(tmp, ngettext ("%d selected, ", "%d selected, ", selected->len), selected->len);
+
 			if (bits == 1)
 				g_string_append_printf(tmp, ngettext ("%d draft", "%d drafts", visible), visible);
 			else if (bits == 2)
@@ -553,13 +556,11 @@
 			else {
 				if (!emfv->hide_deleted)
 					visible += deleted;
+				if (unread && selected->len <= 1)
+					g_string_append_printf(tmp, ngettext ("%d unread, ", "%d unread, ", unread), unread);
 				g_string_append_printf(tmp, ngettext ("%d total", "%d total", visible), visible);
-				if (unread && selected->len <=1)
-					g_string_append_printf(tmp, ngettext (", %d unread", ", %d unread", unread), unread);
 			}
 
-			if (selected->len > 1)
-				g_string_append_printf(tmp, ngettext (", %d selected", ", %d selected", selected->len), selected->len);
 			message_list_free_uids(emfv->list, selected);
 		}