From e8b677f2b48c69c4dcc514de6f75d7789acbb2d3 Mon Sep 17 00:00:00 2001
From: "philringnalda%gmail.com" <philringnalda%gmail.com>
Date: Sun, 10 Jun 2007 20:20:49 +0000
Subject: [PATCH] Bug 338753 - Don't confuse 'Sender:'-header with 'From:' in
 quick search, thread columns, patch by Magnus Melin <mkmelin+mozilla@iki.fi>,
 sr=mscott

---
 mail/base/content/SearchDialog.xul                 |  2 +-
 mail/base/content/mailWindowOverlay.js             |  2 +-
 mail/base/content/mailWindowOverlay.xul            |  6 +++---
 mail/base/content/messenger.xul                    |  2 +-
 mail/base/content/searchBar.js                     | 14 +++++++-------
 .../en-US/chrome/messenger/SearchDialog.dtd        |  4 ++--
 mail/locales/en-US/chrome/messenger/messenger.dtd  | 12 ++++++------
 .../en-US/chrome/messenger/messenger.properties    |  2 +-
 mailnews/base/resources/content/commandglue.js     |  2 +-
 .../base/resources/content/mailWindowOverlay.js    |  2 +-
 .../base/resources/content/mailWindowOverlay.xul   |  6 +++---
 mailnews/base/resources/content/threadPane.js      |  2 +-
 mailnews/base/resources/content/threadPane.xul     |  2 +-
 suite/locales/en-US/chrome/mailnews/messenger.dtd  | 10 +++++-----
 .../en-US/chrome/mailnews/messenger.properties     |  2 +-
 suite/locales/en-US/chrome/mailnews/threadpane.dtd |  4 ++--
 16 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/mail/base/content/SearchDialog.xul b/mail/base/content/SearchDialog.xul
index 8aa503e8f18..379dbb47cf9 100644
--- a/mail/base/content/SearchDialog.xul
+++ b/mail/base/content/SearchDialog.xul
@@ -153,7 +153,7 @@
             <splitter class="tree-splitter"/>
             <treecol id="senderCol" persist="hidden swappedhidden ordinal width" flex="4" 
                      hidden="false" swappedhidden="true"
-                     label="&senderColumn.label;" tooltiptext="&senderColumn.tooltip;"/>
+                     label="&fromColumn.label;" tooltiptext="&fromColumn.tooltip;"/>
             <splitter class="tree-splitter"/>
             <treecol id="recipientCol" persist="hidden swappedhidden ordinal width" flex="4" 
                      hidden="true" swappedhidden="false"
diff --git a/mail/base/content/mailWindowOverlay.js b/mail/base/content/mailWindowOverlay.js
index 54937362dcd..4492d01a766 100644
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -256,7 +256,7 @@ function InitViewSortByMenu()
   setSortByMenuItemCheckState("sortByUnreadMenuitem", (sortType == nsMsgViewSortType.byUnread));
   setSortByMenuItemCheckState("sortByTagsMenuitem", (sortType == nsMsgViewSortType.byTags));
   setSortByMenuItemCheckState("sortByJunkStatusMenuitem", (sortType == nsMsgViewSortType.byJunkStatus));
-  setSortByMenuItemCheckState("sortBySenderMenuitem", (sortType == nsMsgViewSortType.byAuthor));
+  setSortByMenuItemCheckState("sortByFromMenuitem", (sortType == nsMsgViewSortType.byAuthor));
   setSortByMenuItemCheckState("sortByRecipientMenuitem", (sortType == nsMsgViewSortType.byRecipient)); 
   setSortByMenuItemCheckState("sortByAttachmentsMenuitem", (sortType == nsMsgViewSortType.byAttachments)); 	
 
diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index e8de5e7c090..1222265dbf9 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1356,7 +1356,7 @@
             <menuitem id="sortByFlagMenuitem" type="radio" name="sortby" label="&sortByStarCmd.label;" accesskey="&sortByStarCmd.accesskey;" oncommand="MsgSortByFlagged()"/>
             <menuitem id="sortByOrderReceivedMenuitem" type="radio" name="sortby" label="&sortByOrderReceivedCmd.label;"  accesskey="&sortByOrderReceivedCmd.accesskey;" oncommand="MsgSortByOrderReceived()"/>
             <menuitem id="sortByPriorityMenuitem" type="radio" name="sortby" label="&sortByPriorityCmd.label;" accesskey="&sortByPriorityCmd.accesskey;" oncommand="MsgSortByPriority()"/>
-            <menuitem id="sortBySenderMenuitem" type="radio" name="sortby" label="&sortBySenderCmd.label;" accesskey="&sortBySenderCmd.accesskey;" oncommand="MsgSortBySender()"/>
+            <menuitem id="sortByFromMenuitem" type="radio" name="sortby" label="&sortByFromCmd.label;" accesskey="&sortByFromCmd.accesskey;" oncommand="MsgSortByFrom()"/>
             <menuitem id="sortByRecipientMenuitem" type="radio" name="sortby" label="&sortByRecipientCmd.label;" accesskey="&sortByRecipientCmd.accesskey;" oncommand="MsgSortByRecipient()"/>
             <menuitem id="sortBySizeMenuitem" type="radio" name="sortby" label="&sortBySizeCmd.label;" accesskey="&sortBySizeCmd.accesskey;" oncommand="MsgSortBySize()"/>
             <menuitem id="sortByStatusMenuitem" type="radio" name="sortby" label="&sortByStatusCmd.label;" accesskey="&sortByStatusCmd.accesskey;" oncommand="MsgSortByStatus()"/>
@@ -2113,9 +2113,9 @@
             <menupopup id="quick-search-menupopup" value="2" persist="value" onpopupshowing="InitQuickSearchPopup();" popupalign="topleft" popupanchor="bottomleft">
               <menuitem value="0" label="&searchSubjectMenu.label;" type="radio"  
                         oncommand="changeQuickSearchMode(this)"/>
-              <menuitem value="1" label="&searchSenderMenu.label;" type="radio" 
+              <menuitem value="1" label="&searchFromMenu.label;" type="radio" 
                         oncommand="changeQuickSearchMode(this)" />
-              <menuitem value="2" label="&searchSubjectOrSenderMenu.label;" type="radio" 
+              <menuitem value="2" label="&searchSubjectOrFromMenu.label;" type="radio" 
                         oncommand="changeQuickSearchMode(this)"/>
               <menuitem value="5" label="&searchRecipient.label;" type="radio" 
                         oncommand="changeQuickSearchMode(this)"/>
diff --git a/mail/base/content/messenger.xul b/mail/base/content/messenger.xul
index 506f24a507f..d5d5ea7c571 100644
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -344,7 +344,7 @@
                <splitter class="tree-splitter"/>
                <treecol id="senderCol" persist="hidden swappedhidden ordinal width" flex="4" 
                         hidden="false" swappedhidden="true"
-                        label="&senderColumn.label;" tooltiptext="&senderColumn.tooltip;"/>
+                        label="&fromColumn.label;" tooltiptext="&fromColumn.tooltip;"/>
                <splitter class="tree-splitter"/>
                <treecol id="recipientCol" persist="hidden swappedhidden ordinal width" flex="4" 
                         hidden="true" swappedhidden="false"
diff --git a/mail/base/content/searchBar.js b/mail/base/content/searchBar.js
index 7409b356148..46f67939094 100644
--- a/mail/base/content/searchBar.js
+++ b/mail/base/content/searchBar.js
@@ -60,8 +60,8 @@ var gNumUnreadMessages;
 // can remember the users last quick search state. If you add values here, you must add
 // them to the end of the list!
 const kQuickSearchSubject = 0;
-const kQuickSearchSender = 1;
-const kQuickSearchSenderOrSubject = 2;
+const kQuickSearchFrom = 1;
+const kQuickSearchFromOrSubject = 2;
 const kQuickSearchBody = 3;
 // const kQuickSearchHighlight = 4; // * We no longer support this quick search mode..*
 const kQuickSearchRecipient = 5;
