Change instances of "vfolder" that appear in the UI to use the term

2005-08-07  Rodney Dawes  <dobey@novell.com>

	* em-folder-browser.c (emfb_search_items):
	* em-folder-tree-model.c (sort_cb, em_folder_tree_model_load_state):
	* em-folder-tree.c (emft_drop_target):
	* em-folder-view.c (emfv_popup_items, emfv_uri_popups):
	* em-utils.c:
	* em-vfolder-editor.c (em_vfolder_editor_new):
	* em-vfolder-rule.c (em_vfolder_editor_sourcelist_new):
	* mail-dialogs.glade:
	* mail-vfolder.c (vfolder_setup_desc, vfolder_setup_do):
	(vfolder_adduri_desc, vfolder_load_storage, vfolder_edit):
	(vfolder_edit_rule, vfolder_gui_add_rule):
	* mail.error.xml:
	Change instances of "vfolder" that appear in the UI to use the term
	"Search Folder" instead
	Update some comments to use the term "Search Folder" instead of vfolder

svn path=/trunk/; revision=30024

11 files changed, 138 insertions, 33 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 851e19f56d..8e7fce11d5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,21 @@
+2005-08-07  Rodney Dawes  <dobey@novell.com>
+
+	* em-folder-browser.c (emfb_search_items):
+	* em-folder-tree-model.c (sort_cb, em_folder_tree_model_load_state):
+	* em-folder-tree.c (emft_drop_target):
+	* em-folder-view.c (emfv_popup_items, emfv_uri_popups):
+	* em-utils.c:
+	* em-vfolder-editor.c (em_vfolder_editor_new):
+	* em-vfolder-rule.c (em_vfolder_editor_sourcelist_new):
+	* mail-dialogs.glade:
+	* mail-vfolder.c (vfolder_setup_desc, vfolder_setup_do):
+	(vfolder_adduri_desc, vfolder_load_storage, vfolder_edit):
+	(vfolder_edit_rule, vfolder_gui_add_rule):
+	* mail.error.xml:
+	Change instances of "vfolder" that appear in the UI to use the term
+	"Search Folder" instead
+	Update some comments to use the term "Search Folder" instead of vfolder
+	
 2005-08-05  David Malcolm  <dmalcolm@redhat.com>
 
 	* em-account-editor.c:  (emae_option_checkspin) initialize local 
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 842e5c59ea..6d3937126d 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -131,7 +131,7 @@ static ESearchBarItem emfb_search_items[] = {
 	E_FILTERBAR_SAVE,
 	E_FILTERBAR_EDIT,
 	{ NULL, 0, NULL },
-	{ N_("Create _vFolder From Search..."), ESB_SAVE, NULL  },
+	{ N_("C_reate Search Folder From Search..."), ESB_SAVE, NULL  },
 	{ NULL, -1, NULL }
 };
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 1a622cc9eb..a5c5330800 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -193,14 +193,14 @@ sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data
 	gtk_tree_model_get (model, b, COL_STRING_DISPLAY_NAME, &bname, COL_UINT_FLAGS, &bflags, -1);
 	
 	if (is_store) {
-		/* On This Computer is always first and vFolders is always last */
+		/* On This Computer is always first and Search Folders is always last */
 		if (!strcmp (aname, _("On This Computer")))
 			rv = -1;
 		else if (!strcmp (bname, _("On This Computer")))
 			rv = 1;
-		else if (!strcmp (aname, _("vFolders")))
+		else if (!strcmp (aname, _("Search Folders")))
 			rv = 1;
-		else if (!strcmp (bname, _("vFolders")))
+		else if (!strcmp (bname, _("Search Folders")))
 			rv = -1;
 	} else if (store == vfolder_store) {
 		/* UNMATCHED is always last */
@@ -331,7 +331,7 @@ em_folder_tree_model_load_state (EMFolderTreeModel *model, const char *filename)
 	if (stat (filename, &st) == 0 && (model->state = xmlParseFile (filename)))
 		return;
 	
-	/* setup some defaults - expand "Local Folders" and "vFolders" */
+	/* setup some defaults - expand "Local Folders" and "Search Folders" */
 	model->state = xmlNewDoc ("1.0");
 	root = xmlNewDocNode (model->state, NULL, "tree-state", NULL);
 	xmlDocSetRootElement (model->state, root);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 3ee0361e6b..5546bf7748 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1268,7 +1268,7 @@ emft_drop_target(EMFolderTree *emft, GdkDragContext *context, GtkTreePath *path)
 		}
 		camel_url_free(url);
 		
