Index: plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
===================================================================
--- plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml	(revision 34310)
+++ plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml	(working copy)
@@ -5,7 +5,7 @@
 	_name="New Mail Notification" 
 	location="@PLUGINDIR@/liborg-gnome-new-mail-notify@SOEXT@">
 
-		<_description>Generates a D-BUS message when new mail arrives.</_description>
+		<_description>Generates a D-BUS message when new mail messages arrive.</_description>
 		<author name="Miguel Angel López Hernández" email="miguel@gulev.org.mx"/>
 
 		<hook class="org.gnome.evolution.mail.events:1.0">
Index: plugins/bogo-junk-plugin/bf-junk-filter.c
===================================================================
--- plugins/bogo-junk-plugin/bf-junk-filter.c	(revision 34310)
+++ plugins/bogo-junk-plugin/bf-junk-filter.c	(working copy)
@@ -300,7 +300,7 @@ org_gnome_bogo_convert_unicode (struct _
 	if (data->old)
                 return data->old;
 		
-	check = gtk_check_button_new_with_mnemonic (_("Convert mail text to _Unicode"));
+	check = gtk_check_button_new_with_mnemonic (_("Convert message text to _Unicode"));
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode);
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), "/apps/evolution/mail/junk/bogofilter/unicode");
Index: plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in
===================================================================
--- plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in	(revision 34310)
+++ plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in	(working copy)
@@ -7,7 +7,7 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-        <short>Convert mail text to Unicode</short>
+        <short>Convert mail messages to Unicode</short>
         <long>
           Convert message text to Unicode UTF-8 to unify spam/ham tokens
           coming from different character sets.
Index: plugins/bbdb/bbdb.c
===================================================================
--- plugins/bbdb/bbdb.c	(revision 34310)
+++ plugins/bbdb/bbdb.c	(working copy)
@@ -472,7 +472,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 	
 	/* Enable BBDB checkbox */