@@ -427,8 +427,8 @@ function createSearchTerms()
       var term;
       var value;
 
-      // if our search criteria is subject or subject|sender then add a term for the subject
-      if (gSearchInput.searchMode == kQuickSearchSubject || gSearchInput.searchMode == kQuickSearchSenderOrSubject)
+      // if our search criteria is subject or subject|from then add a term for the subject
+      if (gSearchInput.searchMode == kQuickSearchSubject || gSearchInput.searchMode == kQuickSearchFromOrSubject)
       {
         term = gSearchSession.createTerm();
         value = term.value;
@@ -445,7 +445,7 @@ function createSearchTerms()
         // what do we do for news and imap users that aren't configured for offline use?
         // in these cases the body search will never return any matches. Should we try to 
         // see if body is a valid search scope in this particular case before doing the search?
-        // should we switch back to a subject/sender search behind the scenes?
+        // should we switch back to a subject/from search behind the scenes?
         term = gSearchSession.createTerm();
         value = term.value;
         value.str = termList[i];
@@ -456,8 +456,8 @@ function createSearchTerms()
         searchTermsArray.AppendElement(term);       
       }
 
-      // create, fill, and append the sender (or recipient) term
-      if (gSearchInput.searchMode == kQuickSearchSender || gSearchInput.searchMode == kQuickSearchSenderOrSubject)
+      // create, fill, and append the from (or recipient) term
+      if (gSearchInput.searchMode == kQuickSearchFrom || gSearchInput.searchMode == kQuickSearchFromOrSubject)
       {
         term = gSearchSession.createTerm();
         value = term.value;
diff --git a/mail/locales/en-US/chrome/messenger/SearchDialog.dtd b/mail/locales/en-US/chrome/messenger/SearchDialog.dtd
index f55df910124..4627fccd9e9 100644
--- a/mail/locales/en-US/chrome/messenger/SearchDialog.dtd
+++ b/mail/locales/en-US/chrome/messenger/SearchDialog.dtd
@@ -36,7 +36,7 @@
 
 <!-- Thread Pane -->
 <!ENTITY threadColumn.label "Thread">
-<!ENTITY senderColumn.label "Sender">
+<!ENTITY fromColumn.label "From">
 <!ENTITY recipientColumn.label "Recipient">
 <!ENTITY subjectColumn.label "Subject">
 <!ENTITY dateColumn.label "Date">
@@ -57,7 +57,7 @@
 <!-- Thread Pane Tooltips -->
 <!ENTITY columnChooser.tooltip "Click to select columns to display">
 <!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY senderColumn.tooltip "Click to sort by sender">
+<!ENTITY fromColumn.tooltip "Click to sort by from">
 <!ENTITY recipientColumn.tooltip "Click to sort by recipient">
 <!ENTITY subjectColumn.tooltip "Click to sort by subject">
 <!ENTITY dateColumn.tooltip "Click to sort by date">
diff --git a/mail/locales/en-US/chrome/messenger/messenger.dtd b/mail/locales/en-US/chrome/messenger/messenger.dtd
index a0a2b23c9f1..48fdd80d769 100644
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -163,8 +163,8 @@
 <!ENTITY sortByJunkStatusCmd.accesskey "J">
 <!ENTITY sortBySubjectCmd.label "Subject">
 <!ENTITY sortBySubjectCmd.accesskey "b">
-<!ENTITY sortBySenderCmd.label "Sender">
-<!ENTITY sortBySenderCmd.accesskey "n">
+<!ENTITY sortByFromCmd.label "From">
+<!ENTITY sortByFromCmd.accesskey "F">
 <!ENTITY sortByRecipientCmd.label "Recipient">
 <!ENTITY sortByRecipientCmd.accesskey "c">
 <!ENTITY sortByUnreadCmd.label "Read">
@@ -538,15 +538,15 @@
 
 <!-- Quick Search Menu Bar -->
 <!ENTITY searchSubjectMenu.label "Subject">
-<!ENTITY searchSenderMenu.label "Sender">
-<!ENTITY searchSubjectOrSenderMenu.label "Subject or Sender">
+<!ENTITY searchFromMenu.label "From">
+<!ENTITY searchSubjectOrFromMenu.label "Subject or From">
 <!ENTITY searchRecipient.label "To or Cc">
 <!ENTITY searchMessageBody.label "Entire Message">
 <!ENTITY saveAsVirtualFolderMenu.label "Save Search as a Folder...">
 
 <!-- Thread Pane -->
 <!ENTITY threadColumn.label "Thread">
-<!ENTITY senderColumn.label "Sender">
+<!ENTITY fromColumn.label "From">
 <!ENTITY recipientColumn.label "Recipient">
 <!ENTITY subjectColumn.label "Subject">
 <!ENTITY dateColumn.label "Date">
@@ -568,7 +568,7 @@
 <!-- Thread Pane Tooltips -->
 <!ENTITY columnChooser.tooltip "Click to select columns to display">
 <!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY senderColumn.tooltip "Click to sort by sender">
+<!ENTITY fromColumn.tooltip "Click to sort by from">
 <!ENTITY recipientColumn.tooltip "Click to sort by recipient">
 <!ENTITY subjectColumn.tooltip "Click to sort by subject">
 <!ENTITY dateColumn.tooltip "Click to sort by date">
diff --git a/mail/locales/en-US/chrome/messenger/messenger.properties b/mail/locales/en-US/chrome/messenger/messenger.properties
index 54f987e57e1..569ffd19ecb 100644
--- a/mail/locales/en-US/chrome/messenger/messenger.properties
+++ b/mail/locales/en-US/chrome/messenger/messenger.properties
@@ -341,7 +341,7 @@ attachmentDisplayNameFormat=%S %S
 104=Connection to server %S timed out.
 
 recipientSearchCriteria=Subject or Recipient contains:
-senderSearchCriteria=Subject or Sender contains:
+fromSearchCriteria=Subject or From contains:
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
 biffNotification_message=has %1$S new message
diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js
index 406494ca789..048dac5c977 100644
--- a/mailnews/base/resources/content/commandglue.js
+++ b/mailnews/base/resources/content/commandglue.js
@@ -465,7 +465,7 @@ function SetSentFolderColumns(isSentFolder)
   else
   {
     tree.setAttribute("lastfoldersent", "false");
-    searchCriteria.setAttribute("value", gMessengerBundle.getString("senderSearchCriteria"));
+    searchCriteria.setAttribute("value", gMessengerBundle.getString("fromSearchCriteria"));
   }
 }
 
diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js
index c08703eb8f4..50f0d187758 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mailnews/base/resources/content/mailWindowOverlay.js
@@ -229,7 +229,7 @@ function InitViewSortByMenu()
     setSortByMenuItemCheckState("sortByUnreadMenuitem", (sortType == nsMsgViewSortType.byUnread));
     setSortByMenuItemCheckState("sortByTagsMenuitem", (sortType == nsMsgViewSortType.byTags));
     setSortByMenuItemCheckState("sortByJunkStatusMenuitem", (sortType == nsMsgViewSortType.byJunkStatus));
-    setSortByMenuItemCheckState("sortBySenderMenuitem", (sortType == nsMsgViewSortType.byAuthor));
+    setSortByMenuItemCheckState("sortByFromMenuitem", (sortType == nsMsgViewSortType.byAuthor));
     setSortByMenuItemCheckState("sortByRecipientMenuitem", (sortType == nsMsgViewSortType.byRecipient));
     setSortByMenuItemCheckState("sortByAttachmentsMenuitem", (sortType == nsMsgViewSortType.byAttachments));
 
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 2cda87fd744..89833e10e59 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1227,7 +1227,7 @@
           <menuitem id="sortByFlagMenuitem" type="radio" name="sortby" label="&sortByFlagCmd.label;" accesskey="&sortByFlagCmd.accesskey;" oncommand="MsgSortByFlagged()"/>
           <menuitem id="sortByOrderReceivedMenuitem" type="radio" name="sortby" label="&sortByOrderReceivedCmd.label;"  accesskey="&sortByOrderReceivedCmd.accesskey;" oncommand="MsgSortByOrderReceived()"/>
           <menuitem id="sortByPriorityMenuitem" type="radio" name="sortby" label="&sortByPriorityCmd.label;" accesskey="&sortByPriorityCmd.accesskey;" oncommand="MsgSortByPriority()"/>
