Bug #227251 --> Fix default columns in search addresses window, only show a couple not all of them. Haven't decided if we are going to collapse all the overlays in this dialog yet. More work may come. CVS: ----------------------------------------------------------------------

mail/base/content/ABSearchDialog.xul

@@ -99,13 +99,89 @@
       </hbox>
     </vbox>
 
-    <splitter id="gray_horizontal_splitter" collapse="after" persist="state">
-      <grippy/>
-    </splitter>
+    <splitter id="gray_horizontal_splitter" collapse="after" persist="state"/>
 
     <vbox flex="1">
       <vbox id="searchResultListBox" flex="1" >
-       <tree id="abResultsTree" flex="1" persist="height" context="threadPaneContext"/>
+        <tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain"
+              context="threadPaneContext"
+              onclick="AbResultsPaneOnClick(event);"
+              onselect="this.view.selectionChanged();"
+              sortCol="GeneratedName"
+              persist="sortCol height">
+
+          <treecols id="abResultsTreeCols">
+          <!-- these column ids must match up to the mork column names, except for GeneratedName, see nsIAddrDatabase.idl -->
+          <treecol id="GeneratedName" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" flex="1" 
+                   label="&GeneratedName.label;" primary="true"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="PrimaryEmail" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection"  flex="1" label="&PrimaryEmail.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="_AimScreenName" class="sortDirectionIndicator" 
+                   hidden="true"
+                   persist="hidden ordinal width sortDirection"  flex="1" label="&ScreenName.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="Company" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" flex="1" label="&Company.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="NickName" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" 
+                   hidden="true"
+                   flex="1" label="&NickName.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="SecondEmail" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" 
+                   hidden="true"
+                   flex="1" label="&SecondEmail.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="Department" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection"  
+                   hidden="true"
+                   flex="1" label="&Department.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="JobTitle" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" 
+                   hidden="true"
+                   flex="1" label="&JobTitle.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="CellularNumber" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" 
+                   hidden="true"
+                   flex="1" label="&CellularNumber.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="PagerNumber" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" 
+                   hidden="true"
+                   flex="1" label="&PagerNumber.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="FaxNumber" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" 
+                   hidden="true"
+                   flex="1" label="&FaxNumber.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="HomePhone" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection" 
+                   hidden="true"
+                   flex="1" label="&HomePhone.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="WorkPhone" class="sortDirectionIndicator" 
+                   persist="hidden ordinal width sortDirection"
+                   flex="1" label="&WorkPhone.label;"/>
+
+          <!-- LOCALIZATION NOTE: _PhoneticName may be enabled for Japanese builds. -->
+          <!--
+            <treecol id="_PhoneticName" class="sortDirectionIndicator" 
+                     persist="hidden ordinal width sortDirection" 
+                     hidden="true"
+                     flex="1" label="&_PhoneticName.label;"/>
+            <splitter class="tree-splitter"/>
+           -->
+
+          </treecols>
+          <treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
+        </tree>
       </vbox>
       <hbox align="start">
         <button label="&propertiesButton.label;" id="propertiesButton" oncommand="onProperties()" accesskey="&propertiesButton.accesskey;" disabled="true"/>