-		/* vFolders can only be dropped into other vFolders */
+		/* Search Folders can only be dropped into other Search Folders */
 		if (strncmp(src_uri, "vfolder:", 8) == 0) {
 			/* TODO: not sure if this is legal, but it works, force move only for vfolders */
 			context->suggested_action = GDK_ACTION_MOVE;
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index aca5858afb..e108e0a90e 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1071,10 +1071,10 @@ static EPopupItem emfv_popup_items[] = {
  
 	{ E_POPUP_BAR, "90.filter", NULL, NULL, NULL, NULL },
 	{ E_POPUP_SUBMENU, "90.filter.00", N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/00.00", N_("vFolder on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/00.01", N_("vFolder on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/00.02", N_("vFolder on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/00.03", N_("vFolder on Mailing _List"),
+	{ E_POPUP_ITEM, "90.filter.00/00.00", N_("Search Folder from _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/00.01", N_("Search Folder from Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/00.02", N_("Search Folder from _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/00.03", N_("Search Folder from Mailing _List"),
 	  emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	
 	{ E_POPUP_BAR, "90.filter.00/10", NULL, NULL, NULL, NULL },
@@ -2416,7 +2416,7 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data)
 static EPopupItem emfv_uri_popups[] = {
 	{ E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_NOT_MAILTO },
 
-	{ E_POPUP_SUBMENU, "99.uri.00", N_("Create _vFolder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
+	{ E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
 	{ E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
 	{ E_POPUP_ITEM, "99.uri.00/00.00", N_("_To this Address"), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO },
 };
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 2a3ce82e75..f43f63f689 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -226,7 +226,7 @@ em_utils_check_user_can_send_mail (GtkWidget *parent)
 	return TRUE;
 }
 
-/* Editing Filters/vFolders... */
+/* Editing Filters/Search Folders... */
 
 static GtkWidget *filter_editor = NULL;
 
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index 24ca862104..781a80bb19 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -101,7 +101,7 @@ em_vfolder_editor_new (EMVFolderContext *vc)
 	GladeXML *gui;
 	
 	gui = glade_xml_new (EVOLUTION_GLADEDIR "/filter.glade", "rule_editor", NULL);
-	rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("v_Folders"));
+	rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("Search _Folders"));
         gtk_widget_hide(glade_xml_get_widget (gui, "filter_source"));
 	g_object_unref (gui);
 	
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index dc7e75ce24..441717e8d5 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -571,7 +571,7 @@ em_vfolder_editor_sourcelist_new(char *widget_name, char *string1, char *string2
 	
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_insert_column_with_attributes((GtkTreeView *)table, -1,
-						     _("vFolder source"), renderer,
+						     _("Search Folder source"), renderer,
 						     "text", 0, NULL);
 	
 	selection = gtk_tree_view_get_selection((GtkTreeView *)table);
diff --git a/mail/mail-dialogs.glade b/mail/mail-dialogs.glade
index 6ffb46dba0..7e779c4299 100644
--- a/mail/mail-dialogs.glade
+++ b/mail/mail-dialogs.glade
@@ -18,6 +18,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -92,6 +93,10 @@
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">search_entry</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -109,7 +114,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -139,6 +144,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -190,6 +199,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -261,6 +271,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -288,6 +302,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">12</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -363,6 +381,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -390,6 +412,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">12</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -465,6 +491,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -488,6 +518,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -518,6 +552,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -592,6 +627,10 @@
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">store_menu</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -632,8 +671,9 @@
 		  <property name="visible">True</property>
 		  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
 		  <property name="fraction">0</property>
-		  <property name="pulse_step">0.1</property>
+		  <property name="pulse_step">0.10000000149</property>
 		  <property name="text" translatable="yes"></property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -718,6 +758,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -788,6 +832,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -840,6 +888,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -923,6 +972,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -954,7 +1007,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="license_top_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="no"></property>
+	      <property name="label"></property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -964,6 +1017,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -1052,6 +1109,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -1142,6 +1200,10 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -1173,6 +1235,9 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 		  <property name="rules_hint">False</property>
 		  <property name="reorderable">False</property>
 		  <property name="enable_search">True</property>
+		  <property name="fixed_height_mode">False</property>
+		  <property name="hover_selection">False</property>
+		  <property name="hover_expand">False</property>
 		</widget>
 	      </child>
 	    </widget>
@@ -1206,6 +1271,10 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">combo-entry</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -1230,6 +1299,10 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -1278,7 +1351,7 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
+		      <property name="invisible_char">*</property>
 		      <property name="activates_default">False</property>
 		    </widget>
 		  </child>
@@ -1305,6 +1378,10 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			  </child>
 			</widget>
@@ -1391,6 +1468,7 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -1460,7 +1538,7 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 	  <child>
 	    <widget class="GtkLabel" id="label13">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;vFolder Sources&lt;/b&gt;</property>
+	      <property name="label" translatable="yes">&lt;b&gt;Search Folder Sources&lt;/b&gt;</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1470,6 +1548,10 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -1497,6 +1579,10 @@ Please select a follow up action from the &quot;Flag&quot; menu.</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index bfe0ccaa7b..32411513c8 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -88,7 +88,7 @@ vfolder_setup_desc(struct _mail_msg *mm, int done)
 {
 	struct _setup_msg *m = (struct _setup_msg *)mm;
 
-	return g_strdup_printf(_("Setting up vFolder: %s"), m->folder->full_name);
+	return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name);
 }
 
 static void
@@ -98,7 +98,7 @@ vfolder_setup_do(struct _mail_msg *mm)
 	GList *l, *list = NULL;
 	CamelFolder *folder;
 
-	d(printf("Setting up vFolder: %s\n", m->folder->full_name));
+	d(printf("Setting up Search Folder: %s\n", m->folder->full_name));
 
 	camel_vee_folder_set_expression((CamelVeeFolder *)m->folder, m->query);
 
@@ -237,14 +237,14 @@ vfolder_adduri_desc(struct _mail_msg *mm, int done)
 			}
 
 			if (loc && url->path)
-				desc = g_strdup_printf(_("Updating vFolders for '%s:%s'"), loc, url->path);
+				desc = g_strdup_printf(_("Updating Search Folders for '%s:%s'"), loc, url->path);
 			camel_url_free(url);
 		}
 		g_free(euri);
 	}
 
 	if (desc == NULL)
-		desc = g_strdup_printf(_("Updating vFolders for '%s'"), m->uri);
+		desc = g_strdup_printf(_("Updating Search Folders for '%s'"), m->uri);
 
 	return desc;
 }
@@ -934,7 +934,7 @@ vfolder_load_storage(void)
 				(CamelObjectEventHookFunc)store_folder_renamed, NULL);
 	
 	d(printf("got store '%s' = %p\n", storeuri, vfolder_store));
-	mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("vFolders"));
+	mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("Search Folders"));
 	
 	/* load our rules */
 	user = g_strdup_printf ("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
@@ -1004,7 +1004,7 @@ vfolder_edit (void)
 	}
 	
 	vfolder_editor = GTK_WIDGET (em_vfolder_editor_new (context));
