diff --git a/apps/susimail/src/icons/flag_green.png b/apps/susimail/src/icons/flag_green.png
new file mode 100644
index 000000000..e4bc611f8
Binary files /dev/null and b/apps/susimail/src/icons/flag_green.png differ
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") ) +