-          <menuitem id="sortBySenderMenuitem" type="radio" name="sortby" label="&sortBySenderCmd.label;" accesskey="&sortBySenderCmd.accesskey;" oncommand="MsgSortBySender()"/>
+          <menuitem id="sortByFromMenuitem" type="radio" name="sortby" label="&sortByFromCmd.label;" accesskey="&sortByFromCmd.accesskey;" oncommand="MsgSortByFrom()"/>
           <menuitem id="sortByRecipientMenuitem" type="radio" name="sortby" label="&sortByRecipientCmd.label;" accesskey="&sortByRecipientCmd.accesskey;" oncommand="MsgSortByRecipient()"/>
           <menuitem id="sortBySizeMenuitem" type="radio" name="sortby" label="&sortBySizeCmd.label;" accesskey="&sortBySizeCmd.accesskey;" oncommand="MsgSortBySize()"/>
           <menuitem id="sortByStatusMenuitem" type="radio" name="sortby" label="&sortByStatusCmd.label;" accesskey="&sortByStatusCmd.accesskey;" oncommand="MsgSortByStatus()"/>
@@ -1912,8 +1912,8 @@
   </hbox>
 
 <hbox id="searchBox" align="center" flex="1">
-  <label id="searchCriteria" value="&SearchSubjectOrSender.label;" control="searchInput" 
-         accesskey="&SearchSubjectOrSender.accesskey;"/>
+  <label id="searchCriteria" value="&SearchSubjectOrFrom.label;" control="searchInput" 
+         accesskey="&SearchSubjectOrFrom.accesskey;"/>
   <textbox id="searchInput" flex="1" onfocus="this.select();" onclick="this.select();" onkeypress="if (event.keyCode == KeyEvent.DOM_VK_RETURN) this.select();" oncommand="onEnterInSearchBar();" type="timed" timeout="800"/>
   <button id="clearButton" label="&clearButton.label;" disabled="true" tooltiptext="&clearButton.tooltip;" oncommand="onClearSearch();" 
           accesskey="&clearButton.accesskey;"/>
diff --git a/mailnews/base/resources/content/threadPane.js b/mailnews/base/resources/content/threadPane.js
index d92cc659a68..ebe7f3914f6 100644
--- a/mailnews/base/resources/content/threadPane.js
+++ b/mailnews/base/resources/content/threadPane.js
@@ -201,7 +201,7 @@ function MsgSortByDate()
     MsgSortThreadPane(nsMsgViewSortType.byDate);
 }
 
-function MsgSortBySender()
+function MsgSortByFrom()
 {
     MsgSortThreadPane(nsMsgViewSortType.byAuthor);
 }
diff --git a/mailnews/base/resources/content/threadPane.xul b/mailnews/base/resources/content/threadPane.xul
index 692871db66c..6fb2888c123 100644
--- a/mailnews/base/resources/content/threadPane.xul
+++ b/mailnews/base/resources/content/threadPane.xul
@@ -67,7 +67,7 @@
              label="&junkStatusColumn.label;" tooltiptext="&junkStatusColumn.tooltip;"/>
     <splitter class="tree-splitter"/>
     <treecol id="senderCol" persist="ordinal width hidden swappedhidden" flex="4" hidden="false" swappedhidden="true"
-             label="&senderColumn.label;" tooltiptext="&senderColumn.tooltip;"/>
+             label="&fromColumn.label;" tooltiptext="&fromColumn.tooltip;"/>
     <treecol id="recipientCol" persist="ordinal width hidden swappedhidden" flex="4" hidden="true" swappedhidden="false"
              label="&recipientColumn.label;" tooltiptext="&recipientColumn.tooltip;"/>
     <splitter class="tree-splitter"/>