-	gtk_window_set_title (GTK_WINDOW (vfolder_editor), _("vFolders"));
+	gtk_window_set_title (GTK_WINDOW (vfolder_editor), _("Search Folders"));
 	g_signal_connect(vfolder_editor, "response", G_CALLBACK(em_vfolder_editor_response), NULL);
 	
 	gtk_widget_show (vfolder_editor);
@@ -1043,7 +1043,7 @@ vfolder_edit_rule(const char *uri)
 
 		w = filter_rule_get_widget((FilterRule *)newrule, (RuleContext *)context);
 
-		gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("Edit vFolder"), NULL,
+		gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("Edit Search Folder"), NULL,
 							      GTK_DIALOG_DESTROY_WITH_PARENT,
 							      GTK_STOCK_CANCEL,
 							      GTK_RESPONSE_CANCEL,
@@ -1127,7 +1127,7 @@ vfolder_gui_add_rule(EMVFolderRule *rule)
 
 	w = filter_rule_get_widget((FilterRule *)rule, (RuleContext *)context);
 
-	gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("New vFolder"),
+	gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("New Search Folder"),
 						      NULL,
 						      GTK_DIALOG_DESTROY_WITH_PARENT,
 						      GTK_STOCK_CANCEL,
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 5cb2138bdb..7ab4d23209 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -278,18 +278,19 @@ all proxy information will be deleted permanently.</_secondary>
  </error>
 
  <error id="vfolder-notexist" type="error">
-  <_primary>Cannot edit vFolder &quot;{0}&quot; as it does not exist.</_primary>
-  <_secondary xml:space="preserve">This folder may have been added implicitly, go to the vFolder editor to add it explicitly, if required.</_secondary>
+  <_primary>Cannot edit Search Folder &quot;{0}&quot; as it does not exist.</_primary>
+  <_secondary xml:space="preserve">This folder may have been added implicitly,
+go to the Search Folder editor to add it explicitly, if required.</_secondary>
  </error>
 
  <error id="vfolder-notunique" type="error">
-  <_primary>Cannot add vFolder &quot;{0}&quot;.</_primary>
+  <_primary>Cannot add Search Folder &quot;{0}&quot;.</_primary>
   <_secondary xml:space="preserve">A folder named &quot;{1}&quot; already exists. Please use a different name.</_secondary>
  </error>
 
  <error id="vfolder-updated" type="info">
-  <_primary>vFolders automatically updated.</_primary>
-  <_secondary xml:space="preserve">The following vFolder(s):
+  <_primary>Search Folders automatically updated.</_primary>
+  <_secondary xml:space="preserve">The following Search Folder(s):
 {0}
 Used the now removed folder:
     &quot;{1}&quot;
@@ -312,7 +313,7 @@ And have been updated.</_secondary>
 
  <error id="no-name-vfolder" type="error">
   <_primary>Missing name.</_primary>
-  <_secondary xml:space="preserve">You must name this vFolder.</_secondary>
+  <_secondary xml:space="preserve">You must name this Search Folder.</_secondary>
  </error>
 
  <error id="vfolder-no-source" type="error">