From 86157e730f47e3eb21fb36718608f00bf6da2f8e Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Thu, 4 Jan 2001 00:57:58 +0000
Subject: [PATCH] Show "mark" toolbar button and hide the "delete" toolbar
 button when reading news.  When reading mail, hide "mark" and show "delete".
 (#63635)

When reading news, turn "Edit | Delete Message" into "Edit | Cancel Message" (#8293)

When reading news, turn "Edit | Delete Folder" into "Edit | Unsubscribe" (#64205)

this checkin exposes a few UI bugs.  logging then now.

sr=bienvenu
---
 .../base/resources/content/commandglue.js     |   4 +-
 .../content/mail3PaneWindowCommands.js        |  39 ++++++++-
 .../resources/content/mailWindowOverlay.js    |  74 +++++++++++++-----
 .../resources/content/mailWindowOverlay.xul   |  14 +++-
 .../base/resources/content/messageWindow.js   |   7 +-
 .../resources/content/msgMail3PaneWindow.js   |   3 +
 .../base/resources/locale/en-US/messenger.dtd |   6 +-
 themes/classic/jar.mn                         |   4 +
 themes/classic/messenger/mac/messenger.css    |  21 +++++
 ...mark-hover-active.gif => mark-clicked.gif} | Bin
 themes/classic/messenger/win/messenger.css    |  21 +++++
 themes/modern/jar.mn                          |   4 +
 themes/modern/messenger/mark-clicked.gif      | Bin 0 -> 1638 bytes
 themes/modern/messenger/mark-disabled.gif     | Bin 0 -> 1360 bytes
 themes/modern/messenger/mark-hover.gif        | Bin 0 -> 1383 bytes
 themes/modern/messenger/mark.gif              | Bin 0 -> 1349 bytes
 themes/modern/messenger/messenger.css         |  24 +++++-
 17 files changed, 190 insertions(+), 31 deletions(-)
 rename themes/classic/messenger/{mark-hover-active.gif => mark-clicked.gif} (100%)
 create mode 100644 themes/modern/messenger/mark-clicked.gif
 create mode 100644 themes/modern/messenger/mark-disabled.gif
 create mode 100644 themes/modern/messenger/mark-hover.gif
 create mode 100644 themes/modern/messenger/mark.gif

diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js
index d73a7eee0b54..116c3ceb3352 100644
--- a/mailnews/base/resources/content/commandglue.js
+++ b/mailnews/base/resources/content/commandglue.js
@@ -223,11 +223,11 @@ function ChangeFolderByURI(uri, isThreaded, sortID, sortDirection, viewType)
 
 function isNewsURI(uri)
 {
-    if (uri[0] != 'n') {
+    if (!uri || uri[0] != 'n') {
         return false;
     }
     else {
-        return (uri.substring(0,6) == "news:/");
+        return ((uri.substring(0,6) == "news:/") || (uri.substring(0,14) == "news_message:/"));
     }
 }
 
diff --git a/mailnews/base/resources/content/mail3PaneWindowCommands.js b/mailnews/base/resources/content/mail3PaneWindowCommands.js
index 39a857dfd5f2..d81ad0874e27 100644
--- a/mailnews/base/resources/content/mail3PaneWindowCommands.js
+++ b/mailnews/base/resources/content/mail3PaneWindowCommands.js
@@ -64,6 +64,11 @@ var FolderPaneController =
                     	specialFolder = selectedFolder.getAttribute('SpecialFolder');
                     	isServer = selectedFolder.getAttribute('IsServer');
 						serverType = selectedFolder.getAttribute('ServerType');
+            
+                        if (serverType == "nntp") {
+				            if ( command == "cmd_delete" )
+					            goSetMenuValue(command, 'valueNewsgroup');
+                        }
 					}
 					catch (ex) {
 						//dump("specialFolder failure: " + ex + "\n");
@@ -255,10 +260,25 @@ var DefaultController =
 
 				if ( command == "cmd_delete")
 				{
-					if ( numSelected < 2 )
-						goSetMenuValue(command, 'valueMessage');
-					else
-						goSetMenuValue(command, 'valueMessages');
+                    var uri = GetUriForFirstSelectedMessage();
+
+					if ( numSelected < 2 ) {
+                        if (isNewsURI(uri)) {
+						    goSetMenuValue(command, 'valueNewsMessage');    
+                        }
+                        else {
+						    goSetMenuValue(command, 'valueMessage');
+                        }
+                    }
+					else {
+                        if (isNewsURI(uri)) {
+						    goSetMenuValue(command, 'valueNewsMessage');    
+                            return false;
+                        }
+                        else {
+						    goSetMenuValue(command, 'valueMessages');
+                        }
+                    }
 				}
 				return ( numSelected > 0 );
 			case "cmd_nextMsg":
@@ -479,6 +499,17 @@ function MailAreaHasFocus()
 	return true;
 }
 
+function GetUriForFirstSelectedMessage()
+{
+    try {
+	    var threadTree = GetThreadTree();
+        return threadTree.selectedItems[0].getAttribute('id');
+    }
+    catch (ex) {
+        return null;
+    }
+}
+
 function GetNumSelectedMessages()
 {
 	var threadTree = GetThreadTree();
diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js
index f9e6a90740a9..de8922d9092d 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mailnews/base/resources/content/mailWindowOverlay.js
@@ -117,7 +117,6 @@ function InitMessageMenu()
     var copyMenu = document.getElementById("copyMenu");
     if(copyMenu)
         copyMenu.setAttribute("disabled", !aMessage);
-
 }
 
 function GetMessageType(message)
@@ -131,23 +130,31 @@ function GetMessageType(message)
 
 }
 
-function InitMessageMarkMenu()
+function InitMessageMark()
 {
-    InitMarkReadMenuItem();
-    InitMarkFlaggedMenuItem();
-
+    InitMarkReadItem("markReadMenuItem");
+    InitMarkReadItem("markReadToolbarItem");
+    InitMarkFlaggedItem("markFlaggedMenuItem");
+    InitMarkFlaggedItem("markFlaggedToolbarItem");
 }
 
-function InitMarkReadMenuItem()
+function InitMarkReadItem(id)
 {
-
-    areMessagesRead = SelectedMessagesAreRead();
-
-    var markReadMenuItem = document.getElementById("markReadMenuItem");
-    if(markReadMenuItem)
-        markReadMenuItem.setAttribute("checked", areMessagesRead);
+    var areMessagesRead = SelectedMessagesAreRead();
+    var item = document.getElementById(id);
+    if(item)
+        item.setAttribute("checked", areMessagesRead);
 }
 
+function InitMarkFlaggedItem(id)
+{
+    var areMessagesFlagged = SelectedMessagesAreFlagged();
+    var item = document.getElementById(id);
+    if(item)
+        item.setAttribute("checked", areMessagesFlagged);
+}
+
+
 function SelectedMessagesAreRead()
 {
     var aMessage = GetSelectedMessage(0);
@@ -169,15 +176,6 @@ function SelectedMessagesAreRead()
     return areMessagesRead;
 }
 
-function InitMarkFlaggedMenuItem()
-{
-    areMessagesFlagged = SelectedMessagesAreFlagged();
-
-    var markFlaggedMenuItem = document.getElementById("markFlaggedMenuItem");
-    if(markFlaggedMenuItem)
-        markFlaggedMenuItem.setAttribute("checked", areMessagesFlagged);
-}
-
 function SelectedMessagesAreFlagged()
 {
     var aMessage = GetSelectedMessage(0);
@@ -804,6 +802,40 @@ function IsCompactFolderEnabled()
     return IsMailFolderSelected();
 }
 
+var gDeleteButton = null;
+var gMarkButton = null;
+
+function SetUpToolbarButtons(uri)
+{
+    // dump("SetUpToolbarButtons("+uri+")\n");
+
+    // eventually, we might want to set up the toolbar differently for imap,
+    // pop, and news.  for now, just tweak it based on if it is news or not.
+    var forNews = isNewsURI(uri);
+
+    if(!gMarkButton) gMarkButton = document.getElementById("button-mark");
+    if(!gDeleteButton) gDeleteButton = document.getElementById("button-delete");
+    
+    var buttonToHide = null;
+    var buttonToShow = null;
+
+    if (forNews) {
+        buttonToHide = gDeleteButton;
+        buttonToShow = gMarkButton;
+    }
+    else {
+        buttonToHide = gMarkButton;
+        buttonToShow = gDeleteButton;
+    }
+
+    if (buttonToHide) {
+        buttonToHide.setAttribute('hidden',true);
+    }
+    if (buttonToShow) {
+        buttonToShow.removeAttribute('hidden');
+    }
+}
+
 function MsgMarkByDate() {}
 function MsgOpenAttachment() {}
 function MsgUpdateMsgCount() {}
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 02b2771b4d07..5ea771fa2299 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -64,7 +64,9 @@ Rights Reserved.
 	<broadcaster id="cmd_paste"/>
 	<broadcaster id="cmd_delete"
 				 valueFolder="&deleteFolderCmd.label;"
+                 valueNewsgroup="&unsubscribeNewsgroupCmd.label;"
 				 valueMessage="&deleteMsgCmd.label;"
+                 valueNewsMessage="&cancelNewsMsgCmd.label;"
 				 valueMessages="&deleteMsgsCmd.label;"/>
 	<broadcaster id="button_delete"/>
 	<broadcaster id="cmd_selectAll"/>
@@ -983,7 +985,7 @@ Rights Reserved.
 			</template>
 		</menu>
 		<menuseparator/>
-		<menu value="&markMenu.label;" accesskey="&markMenu.accesskey;" oncreate="InitMessageMarkMenu()">
+		<menu value="&markMenu.label;" accesskey="&markMenu.accesskey;" oncreate="InitMessageMark()">
 			<menupopup>
 				<menuitem type="checkbox" key="key_toggleRead" id="markReadMenuItem" value="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead"/>
 				<menuitem value="&markThreadAsReadCmd.label;"  accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
@@ -1076,6 +1078,16 @@ Rights Reserved.
 			</menu>
 			<button class="button-toolbar-2 top" id="button-next" value="&nextButton.label;"  tooltip="aTooltip" tooltiptext="&nextButton.tooltip;" observes="cmd_nextUnreadMsg"/>
 			<button class="button-toolbar-2 top" id="button-delete" value="&deleteButton.label;"  tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
+      <menubutton class="menubutton-dual toolbar top" id="button-mark" value="&markButton.label;" hidden="true"
+                  crop="right" observes="cmd_markAsRead" tooltip="aTooltip" buttontooltiptext="&markButton.tooltip;">  
+            <menupopup oncreate="InitMessageMark()">
+                <menuitem type="checkbox" key="key_toggleRead" id="markReadToolbarItem" value="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead" default="true" />
+                <menuitem value="&markThreadAsReadCmd.label;"  accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
+                <menuitem value="&markAllReadCmd.label;" key="key_markAllRead" accesskey="&markAllReadCmd.accesskey;" observes="cmd_markAllRead"/>
+                <menuseparator/>
+                <menuitem type="checkbox" id="markFlaggedToolbarItem" value="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
+            </menupopup>
+  	  </menubutton>
       <menubutton class="menubutton-dual toolbar top" id="button-print" value="&printButton.label;" 
                   crop="right" observes="cmd_print" tooltip="aTooltip" buttontooltiptext="&printButton.tooltip;">  
      	  <menupopup id="printMenu">
diff --git a/mailnews/base/resources/content/messageWindow.js b/mailnews/base/resources/content/messageWindow.js
index d59e1e11ee32..1c3cf61d67ba 100644
--- a/mailnews/base/resources/content/messageWindow.js
+++ b/mailnews/base/resources/content/messageWindow.js
@@ -416,7 +416,12 @@ var MessageWindowController =
 			case "cmd_file":
 				if ( command == "cmd_delete")
 				{
-					goSetMenuValue(command, 'valueMessage');
+                    if (isNewsURI(gCurrentMessageUri)) {
+					    goSetMenuValue(command, 'valueNewsMessage');
+                    }
+                    else {
+					    goSetMenuValue(command, 'valueMessage');
+                    }
 				}
 				return ( gCurrentMessageUri != null);
 			case "cmd_getNewMessages":
diff --git a/mailnews/base/resources/content/msgMail3PaneWindow.js b/mailnews/base/resources/content/msgMail3PaneWindow.js
index b424430b3aa8..0c6efec6406d 100644
--- a/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -104,6 +104,9 @@ var folderListener = {
 			{
 				var uri = resource.Value;
 				dump("In OnFolderLoaded for " + uri +"\n");
+
+                SetUpToolbarButtons(uri);
+
 				if(uri == gCurrentFolderToReroot)
 				{
 					gCurrentFolderToReroot="";
diff --git a/mailnews/base/resources/locale/en-US/messenger.dtd b/mailnews/base/resources/locale/en-US/messenger.dtd
index 9d22ba77c0ed..c186134c6898 100644
--- a/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -78,8 +78,10 @@ Rights Reserved.
 
 <!-- Edit Menu -->
 <!ENTITY deleteMsgCmd.label "Delete Message">  
+<!ENTITY cancelNewsMsgCmd.label "Cancel Message">  
 <!ENTITY deleteMsgsCmd.label "Delete Selected Messages">  
 <!ENTITY deleteFolderCmd.label "Delete Folder">  
+<!ENTITY unsubscribeNewsgroupCmd.label "Unsubscribe">
 <!ENTITY selectMenu.label "Select">  
 <!ENTITY selectMenu.accesskey "l">  
 <!ENTITY selectThreadCmd.label ".Thread">  
@@ -333,7 +335,7 @@ Rights Reserved.
 <!ENTITY markAsUnreadCmd.accesskey "u">  
 <!ENTITY markThreadAsReadCmd.label "Thread As Read">  
 <!ENTITY markThreadAsReadCmd.accesskey "t">  
-<!ENTITY markByDateCmd.label ".by Date...">  
+<!ENTITY markByDateCmd.label "by Date...">  
 <!ENTITY markByDateCmd.accesskey "d">  
 <!ENTITY markAllReadCmd.label "All Read">  
 <!ENTITY markAllReadCmd.accesskey "a">  
@@ -356,6 +358,7 @@ Rights Reserved.
 <!ENTITY fileButton.label "File">  
 <!ENTITY nextButton.label "Next">  
 <!ENTITY deleteButton.label "Delete">  
+<!ENTITY markButton.label "As Read">
 <!ENTITY printButton.label "Print">  
 <!ENTITY stopButton.label "Stop">  
 
@@ -368,6 +371,7 @@ Rights Reserved.
 <!ENTITY fileButton.tooltip "File selected message"> 
 <!ENTITY nextButton.tooltip "Move to the next unread message"> 
 <!ENTITY deleteButton.tooltip "Delete selected message or folder"> 
+<!ENTITY markButton.tooltip "Mark messages">
 <!ENTITY printButton.tooltip "Print this message"> 
 <!ENTITY stopButton.tooltip "Stop the current transfer"> 
 
diff --git a/themes/classic/jar.mn b/themes/classic/jar.mn
index 2582ac5d1a98..ece56e39d491 100644
--- a/themes/classic/jar.mn
+++ b/themes/classic/jar.mn
@@ -362,6 +362,10 @@ classic.jar:
     skin/classic/messenger/local-mailhost.gif                            (messenger/local-mailhost.gif)
     skin/classic/messenger/mailfolder.gif                                (messenger/mailfolder.gif)
     skin/classic/messenger/mailheader.css                                (messenger/mailheader.css)
+    skin/classic/messenger/mark-clicked.gif                              (messenger/mark-clicked.gif)
+    skin/classic/messenger/mark-disabled.gif                             (messenger/mark-disabled.gif)
+    skin/classic/messenger/mark-hover.gif                                (messenger/mark-hover.gif)
+    skin/classic/messenger/mark.gif                                      (messenger/mark.gif)
     skin/classic/messenger/message-mail-attach.gif                       (messenger/message-mail-attach.gif)
     skin/classic/messenger/message-mail-imapdelete.gif                   (messenger/message-mail-imapdelete.gif)
     skin/classic/messenger/message-mail-new.gif                          (messenger/message-mail-new.gif)
diff --git a/themes/classic/messenger/mac/messenger.css b/themes/classic/messenger/mac/messenger.css
index c55b7067dd88..fce68b4b1edb 100644
--- a/themes/classic/messenger/mac/messenger.css
+++ b/themes/classic/messenger/mac/messenger.css
@@ -76,6 +76,27 @@
     list-style-image      : url("chrome://messenger/skin/newmsg-hover-active.gif");
   } 
 
+#button-mark {
+	list-style-image	: url("chrome://messenger/skin/mark.gif");
+}
+
+#button-mark[disabled="true"],
+#button-mark[disabled="true"]:hover,
+#button-mark[disabled="true"]:hover:active
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-disabled.gif");
+  } 
+
+#button-mark:hover
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-hover.gif");
+  } 
+
+#button-mark:hover:active
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-clicked.gif");
+  } 
+
 #button-reply 
   {
 	  list-style-image      : url("chrome://messenger/skin/reply.gif");
diff --git a/themes/classic/messenger/mark-hover-active.gif b/themes/classic/messenger/mark-clicked.gif
similarity index 100%
rename from themes/classic/messenger/mark-hover-active.gif
rename to themes/classic/messenger/mark-clicked.gif
diff --git a/themes/classic/messenger/win/messenger.css b/themes/classic/messenger/win/messenger.css
index a290d7c689b2..9994e9b5297d 100644
--- a/themes/classic/messenger/win/messenger.css
+++ b/themes/classic/messenger/win/messenger.css
@@ -54,6 +54,27 @@
     list-style-image      : url("chrome://messenger/skin/getmsg-hover-active.gif");
   } 
 