diff --git a/suite/locales/en-US/chrome/mailnews/messenger.dtd b/suite/locales/en-US/chrome/mailnews/messenger.dtd
index 77bff322ce5..953fde38b7e 100644
--- a/suite/locales/en-US/chrome/mailnews/messenger.dtd
+++ b/suite/locales/en-US/chrome/mailnews/messenger.dtd
@@ -184,7 +184,7 @@
 <!ENTITY sortByDateCmd.label "Date">
 <!ENTITY sortByDateCmd.accesskey "e">
 <!ENTITY sortByFlagCmd.label "Flag">
-<!ENTITY sortByFlagCmd.accesskey "F">
+<!ENTITY sortByFlagCmd.accesskey "l">
 <!ENTITY sortByPriorityCmd.label "Priority">
 <!ENTITY sortByPriorityCmd.accesskey "P">
 <!ENTITY sortBySizeCmd.label "Size">
@@ -197,8 +197,8 @@
 <!ENTITY sortByJunkStatusCmd.accesskey "J">
 <!ENTITY sortBySubjectCmd.label "Subject">
 <!ENTITY sortBySubjectCmd.accesskey "S">
-<!ENTITY sortBySenderCmd.label "Sender">
-<!ENTITY sortBySenderCmd.accesskey "n">
+<!ENTITY sortByFromCmd.label "From">
+<!ENTITY sortByFromCmd.accesskey "F">
 <!ENTITY sortByRecipientCmd.label "Recipient">
 <!ENTITY sortByRecipientCmd.accesskey "c">
 <!ENTITY sortByUnreadCmd.label "Read">
@@ -557,8 +557,8 @@
 
 <!---SearchBar-->
 <!-- also used by addressbook -->
-<!ENTITY SearchSubjectOrSender.label "Subject or Sender contains:">
-<!ENTITY SearchSubjectOrSender.accesskey "S">
+<!ENTITY SearchSubjectOrFrom.label "Subject or From contains:">
+<!ENTITY SearchSubjectOrFrom.accesskey "S">
 <!ENTITY SearchNameOrEmail.label "Name or Email contains:">
 <!ENTITY SearchNameOrEmail.accesskey "N">
 <!ENTITY advancedButton.label "Advanced...">
diff --git a/suite/locales/en-US/chrome/mailnews/messenger.properties b/suite/locales/en-US/chrome/mailnews/messenger.properties
index d264a6efb4b..0e2346d2208 100644
--- a/suite/locales/en-US/chrome/mailnews/messenger.properties
+++ b/suite/locales/en-US/chrome/mailnews/messenger.properties
@@ -334,7 +334,7 @@ attachmentDisplayNameFormat=%S %S
 104=Connection to server %S timed out.
 
 recipientSearchCriteria=Subject or Recipient contains:
-senderSearchCriteria=Subject or Sender contains:
+fromSearchCriteria=Subject or From contains:
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
 biffNotification_message=has %1$S new message
diff --git a/suite/locales/en-US/chrome/mailnews/threadpane.dtd b/suite/locales/en-US/chrome/mailnews/threadpane.dtd
index d8d9de27f41..6ca7143bc46 100644
--- a/suite/locales/en-US/chrome/mailnews/threadpane.dtd
+++ b/suite/locales/en-US/chrome/mailnews/threadpane.dtd
@@ -36,7 +36,7 @@
  ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY threadColumn.label "Thread">
-<!ENTITY senderColumn.label "Sender">
+<!ENTITY fromColumn.label "From">
 <!ENTITY recipientColumn.label "Recipient">
 <!ENTITY attachmentColumn.label "Attachments">
 <!ENTITY subjectColumn.label "Subject">
@@ -58,7 +58,7 @@
 <!--Tooltips-->
 <!ENTITY columnChooser.tooltip "Click to select columns to display">
 <!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY senderColumn.tooltip "Click to sort by sender">
+<!ENTITY fromColumn.tooltip "Click to sort by from">
 <!ENTITY recipientColumn.tooltip "Click to sort by recipient">
 <!ENTITY attachmentColumn.tooltip "Click to sort by attachments">
 <!ENTITY subjectColumn.tooltip "Click to sort by subject">