Bug 624255 - Ignored subthreads need visual feedback. r=Neil
authorKarsten Düsterloh <mnyromyr@tprac.de>
Thu, 05 May 2011 15:45:00 +0200
changeset 7717 f1a8228296d36e4b4c162ac5973307143a16d616
parent 7716 4b3fcf807612bcf0d9b5df147a0349fa1fa1f957
child 7718 e2565adeaf34580100720269b142e7a8ec3c864e
push idunknown
push userunknown
push dateunknown
reviewersNeil
bugs624255
Bug 624255 - Ignored subthreads need visual feedback. r=Neil
suite/themes/classic/jar.mn
suite/themes/classic/messenger/icons/message-news-attach-kill-offl.png
suite/themes/classic/messenger/icons/message-news-attach-kill.png
suite/themes/classic/messenger/icons/message-news-kill-offl.png
suite/themes/classic/messenger/icons/message-news-kill.png
suite/themes/classic/messenger/threadPane.css
suite/themes/modern/jar.mn
suite/themes/modern/messenger/icons/message-news-attach-kill-offl.png
suite/themes/modern/messenger/icons/message-news-attach-kill.png
suite/themes/modern/messenger/icons/message-news-kill-offl.png
suite/themes/modern/messenger/icons/message-news-kill.png
suite/themes/modern/messenger/icons/thread-closed-kill.png
suite/themes/modern/messenger/icons/thread-closed-offl-kill.png
suite/themes/modern/messenger/icons/thread-new-closed-kill.png
suite/themes/modern/messenger/icons/thread-new-closed-offl-kill.png
suite/themes/modern/messenger/threadPane.css
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -314,18 +314,22 @@ classic.jar:
   skin/classic/messenger/icons/message-mail-attach-offl.png             (messenger/icons/message-mail-attach-offl.png)
   skin/classic/messenger/icons/message-mail-attach.png                  (messenger/icons/message-mail-attach.png)
   skin/classic/messenger/icons/message-mail-imapdelete.png              (messenger/icons/message-mail-imapdelete.png)
   skin/classic/messenger/icons/message-mail-delete-offl.png             (messenger/icons/message-mail-delete-offl.png)
   skin/classic/messenger/icons/message-mail-new-offl.png                (messenger/icons/message-mail-new-offl.png)
   skin/classic/messenger/icons/message-mail-new.png                     (messenger/icons/message-mail-new.png)
   skin/classic/messenger/icons/message-mail-offl.png                    (messenger/icons/message-mail-offl.png)
   skin/classic/messenger/icons/message-mail.png                         (messenger/icons/message-mail.png)
+  skin/classic/messenger/icons/message-news-attach-kill-offl.png        (messenger/icons/message-news-attach-kill-offl.png)
+  skin/classic/messenger/icons/message-news-attach-kill.png             (messenger/icons/message-news-attach-kill.png)
   skin/classic/messenger/icons/message-news-attach-offl.png             (messenger/icons/message-news-attach-offl.png)
   skin/classic/messenger/icons/message-news-attach.png                  (messenger/icons/message-news-attach.png)