+#button-mark {
+	list-style-image	: url("chrome://messenger/skin/mark.gif");
+}
+
+#button-mark[disabled="true"],
+#button-mark[disabled="true"]:hover,
+#button-mark[disabled="true"]:hover:active
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-disabled.gif");
+  } 
+
+#button-mark:hover
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-hover.gif");
+  } 
+
+#button-mark:hover:active
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-clicked.gif");
+  } 
+
 #button-newmsg 
   {
 	  list-style-image      : url("chrome://messenger/skin/newmsg.gif");
diff --git a/themes/modern/jar.mn b/themes/modern/jar.mn
index c3389d3522d5..d66fe2709e27 100644
--- a/themes/modern/jar.mn
+++ b/themes/modern/jar.mn
@@ -425,6 +425,10 @@ modern.jar:
     skin/modern/messenger/local-mailhost.gif                          (messenger/local-mailhost.gif)
     skin/modern/messenger/mailfolder.gif                              (messenger/mailfolder.gif)
     skin/modern/messenger/mailheader.css                              (messenger/mailheader.css)
+    skin/modern/messenger/mark-clicked.gif                            (messenger/mark-clicked.gif)
+    skin/modern/messenger/mark-disabled.gif                           (messenger/mark-disabled.gif)
+    skin/modern/messenger/mark-hover.gif                              (messenger/mark-hover.gif)
+    skin/modern/messenger/mark.gif                                    (messenger/mark.gif)
     skin/modern/messenger/message-mail-attach.gif                     (messenger/message-mail-attach.gif)
     skin/modern/messenger/message-mail-imapdelete.gif                 (messenger/message-mail-imapdelete.gif)
     skin/modern/messenger/message-mail-new.gif                        (messenger/message-mail-new.gif)
diff --git a/themes/modern/messenger/mark-clicked.gif b/themes/modern/messenger/mark-clicked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bbbf23381d9de6598b9cff2c4f22dc3461b5643d
GIT binary patch
literal 1638
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

literal 0
HcmV?d00001

diff --git a/themes/modern/messenger/mark-disabled.gif b/themes/modern/messenger/mark-disabled.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b1a55334293d716e24f93520c68add8f40880c2d
GIT binary patch
literal 1360
zcmd7Rc~6rE0D$qg0#ei|mkNv^Oq}SdA#52e#toqyrGQXMp|quM>04-N3%w5ur8jM9
z>09VUTaI!T<WzL?Vim=TSvH-^Ok6aIY&w=@nwgj^i!OePJ)hwB&r^aa&da5x0cpS+
z0C)$yBTKzxsjo#dZl73D^e?Gg%f`V=&S1zodR6DWD1#Tgvo}h?u2N71DuyUBKbod4
zrF99db3+Tan$I}tT>*|^DscWbL*8FXQx!L9FbrKGRfXr6m<kt`u7PBIG%-w<+6x+$
z#CA)g*um^{Rk6$!3~i&Z_jHTCfoG{}>oE*0*0dTysiTTzs%^7jXlk}@5Z?}0b9<{<
zrhJN$uOF^r_u$x;dV#&3XRG7E<t+wmvz{ch6S(G9?I=m?l9<Nu?Y-4(Q=`H`72C?1
z)Wvjd1<QQ8)mX!^)bZ??CQT_#P2kz3<}td$Gk#&6p&BLgt>uuGDsz%VeFQ#Ck@SNd
zgMoA5YNj3(+bS6PN@h2SZ{=!7hypuV;x_uf#zI;`o2`hZ!E<d50vJ*bVIUp0rMrP=
z#X=g2#Ek~kXi(K4_E5yG+IDzgCe+;FrpSF*hOR;6!Z7qL3MW<O78ysqXG6tJTDf(c
zBJAyigX}JEWsAOsZP9xcb?$lB)Jna;sjvkJZB~-Ri)%IG*w!|UpQi9~R9@%gir%|i
z!?xB7T}<Twqr(k#`sxLJa@$Nfq-&J><(6@xsGlfw;aEnoF~HRh3k<_Vp;K;|Ahg>c
zc|VD7!!Qgg=aRxUNmmXr)uZ)7r_eao8@LS0{gBMj)i<MbEKn7LgY&C+PEQ@*F}ScM
zwoH*Fo(6%Pqw#aqz6zG9NiodR`azk`=sQmmIZNm|v;TZ$vmW?=hkDO@{{nz~3m}lG
zrLb|&VR-kWZ=PoEjnl*)-0cX=s@HmwPOigQ_WNlu>4oOR<ZyIY?M@AfR2vwTJ9~J<
zvlPF!p0uC-QoWuqnT-D8P%$pKsO*QaY<f{OtN+Py=cko1p0W!wwTPAcAh|Hsy8QzS
zY}OyyVcwn<G12je?>rix$(?#k{3P2Fk6KQD@n|RFerjr7<jIXIQV#_MnAL#&H}$jd
zo~^qXrv@U=orVt_AfdvQ=0q;am^N2Z(S1Kie427H<>%))-x6k%@~>QUei<kD<NIsl
z*gqd$Cgg3snh5`eAUxi@cs(;W;lrz)@0$N+;NktJjx!$|=iD%)>=(V2J>Uln(%fGz
zw4Zsks*6rY*a$xlW#BswzP8@%DxxYoj;39G^LSfieBSzjs5V4oEGaSXW^7bEawIw%
zxm1QoY7S=X`Rd=0){wrhDq|P4d{=|WnhcKaYcdA(=Ij)pWT#hzD~P$4HS(<Ygy0@J
zf&4OS^H}bkZ9oQUlOO6U&ly;YD}nB9Izo#f%^|>%b1P{s^U1Gn>W}#m9%zWaws!#e
zS<jB6!Ge&Fck9TM-?7O0F5jAINAE_y{{8u|>Yo^761WN2Gd?m_MMhXY-+D2&E78t8
z7WWEw9eFUa@cN`*@^JcyhfrlgUy4mwot_6rwq|A@3Rb6c4?p4K_68x4z5Q_F#_GJe
s{AqYD8OE()BBFANqHceD7Im%<Rlq?vW=7nJ{t2g8O*hH-xP0Kmf5JW+f&c&j

literal 0
HcmV?d00001

diff --git a/themes/modern/messenger/mark-hover.gif b/themes/modern/messenger/mark-hover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6403059ed37f38caf637c50e3f8a44808f54cb3c
GIT binary patch
literal 1383
zcmV-t1(^CrNk%v~VIBY;0QUd@{{a6lOl#-=|I+O2+Vb+{{r%?t{@wQWqrbng%*^2U
z__oo}tH;OV`}@4s*4FRurNO~EQE<WA+gEFd#oymLQE|%T<j&~mYKENf|NlBta9M1L
zR%(S?caB(ei_7BZMO}O8|Nm@=oH<r=J5zE;UVJ=MbDFfmI#O{~a*9`Tia}a?LRoiA
zW{E*sd`)A3Kv;KKZiz-;fkIk)i>I(=dy}@%*I<2+Jymp1W`<E{hLoqiI8}03bCIIF
z#zb3sL|uNEs=>qC;!k9NT6T?VhniJsgj{%!?En8rVS-t8jB0<FOJjqeyuP>2*QUV6
zcao)GbdI>r*s#mcPGo>#caTwMgG*?EvB=U(VSh<ugr>gBfSRsKV}qc%#&?aWR&9zt
zR&-r*j67C$LtKAyhn+oDc1>x6XndDOUVMI;tV&>hJX3N<Uw?<8vSN3VnX$o$p0Jv*
zzpcm3xYE>Kbdx?-cZHm<f}E&9S$0uofxFV%PG^dWq_9Y0hEZvbLSK4WZHP){e?we;
zug1|sT6%SlpFCA`KUjB5VScB-%c;Z3nYFo$qP3K+y+>h#Yk-)5nyRC^$xUK^M__?T
zVS!X=gG5|^KUa5+pSMb9fV$G#WqXu$kfgfP+C^T0?f?I?&CgP1f{>%R;raUR|NmTa
zi;beSW`UWIq`be{+MKw*PiBKvX@-raw`P5npu50bcZ_<Ds9A4}f}N~PWP`HJ&_P{z
zh?=yhz|4Z0u$8d8s=>}sW`VHB(r|{HuE@@UovnJ7r+km7LtA{S!p~`fmE!vQp18$3
zQ*%gQeP();WO|o)l%<TGw@zk>JXLe(|NrX$|G3ZDYJr}Rth3PQ>xrAR#NOasaEeoB
zgGyn3YJQk%ewl26oN$Gkp}fL?l(4|s+-QTG<@^1YvA=hVrCxNBVRVm9YJ+@|r*w~^
zsl&=&bB|nbjqCsaJ5q9;w!{Dc0000000000000000000000000000000000000000
z0000000000EC2ui03HAy000R7009UbNU%i`AjA;Om;r=R3xW_M4wQi@g2js%&B%}_
zQOg(&AbVgKNwNn>4bYNs9C)dMOAIs+$ebyY#yU1GU94PT5mhysKxZ<-U~z>+GA=tc
zfxxt>)2G66LiFPj3WKXyvuedk3toj!1P_rIm!PcKvuM%cF_CQGBNVY#EtpG}?u{FD
z^TINLVvs;PB-A(<On5N3TLA(H3RSqU8xlAG{J~)in1suiB|PDgII$)=nK837WP;DL
zJdr4<UQJ;U=gx_**kY|(Ri7|jn84s-p|@{wfMCNOF~_%WM=;t{Vo~mbbLZI3Brc*N
zv5F#zM@)I{92tv3wMzb+7(kwUy2K&|cu4GFfQann$=mqxBS)I?@zIlCAE5n!U5Ujv
zfDIskkb^SuJfNV0!8Eg=5{W6XpbtJQsGuhW>QDk41a#=(heRYs#D^pj;6({K)WM1_
z2ejzoiyb7^!HYB=;L0{&P_xD>)+pfPk3Ys3KnFk;sQ@QgFarP;FXYm|lTbo=L}Euo
zX{91BB=Q9S=U8z^0bqtHW(p~YX=VZHOfri=;S6EQ76!yA=bUuXS&SG%$TE;Oy;QM>
z0DuN6D4@|GQ3@y_2(Za7db|OVJK8`Z#h`<Rkin%HNHa|tqO=lGDiat{gD<2UL#Y7o
zV2T7G-&isME>04Sf({2Y#DT@B0)#-06LN51L=4WX6ht>11QJCfk_hp^vL6V+%PHA#
pz`-&>tTa$2XiT8(w%lsl&NbFXw8JpmY+$arF)U%u4l4x&06S1Tn2G=Z

literal 0
HcmV?d00001

diff --git a/themes/modern/messenger/mark.gif b/themes/modern/messenger/mark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4dea8d3ab663f14e0b9e24a5728ea9cbc7cd8d4e
GIT binary patch
literal 1349
zcma*m|2xwO0KoClC3K0}bA9h9&y(w^r0=n67^Z}o*`}FoG^}E_-KLp+`^?(L80Ooo
z4V&4d#SlGL8jH#`k3u?85!V;><mu4!)MfYdAKd%r*RSu0$naxFiQ7TjL0>>12go7P
z>0UY<{!thDW@qnAPTD_y99dX+{`G6e=qUPvBoIM0+wBsgvDj=j^z~JAbOa)@HFxd=
z#!&;~vauJX36%V>q}&KRhpwnYWr*m-b;`zW99v%1)DwbbVVLsZ#M~ex4T@o%CU8+S
zSprRlNEgSX^5fHiki^{ZWC0|ej>r^0onJswC1)u@G+hyMQA82f1SfLN5V>eZ;hA)P
zhPdWr0^@L8Rt#B8$Wy?H!r{43QDiBWC5s~qv6<3>ruH`u2P}yTJI7Xa+=k(JmjD$@
zZbD^<ryUMFqx5%~woubK`0m}S<z<FU3nz&m&Ag{6YJ-q;X@g~aX({v^XYkDjh5mL>
z94(S4kQ&XLaw8e2W>;%ZCa}U%IHzz-W~m;LQH0GZti0JJtk=u6oj9tD!mG-b*5POc
zosY*Oh`__w??Q1r7?GWDNjBwh0M+IbC}wh=qDbE^QMEVO>}ecjIG#h1sFLY&px%(m
zuH<R7w?|%31Xae~2RN!ch753ujb+zwnyiC`*P5eK`D9*cGQAj*z|>o9h%_J~nb$rz
zb{I)LfntOvvT0YYa@B?_1_Q6gWE-F6mYYbq#d+#F^ZlW#Z9RN-ljaZGc|jG0TLnSV
zxN0K=#Zc&OA;<z<ckhFlzbV{miSBw7i6_$O4c2}@Z5G$wh#&}h$ET8Lg=a}TR^?R)
ziXN2;C@mHOy9k=Zw9n2F8O3K(fOJk}Fg}M-q#<*Z@Z>z1)^a31+cxn!I!zW$mdYD$
zvX%9$f`-(~CDeR11j`7+3m9cpr!XvOP5b!b;>+*L>>{JW+=6G6MW%>yDzq|v%jHU)
z>8_p3R$dgSW61)FKywPsf)nycIf~NOR=%<&r(AmkNd@W}Nvu+Kg@Ga}55;j$rvOD}
zbB<CUh^B%5cYA)wA1{DhmqAXhTjBE&#XGQiQ!FC&=~|)ZP7j<<rl7B2<ELhYU%+#n
zn|I2iXSErV;!Oe2XzM8O8tUssnm)Fn)?il=4=81kw)3t9y8V+|Dab7z1wOt5(rSSb
zSu>v#qV8QVje;h+VEpiT@XGz@>)oV?o&o4FF!Q`+0Jt)m0QPHN?-vfMZhSnwW+OCw
zXgGGqZm0dW`r&#P$@-&R4Jn`S_zdta?wDkyCG~hkIo*1zt+Bu8i_40UTW$M@$0xpT
zZe1gs8ynN)dz}4ka&9a+9RB{ZPl@Q|-N%pqT0PVMVhePs{vYRmJDb;5(1`qnTJ~Z<
zZV-gux}hKN$dxZ+Z*cEPO19<22Vm}U{WXgRmIg3c6#s9FE&FiK0;1!E4hL##6@TxC
zQD=VW&rYv+`EOayE@-g#lnC72GPW8_#_$hpRP*gVt)AY~65omzw41L14&8EZ$jie`
z)J(D#9(s~)!yg$j?gZNup01$6uFnshV838}U2_G5nbO>mSYRFKkeAyoj5lGn9IYZa
zSK#8xM0?X*Q$5@>qjp%U(+wtrDr-b2JiH=rg~##4=8Q(wK6r^N&~wu|(ZTGA%Z;m}
ze`<xn&iN^ve+6JZeyXS;TBN)CTOY68-RVP7+waHI)3%-D*9%-iAXBBQnlXf)UzvUu
z>DoOo&)_isNpPFE=|#?~Cr}DVXT4!{`F3sR@Q2M_t0aoJ9?PHZJuU~gc7Z)XLH_~5
CseMxb

literal 0
HcmV?d00001

diff --git a/themes/modern/messenger/messenger.css b/themes/modern/messenger/messenger.css
index 23e347ae40c9..af77b4b06325 100644
--- a/themes/modern/messenger/messenger.css
+++ b/themes/modern/messenger/messenger.css
@@ -75,7 +75,7 @@ iframe {
  * toolbar button images
  */
 
-#button-getmsg, #button-newmsg, #button-reply, #button-replyall, #button-forward, #button-file, #button-next, 
+#button-getmsg, #button-newmsg, #button-reply, #button-replyall, #button-forward, #button-file, #button-next, #button-mark
 #button-delete, #button-print, #button-stop  {
 	min-width			: 52px;
 }
@@ -102,6 +102,28 @@ iframe {
     list-style-image      : url("chrome://messenger/skin/getmsg-clicked.gif");
   } 
 
+#button-mark {
+	margin-left			: 0px;
+	list-style-image	: url("chrome://messenger/skin/mark.gif");
+}
+
+#button-mark[disabled="true"],
+#button-mark[disabled="true"]:hover,
+#button-mark[disabled="true"]:hover:active
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-disabled.gif");
+  } 
+
+#button-mark:hover
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-hover.gif");
+  } 
+
+#button-mark:hover:active
+  {
+    list-style-image      : url("chrome://messenger/skin/mark-clicked.gif");
+  } 
+
 #button-newmsg {
 	list-style-image:url("chrome://messenger/skin/newmsg.gif");
 }