From 260ebe512cb4997abe1f24ee4f7e1c8c96367cea Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 25 Apr 2014 04:09:14 +0000
Subject: [PATCH]  * SusiMail:    - Add icon for new mail      (from Silk
 icons, same license as others)    - Attachment logic tweak

---
 apps/susimail/src/icons/flag_green.png            | Bin 0 -> 672 bytes
 apps/susimail/src/src/i2p/susi/webmail/Mail.java  |   3 ++-
 .../src/src/i2p/susi/webmail/WebMail.java         |   8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 apps/susimail/src/icons/flag_green.png

diff --git a/apps/susimail/src/icons/flag_green.png b/apps/susimail/src/icons/flag_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4bc611f87b454e5969078aa167f48798adfd208
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!GD$>1R5;6}
z(_KtbVHgK+*KHTwb<yTUH{J9xOHa9CUAUB4&??L2+Hy-XN9J6!KuO1nfD8P{5uhaT
zA(6rogh3c8;*`{kTuyBkP&kRyT3ef2S^v&?*UqRdFXZCC_u_q?-=1^!ycqy8(#d}>
z3U8KEr|M6CKHF5d&eQVNxr*Xd#pN8o{Cp<pxab_;5IAF?Q0KjfU~&ka#V3$VUqg|K
ziyv!W@JxD;AOtv6A=|>0%jbBO9Pl3P2cIMh>fmjREstPwbsR%UAN&a~0&W97_+{w2
zzK;Pe5g_}Da_b3Y$=5(~fG&DU3P+ZQ@qA?rj`(8?e(XnAv>p1lR%ogzEDpDzrF16)
z>>$A2s?J^XXy3bIMu@`YByICjm?Ii^mmGBZV2)~`4mZPIM`5A2nrR066HnGEYA&=F
z{ItC{p*~!JTj5FqSfV=gCp=^dW8^+e<DCd7^APnm{0(r#hKJp+4bUyLqT!VQjnh?7
zy^+Bh(<8Jp3g42OOwwv=!mOznp|%1Bm|=k|squv)-UH#wGSp6$qIp(=-nbRMgd4V)
z88=2NQ4<pWvb*dAa5NrffIBR3L?!%WiRjQn7c+6jZ4gfhz;jV3vkKO<bDj>7-xWNN
zxg9h5B6J9LGr&<6$h%weF5k=nw=Wx9Cml;Jj>-7nQg?!GIQQV{9x_4d_iwmJ{{Z)#
z5>8sc{Dg*|7C@Q@mHF%nZwj!Ba~VLi89@E#6*A|x)Vtp=Lby^Yqxhx(0000<MNUMn
GLSTZii7cJ~

literal 0
HcmV?d00001

diff --git a/apps/susimail/src/src/i2p/susi/webmail/Mail.java b/apps/susimail/src/src/i2p/susi/webmail/Mail.java
index ab1acb621..00cd17495 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/Mail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/Mail.java
@@ -160,7 +160,8 @@ class Mail {
 		// if part != null query parts instead?
 		return contentType != null &&
 			!contentType.contains("text/plain") &&
-			!contentType.contains("multipart/alternative");
+			!contentType.contains("multipart/alternative") &&
+			!contentType.contains("multipart/signed");
 	}
 
 	/**
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index af8a06b47..dc0424b3b 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -1917,7 +1917,8 @@ public class WebMail extends HttpServlet
 		}
 
 		out.println("<table id=\"mailbox\" cellspacing=\"0\" cellpadding=\"5\">\n" +
-			"<tr><td colspan=\"8\"><hr></td></tr>\n<tr>" +
+			"<tr><td colspan=\"9\"><hr></td></tr>\n<tr>" +
+			thSpacer +
 			thSpacer + "<th>" + sortHeader( SORT_SENDER, _("From"), sessionObject.imgPath ) + "</th>" +
 			thSpacer + "<th>" + sortHeader( SORT_SUBJECT, _("Subject"), sessionObject.imgPath ) + "</th>" +
 			thSpacer + "<th>" + sortHeader( SORT_DATE, _("Date"), sessionObject.imgPath ) +
@@ -1961,6 +1962,7 @@ public class WebMail extends HttpServlet
 			//		", clear=" + sessionObject.clear );
 			out.println( "<tr class=\"list" + bg + "\"><td><input type=\"checkbox\" class=\"optbox\" name=\"check" + i + "\" value=\"1\"" + 
 					( idChecked ? "checked" : "" ) + ">" + "</td><td>" +
+					(mail.isNew() ? "<img src=\"/susimail/icons/flag_green.png\" alt=\"\">" : "&nbsp;") + "</td><td>" +
 					link + mail.shortSender + "</a></td><td>" +
 					(mail.hasAttachment() ? "<img src=\"/susimail/icons/attach.png\" alt=\"\">" : "&nbsp;") + "</td><td>" +
 					link + mail.shortSubject + "</a></td><td>" +
@@ -1972,8 +1974,8 @@ public class WebMail extends HttpServlet
 			i++;
 		}
 		if (i == 0)
-			out.println("<tr><td colspan=\"8\" align=\"center\"><i>" + _("No messages") + "</i></td></tr>\n</table>");
-		out.println( "<tr><td colspan=\"8\"><hr></td></tr>\n</table>");
+			out.println("<tr><td colspan=\"9\" align=\"center\"><i>" + _("No messages") + "</i></td></tr>\n</table>");
+		out.println( "<tr><td colspan=\"9\"><hr></td></tr>\n</table>");
 		if (i > 0) {
 			out.println(
 				button( MARKALL, _("Mark All") ) +