+  skin/classic/messenger/icons/message-news-kill-offl.png               (messenger/icons/message-news-kill-offl.png)
+  skin/classic/messenger/icons/message-news-kill.png                    (messenger/icons/message-news-kill.png)
   skin/classic/messenger/icons/message-news-new-attach-off.png          (messenger/icons/message-news-new-attach-off.png)
   skin/classic/messenger/icons/message-news-new-attach.png              (messenger/icons/message-news-new-attach.png)
   skin/classic/messenger/icons/message-news-new-offl.png                (messenger/icons/message-news-new-offl.png)
   skin/classic/messenger/icons/message-news-new.png                     (messenger/icons/message-news-new.png)
   skin/classic/messenger/icons/message-news-offl.png                    (messenger/icons/message-news-offl.png)
   skin/classic/messenger/icons/message-news.png                         (messenger/icons/message-news.png)
   skin/classic/messenger/icons/readcol.png                              (messenger/icons/readcol.png)
   skin/classic/messenger/icons/remote-blocked.png                       (messenger/icons/remote-blocked.png)
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8e36e243e5bf1edae777975d5eb90bf0782e20e4
GIT binary patch
literal 496
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWND9B#o>FdgVo0Ub(*uZkz6;q&4Ly2odiF1B#Zfaf$gNC!Ff{}rNnSyVA
zRc203qF#PcI+tT<Nk)E=m4a_#QBHoIf>UO3Mt%X8XEKoOl3JXZo@b>1;-n=em*f{!
zayjScl@w(rl>#}%R$K}|ZF!}sISN6knYpP&3K|fu9)#<Vo?D@plByYQ&$9yPmZ$)q
z5LX5$V9%*+T_P#DR7GW_y83D>>kV}c8@BJ>>f*9BJbZg`>F(XT4<sfYsHr_%-*_xP
z|3pjcsRawqb#<NZ>bls|bA8sVTg#T+S-JAw>ecr*Z~6J*!~g&PYhJwY0tHh^kY6x^
z!?PP{AWo9EyNm2==E8|UPMN2RV~E7%-1E1Enhbba9_IY+UdA<VrNW;7*;NM@_RQM-
zH%)!=jK4EKFdG?XGV4u_oEYF<+jxAzf`CocYXj}d5B>aEaD9cv!9?~CS^<SM%-Sil
z68U4E2ygk)S@QhZJ`)Ara6iL!)-R+dOnbbWYsId&#XHZc)-cShXOZ+}N%;x#wWq6}
J%Q~loCID?}x`Y4#
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..110e943507b753b9f4eaed80589f0fd5a08e0037
GIT binary patch
literal 500
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWND9B#o>FdgVo0Ub(Sa~nU)Ym|vh7#9^66gHf+|;}h1`TIT1tS9kGX>xL
zs?406M7{i?bS}rzl8pQ!D+S-gqMZCZ1*gp7jQj#F&txFmCABy+J<m!3#7Rp`F3B&d
z<Z{l>D=ErMDg|<it+*6`+VV<Ma}<J7Gjmgm6f_`QJqXt!J-0$HB~>%ro@WKnEwKSU
zA+8J%z#-${8L~uDa;b{SN_F*>TlTHCvffbFu+_z7Yk2tf;?e_&i3e(G57##y%g;a2
z(t2va!gF0+=exQt_ViqzHS5;0Wp`GtytjJw{mok*J%0@ZKR<l<|NnnZlLRQh7)yfu
zf*Bm1-ADs*lDyqr<chcyw1J#*PZ!4!iOad?ZwoaU@VH)7xf`_h(OfRJAOFukVO-KP
zYy0MBK1PB+jUTf6xP+KLP}2%h`EqgJf#eGd7N&fUb1#j4@TX?S>lKA<hxs0aE_n2V
zE$qaV!*V-ToWF2E_0rtgzn3#+?kMUiyz3a=JX1IPHrI+<Z;N-HRQ2(F!|FHd($c3O
OuY0=sxvX<aXaWH7cfpzf
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0caac52c2089dea1efc384f76d434a7d881f09f7
GIT binary patch
literal 488
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWND9B#o>FdgVo0Ub3Ppac-Xe>~up~N+!#5q4VH#M(>LBm;7!N|bCOu;w5
zDl;c1Q7^wJoy)PbBqP7bO2Id=C?`Kp!6~yiBfo&lGa1NsNiEJy&$Chhancf#OY(~<
zxt#O!N{TX*N`ahWD=r0~w!G5R9EG6N%-qx>1q}#S55jdw&#ll)N!1Lu=UD-COKgBo
zh${mWup8R>=2W&Wk(6AjqOww5eYKVKhPs9g+jnnuaoHLkzP-3~_wL;X5)%*9)E=&H
zJeHq-qNVlJf`#Y0y3TiXUF_+(K5N#kWy|iYTzPNx>ie6w{QU6Y|NsBXneQwGg;Yt9
zUoeBivm0q3PLj8~i(C<xf;Nzo?djqeB5^sl&t0fNL4bu-@^Dh$jDP=qrw1Kz`fV1w
zS+T2bg1n-WW8=iBLX8Tlx^}{$J+r5rHJS8O?u@X3w~Y0~MK^BR@HYQC5wT^RVe;h*
z%vJXpzFb@w^6F;eS~iyA*w~v2vG?cCy7{AkX=@Zq`sa(XnjqhLy85}Sb4q9e0J{3H
AEdT%j
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..509b52ce86d1adb63befc9b840e2fb4a7e117b1d
GIT binary patch
literal 488
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWND9B#o>FdgVo0Ub3SNv{el`>GMp~N+!#5q4VH#M(>LBm;7!N|bCOu;w5
zDl;c1Q7^wJoy)PbBqP7bO2Id=C?`Kp!6~yiBfo&lGa1NsNiEJy&$Chhancf#OY(~<
zxt#O!N{TX*N`ahWD=r0~w!G5R9EG6N%-qx>1q}#S55jdw&#ll)N!1Lu=UD-COKgBo
zh%1n0;E-|f45?`DUm_{FR7GW_y86m3`&L_7Z>Ve7>f*9BJbZg`>4C(=12wgW>l=^d
z=bvb4J+)xrxvsABU0oM@dalo!b!*wOJ1bY-TfO@J<}Ht&zXpPzA3ps5|3B<}f)OaB
zN`m}?862M7NCR<_yxm>ointWCft+kl7sn8Z%ej4#LJkH3E~>Kxev6$h_@6yXL{Riz
z{Qg&wi(at*6jTxsk=Us%$Pskuk@3ZIJ3J%%nIqpFv|%(pzEN1StM}|>gB5)}u8*aJ
z!+7s5{><wjuj{pRo@|7+gTeKyt-P0>{#`k<hhM#KChO_OtKFO+AA7p`xvX<aXaWG$
C53wKs
--- a/suite/themes/classic/messenger/threadPane.css
+++ b/suite/themes/classic/messenger/threadPane.css
@@ -236,30 +236,45 @@ treechildren::-moz-tree-image(subjectCol
 
 .icon-holder[type="message"][MessageType="rss"],
 .icon-holder[type="message"][MessageType="nntp"],
 treechildren::-moz-tree-image(subjectCol, rss),
 treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: url("chrome://messenger/skin/icons/message-news.png");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill.png");
+}
+
 .icon-holder[type="message"][MessageType="rss"][Attachment="true"],
 .icon-holder[type="message"][MessageType="nntp"][Attachment="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach.png");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill.png");
+}
+
 .icon-holder[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
 .icon-holder[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.png");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill-offl.png");
+}
+
 treechildren::-moz-tree-image(subjectCol, rss, new),
 treechildren::-moz-tree-image(subjectCol, news, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.png");
 }
 
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach.png");
 }
@@ -274,16 +289,21 @@ treechildren::-moz-tree-image(subjectCol
 
 .icon-holder[type="message"][MessageType="rss"][Offline="true"],
 .icon-holder[type="message"][MessageType="nntp"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, rss, offline),
 treechildren::-moz-tree-image(subjectCol, news, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-offl.png");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, offline, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill-offl.png");
+}
+
 /* ..... new thread icons for watch and ignore ..... */
 
 treechildren::-moz-tree-image(news, threadCol, watch) {
   list-style-image: url("chrome://messenger/skin/icons/thread-closed-eye.png");
 }
 
 treechildren::-moz-tree-image(news, threadCol, ignore) {
   list-style-image: url("chrome://messenger/skin/icons/thread-closed-kill.png");
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -461,18 +461,22 @@ modern.jar:
   skin/modern/messenger/icons/message-mail-attach.gif              (messenger/icons/message-mail-attach.gif)
   skin/modern/messenger/icons/message-mail-delete-offl.gif         (messenger/icons/message-mail-delete-offl.gif)
   skin/modern/messenger/icons/message-mail-imapdelete.gif          (messenger/icons/message-mail-imapdelete.gif)
   skin/modern/messenger/icons/message-mail-new-offl.gif            (messenger/icons/message-mail-new-offl.gif)
   skin/modern/messenger/icons/message-mail-new.gif                 (messenger/icons/message-mail-new.gif)
   skin/modern/messenger/icons/message-mail-offl.gif                (messenger/icons/message-mail-offl.gif)
   skin/modern/messenger/icons/message-mail.gif                     (messenger/icons/message-mail.gif)
   skin/modern/messenger/icons/message-news.gif                     (messenger/icons/message-news.gif)
+  skin/modern/messenger/icons/message-news-attach-kill-offl.png    (messenger/icons/message-news-attach-kill-offl.png)
+  skin/modern/messenger/icons/message-news-attach-kill.png         (messenger/icons/message-news-attach-kill.png)
   skin/modern/messenger/icons/message-news-attach.gif              (messenger/icons/message-news-attach.gif)
   skin/modern/messenger/icons/message-news-attach-offl.gif         (messenger/icons/message-news-attach-offl.gif)
+  skin/modern/messenger/icons/message-news-kill-offl.png           (messenger/icons/message-news-kill-offl.png)
+  skin/modern/messenger/icons/message-news-kill.png                (messenger/icons/message-news-kill.png)
   skin/modern/messenger/icons/message-news-new.gif                 (messenger/icons/message-news-new.gif)
   skin/modern/messenger/icons/message-news-new-attach.gif          (messenger/icons/message-news-new-attach.gif)
   skin/modern/messenger/icons/message-news-new-attach-off.gif      (messenger/icons/message-news-new-attach-off.gif)
   skin/modern/messenger/icons/message-news-new-offl.gif            (messenger/icons/message-news-new-offl.gif)
   skin/modern/messenger/icons/message-news-offl.gif                (messenger/icons/message-news-offl.gif)
   skin/modern/messenger/icons/readcol-read.gif                     (messenger/icons/readcol-read.gif)
   skin/modern/messenger/icons/readcol-unread.gif                   (messenger/icons/readcol-unread.gif)
   skin/modern/messenger/icons/remote-blocked.png                   (messenger/icons/remote-blocked.png)
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8e36e243e5bf1edae777975d5eb90bf0782e20e4
GIT binary patch
literal 496
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWND9B#o>FdgVo0Ub(*uZkz6;q&4Ly2odiF1B#Zfaf$gNC!Ff{}rNnSyVA
zRc203qF#PcI+tT<Nk)E=m4a_#QBHoIf>UO3Mt%X8XEKoOl3JXZo@b>1;-n=em*f{!
zayjScl@w(rl>#}%R$K}|ZF!}sISN6knYpP&3K|fu9)#<Vo?D@plByYQ&$9yPmZ$)q
z5LX5$V9%*+T_P#DR7GW_y83D>>kV}c8@BJ>>f*9BJbZg`>F(XT4<sfYsHr_%-*_xP
z|3pjcsRawqb#<NZ>bls|bA8sVTg#T+S-JAw>ecr*Z~6J*!~g&PYhJwY0tHh^kY6x^
z!?PP{AWo9EyNm2==E8|UPMN2RV~E7%-1E1Enhbba9_IY+UdA<VrNW;7*;NM@_RQM-
zH%)!=jK4EKFdG?XGV4u_oEYF<+jxAzf`CocYXj}d5B>aEaD9cv!9?~CS^<SM%-Sil
z68U4E2ygk)S@QhZJ`)Ara6iL!)-R+dOnbbWYsId&#XHZc)-cShXOZ+}N%;x#wWq6}
J%Q~loCID?}x`Y4#
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..110e943507b753b9f4eaed80589f0fd5a08e0037
GIT binary patch
literal 500
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWND9B#o>FdgVo0Ub(Sa~nU)Ym|vh7#9^66gHf+|;}h1`TIT1tS9kGX>xL
zs?406M7{i?bS}rzl8pQ!D+S-gqMZCZ1*gp7jQj#F&txFmCABy+J<m!3#7Rp`F3B&d
z<Z{l>D=ErMDg|<it+*6`+VV<Ma}<J7Gjmgm6f_`QJqXt!J-0$HB~>%ro@WKnEwKSU
zA+8J%z#-${8L~uDa;b{SN_F*>TlTHCvffbFu+_z7Yk2tf;?e_&i3e(G57##y%g;a2
z(t2va!gF0+=exQt_ViqzHS5;0Wp`GtytjJw{mok*J%0@ZKR<l<|NnnZlLRQh7)yfu
zf*Bm1-ADs*lDyqr<chcyw1J#*PZ!4!iOad?ZwoaU@VH)7xf`_h(OfRJAOFukVO-KP
zYy0MBK1PB+jUTf6xP+KLP}2%h`EqgJf#eGd7N&fUb1#j4@TX?S>lKA<hxs0aE_n2V
zE$qaV!*V-ToWF2E_0rtgzn3#+?kMUiyz3a=JX1IPHrI+<Z;N-HRQ2(F!|FHd($c3O
OuY0=sxvX<aXaWH7cfpzf
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0caac52c2089dea1efc384f76d434a7d881f09f7
GIT binary patch
literal 488
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWND9B#o>FdgVo0Ub3Ppac-Xe>~up~N+!#5q4VH#M(>LBm;7!N|bCOu;w5
zDl;c1Q7^wJoy)PbBqP7bO2Id=C?`Kp!6~yiBfo&lGa1NsNiEJy&$Chhancf#OY(~<
zxt#O!N{TX*N`ahWD=r0~w!G5R9EG6N%-qx>1q}#S55jdw&#ll)N!1Lu=UD-COKgBo
zh${mWup8R>=2W&Wk(6AjqOww5eYKVKhPs9g+jnnuaoHLkzP-3~_wL;X5)%*9)E=&H
zJeHq-qNVlJf`#Y0y3TiXUF_+(K5N#kWy|iYTzPNx>ie6w{QU6Y|NsBXneQwGg;Yt9
zUoeBivm0q3PLj8~i(C<xf;Nzo?djqeB5^sl&t0fNL4bu-@^Dh$jDP=qrw1Kz`fV1w
zS+T2bg1n-WW8=iBLX8Tlx^}{$J+r5rHJS8O?u@X3w~Y0~MK^BR@HYQC5wT^RVe;h*
z%vJXpzFb@w^6F;eS~iyA*w~v2vG?cCy7{AkX=@Zq`sa(XnjqhLy85}Sb4q9e0J{3H
AEdT%j
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..509b52ce86d1adb63befc9b840e2fb4a7e117b1d
GIT binary patch
literal 488
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWND9B#o>FdgVo0Ub3SNv{el`>GMp~N+!#5q4VH#M(>LBm;7!N|bCOu;w5
zDl;c1Q7^wJoy)PbBqP7bO2Id=C?`Kp!6~yiBfo&lGa1NsNiEJy&$Chhancf#OY(~<
zxt#O!N{TX*N`ahWD=r0~w!G5R9EG6N%-qx>1q}#S55jdw&#ll)N!1Lu=UD-COKgBo
zh%1n0;E-|f45?`DUm_{FR7GW_y86m3`&L_7Z>Ve7>f*9BJbZg`>4C(=12wgW>l=^d
z=bvb4J+)xrxvsABU0oM@dalo!b!*wOJ1bY-TfO@J<}Ht&zXpPzA3ps5|3B<}f)OaB
zN`m}?862M7NCR<_yxm>ointWCft+kl7sn8Z%ej4#LJkH3E~>Kxev6$h_@6yXL{Riz
z{Qg&wi(at*6jTxsk=Us%$Pskuk@3ZIJ3J%%nIqpFv|%(pzEN1StM}|>gB5)}u8*aJ
z!+7s5{><wjuj{pRo@|7+gTeKyt-P0>{#`k<hhM#KChO_OtKFO+AA7p`xvX<aXaWG$
C53wKs
copy from suite/themes/classic/messenger/icons/thread-closed-kill.png
copy to suite/themes/modern/messenger/icons/thread-closed-kill.png
copy from suite/themes/classic/messenger/icons/thread-closed-offl-kill.png
copy to suite/themes/modern/messenger/icons/thread-closed-offl-kill.png
copy from suite/themes/classic/messenger/icons/thread-new-closed-kill.png
copy to suite/themes/modern/messenger/icons/thread-new-closed-kill.png
copy from suite/themes/classic/messenger/icons/thread-new-closed-offl-kill.png
copy to suite/themes/modern/messenger/icons/thread-new-closed-offl-kill.png
--- a/suite/themes/modern/messenger/threadPane.css
+++ b/suite/themes/modern/messenger/threadPane.css
@@ -267,30 +267,45 @@ treechildren::-moz-tree-image(subjectCol
 
 .icon-holder[type="message"][MessageType="rss"],
 .icon-holder[type="message"][MessageType="nntp"],
 treechildren::-moz-tree-image(subjectCol, rss),
 treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill.png");
+}
+
 .icon-holder[type="message"][MessageType="rss"][Attachment="true"],
 .icon-holder[type="message"][MessageType="nntp"][Attachment="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach.gif");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill.png");
+}
+
 .icon-holder[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
 .icon-holder[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.gif");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill-offl.png");
+}
+
 treechildren::-moz-tree-image(subjectCol, rss, new),
 treechildren::-moz-tree-image(subjectCol, news, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
 }
 
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach.gif");
 }
@@ -305,13 +320,18 @@ treechildren::-moz-tree-image(subjectCol
 
 .icon-holder[type="message"][MessageType="rss"][Offline="true"],
 .icon-holder[type="message"][MessageType="nntp"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, rss, offline),
 treechildren::-moz-tree-image(subjectCol, news, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-offl.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, offline, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill-offl.png");
+}
+
 #sizeCol,
 #unreadCol,
 #totalCol {
   text-align: right;
 }