-	check = gtk_check_button_new_with_mnemonic (_("_Automatically create entries in the addressbook when responding to mail"));
+	check = gtk_check_button_new_with_mnemonic (_("_Automatically create entries in the addressbook when responding to messages"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (enable_toggled_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), check, FALSE, FALSE, 0);
Index: plugins/face/org-gnome-face.eplug.xml
===================================================================
--- plugins/face/org-gnome-face.eplug.xml	(revision 34310)
+++ plugins/face/org-gnome-face.eplug.xml	(working copy)
@@ -4,7 +4,7 @@
 		location="@PLUGINDIR@/liborg-gnome-face@SOEXT@">
 
 		<author name="Sankar P" email="psankar@novell.com"/>
-		<_description>Attach Face header to outgoing mails. First time the user needs to configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces  This will be used in mails that are sent further.</_description>
+		<_description>Attach Face header to outgoing messages. First time the user needs to configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces  This will be used in messages that are sent further.</_description>
 
 		<hook class="org.gnome.evolution.mail.bonobomenu:1.0">
 			<menu id="org.gnome.evolution.mail.composer" target="widget">
Index: plugins/print-message/org-gnome-print-message.eplug.xml
===================================================================
--- plugins/print-message/org-gnome-print-message.eplug.xml	(revision 34310)
+++ plugins/print-message/org-gnome-print-message.eplug.xml	(working copy)
@@ -5,7 +5,7 @@
     id="org.gnome.evolution.plugin.compose.PrintMessage"
     location="@PLUGINDIR@/liborg-gnome-print-message@SOEXT@"
     _name="Print Message">
-    <_description>Gives an option to print mail from composer</_description>
+    <_description>Gives an option to print from the composer.</_description>
     <author name="Vivek Jain" email="jvivek@novell.com"/>
 
     <!-- hook into the popup menu -->
Index: mail/mail-config.glade
===================================================================
--- mail/mail-config.glade	(revision 34310)
+++ mail/mail-config.glade	(working copy)
@@ -3630,7 +3630,7 @@ For example: &quot;Work&quot; or &quot;P
 			    <widget class="GtkCheckButton" id="pgp_encrypt_to_self">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Always encrypt to _myself when sending encrypted mail</property>
+			      <property name="label" translatable="yes">Always encrypt to _myself when sending encrypted messages</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -3810,7 +3810,7 @@ For example: &quot;Work&quot; or &quot;P
 			<widget class="GtkCheckButton" id="smime_encrypt_to_self">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Also encrypt to sel_f when sending encrypted mail</property>
+			  <property name="label" translatable="yes">Also encrypt to sel_f when sending encrypted messages</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -4975,7 +4975,7 @@ For example: &quot;Work&quot; or &quot;P
 				<widget class="GtkCheckButton" id="mlimit_checkbutton">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Do not format text contents in mails if the text si_ze exceeds</property>
+				  <property name="label" translatable="yes">Do not format text contents in messages if the text si_ze exceeds</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -5471,7 +5471,7 @@ For example: &quot;Work&quot; or &quot;P
 	      <child>
 		<widget class="GtkLabel" id="label498">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;New Mail Notification&lt;/span&gt;</property>
+		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;New Message Notification&lt;/span&gt;</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5543,7 +5543,7 @@ For example: &quot;Work&quot; or &quot;P
 			    <widget class="GtkRadioButton" id="radNotifyNot">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Do not notify me when new mail arrives</property>
+			      <property name="label" translatable="yes">_Do not notify me when new messages arrive</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -5562,7 +5562,7 @@ For example: &quot;Work&quot; or &quot;P
 			    <widget class="GtkRadioButton" id="radNotifyBeep">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Beep when new mail arrives</property>
+			      <property name="label" translatable="yes">_Beep when new messages arrive</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -5582,7 +5582,7 @@ For example: &quot;Work&quot; or &quot;P
 			    <widget class="GtkRadioButton" id="radNotifyPlaySound">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Play sound file when new mail arri_ves</property>
+			      <property name="label" translatable="yes">Play sound file when new messages arri_ve</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -5924,7 +5924,7 @@ For example: &quot;Work&quot; or &quot;P
 			<widget class="GtkRadioButton" id="radImagesSometimes">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Load images in mail from contacts</property>
+			  <property name="label" translatable="yes">_Load images in messages from contacts</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -5990,7 +5990,7 @@ For example: &quot;Work&quot; or &quot;P
       <child>
 	<widget class="GtkLabel" id="lblHtmlMail">
 	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">HTML Mail</property>
+	  <property name="label" translatable="yes">HTML Messages</property>
 	  <property name="use_underline">True</property>
 	  <property name="use_markup">False</property>
 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -6424,7 +6424,7 @@ For example: &quot;Work&quot; or &quot;P
 			<widget class="GtkCheckButton" id="photo_show">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Show the photograph of sender in the email preview</property>
+			  <property name="label" translatable="yes">_Show the photograph of sender in the message preview</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -6495,7 +6495,7 @@ For example: &quot;Work&quot; or &quot;P
 	  <child>
 	    <widget class="GtkLabel" id="label524">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Displayed Mail _Headers&lt;/span&gt;</property>
+	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Displayed Message _Headers&lt;/span&gt;</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6804,7 +6804,7 @@ For example: &quot;Work&quot; or &quot;P
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Checks incoming mail messages to be Junk</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Check in_coming mail for junk</property>
+		      <property name="label" translatable="yes">Check in_coming messages for junk</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -6891,7 +6891,7 @@ For example: &quot;Work&quot; or &quot;P
 			<widget class="GtkCheckButton" id="junk_empty_check">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Delete junk mails on e_xit</property>
+			  <property name="label" translatable="yes">Delete junk messages on e_xit</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
Index: mail/em-account-editor.c
===================================================================
--- mail/em-account-editor.c	(revision 34310)
+++ mail/em-account-editor.c	(working copy)
@@ -2053,7 +2053,7 @@ emae_receive_options_item(EConfig *ec, E
 	row = ((GtkTable *)parent)->nrows;
 
 	box = gtk_hbox_new(FALSE, 4);
-	w = gtk_check_button_new_with_mnemonic (_("Automatically check for _new mail every"));
+	w = gtk_check_button_new_with_mnemonic (_("Check for _new messages every"));
 	emae_account_toggle_widget(emae, (GtkToggleButton *)w, E_ACCOUNT_SOURCE_AUTO_CHECK);
 	gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0);
 
@@ -2397,7 +2397,7 @@ static EMConfigItem emae_editor_items[] 
 
 	/* Most sections for this is auto-generated fromt the camel config */
 	{ E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), },
-	{ E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Mail"), },
+	{ E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), },
 	{ E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
 
 	{ E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page },
@@ -2488,7 +2488,7 @@ static EMConfigItem emae_druid_items[] =
 
 	/* Most sections for this is auto-generated fromt the camel config */
 	{ E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), },
-	{ E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Mail"), },
+	{ E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), },
 	{ E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
 
 	{ E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page },
Index: mail/evolution-mail.schemas.in
===================================================================
--- mail/evolution-mail.schemas.in	(revision 34310)
+++ mail/evolution-mail.schemas.in	(working copy)
@@ -250,7 +250,7 @@
          <long>
           Load images for HTML messages over http(s). Possible values are:
           0 - Never load images off the net
-          1 - Load images in mail from contacts
+          1 - Load images in messages from contacts
           2 - Always load images off the net
          </long>
       </locale>
