From 845321ddffa6a90e6aa4bcdd8d8dd584b4c14db2 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Mon, 8 Dec 2003 23:11:19 +0000
Subject: [PATCH] remove ctrl-m's. Thanks to Andre for the patch.

---
 mail/base/content/mailWindowOverlay.xul | 26 ++++++++++++-------------
 mail/base/content/messenger.xul         |  8 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index f0c139e554ae..7364df8477d0 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1687,19 +1687,19 @@
           <menuitem label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" command="cmd_printpreview"/>
         </menupopup>
       </toolbarbutton>
-      
-      <toolbarbutton id="button-mark" type="menu-button" class="toolbarbutton-1" label="&markButton.label;" oncommand="goDoCommand('button_mark')"
-                  observes="button_mark" tooltiptext="&markButton.tooltip;">  
-            <menupopup onpopupshowing="InitMessageMark()">
-                <menuitem type="checkbox" key="key_toggleRead" id="markReadToolbarItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead" />
-                <menuitem label="&markThreadAsReadCmd.label;" key="key_markThreadAsRead" accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
-                <menuitem label="&markReadByDateCmd.label;" key="key_markReadByDate" accesskey="&markReadByDateCmd.accesskey;" command="cmd_markReadByDate"/>
-                <menuitem label="&markAllReadCmd.label;" key="key_markAllRead" accesskey="&markAllReadCmd.accesskey;" observes="cmd_markAllRead"/>
-                <menuseparator/>
-                <menuitem type="checkbox" id="markFlaggedToolbarItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
-            </menupopup>
-      </toolbarbutton>
-
+      
+      <toolbarbutton id="button-mark" type="menu-button" class="toolbarbutton-1" label="&markButton.label;" oncommand="goDoCommand('button_mark')"
+                  observes="button_mark" tooltiptext="&markButton.tooltip;">  
+            <menupopup onpopupshowing="InitMessageMark()">
+                <menuitem type="checkbox" key="key_toggleRead" id="markReadToolbarItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead" />
+                <menuitem label="&markThreadAsReadCmd.label;" key="key_markThreadAsRead" accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
+                <menuitem label="&markReadByDateCmd.label;" key="key_markReadByDate" accesskey="&markReadByDateCmd.accesskey;" command="cmd_markReadByDate"/>
+                <menuitem label="&markAllReadCmd.label;" key="key_markAllRead" accesskey="&markAllReadCmd.accesskey;" observes="cmd_markAllRead"/>
+                <menuseparator/>
+                <menuitem type="checkbox" id="markFlaggedToolbarItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
+            </menupopup>
+      </toolbarbutton>
+
       <toolbarbutton id="button-address" class="toolbarbutton-1" label="&addressBookButton.label;" oncommand="toAddressBook();" tooltiptext="&addressBookButton.tooltip;"/>
 
       <toolbaritem id="throbber-box" align="center" pack="center">
diff --git a/mail/base/content/messenger.xul b/mail/base/content/messenger.xul
index 896d75b2718d..f39740ea30ee 100644
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -265,10 +265,10 @@
                <splitter class="tree-splitter"/>
                <treecol id="subjectCol" persist="hidden ordinal width" flex="7" ignoreincolumnpicker="true"
                         label="&subjectColumn.label;" tooltiptext="&subjectColumn.tooltip;"/>
-               <splitter class="tree-splitter"/>
-               <treecol id="unreadButtonColHeader" persist="hidden ordinal" fixed="true" cycler="true"
-                        class="treecol-image readColumnHeader"
-                        display="&readColumn.label;" tooltiptext="&readColumn.tooltip;"/>
+               <splitter class="tree-splitter"/>
+               <treecol id="unreadButtonColHeader" persist="hidden ordinal" fixed="true" cycler="true"
+                        class="treecol-image readColumnHeader"
+                        display="&readColumn.label;" tooltiptext="&readColumn.tooltip;"/>
                <splitter class="tree-splitter"/>
                <treecol id="senderCol" persist="hidden swappedhidden ordinal width" flex="4" 
                         hidden="false" swappedhidden="true"