diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 86de49ad5..fc6762a5e 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -2371,8 +2371,6 @@ public class WebMail extends HttpServlet
 				sessionObject.addNonce(nonce);
 				out.println(
 					"<div class=\"page\">" +
-					// hidden by CSS
-					//"<div class=\"header\"><img class=\"header\" src=\"" + sessionObject.imgPath + "susimail.png\" alt=\"Susimail\"></div>\n" +
 					"<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\" accept-charset=\"UTF-8\">\n" +
 					"<input type=\"hidden\" name=\"" + SUSI_NONCE + "\" value=\"" + nonce + "\">\n" +
 					// we use this to know if the user thought he was logged in at the time
@@ -2469,8 +2467,12 @@ public class WebMail extends HttpServlet
 				else if( state == State.CONFIG )
 					showConfig(out, folder);
 
-				//out.println( "</form><div id=\"footer\"><hr><p class=\"footer\">susimail v0." + version +" " + ( RELEASE ? "release" : "development" ) + " &copy; 2004-2005 <a href=\"mailto:susi23@mail.i2p\">susi</a></div></div></body>\n</html>");
-				out.println( "</form><div class=\"footer\"><p class=\"footer\">susimail &copy; 2004-2005 susi</p></div></div></body>\n</html>");
+				out.println("</form>\n");
+
+				out.println("<div class=\"footer\"><p class=\"footer\">\n" +
+				            "<img class=\"footer\" src=\"" + myself + "themes/images/susimail.png\" alt=\"susimail\">\n" +
+				            "&copy; 2004-2005 susi</p></div>");
+				out.println("</div></body>\n</html>");
 				out.flush();
 		}  // synch sessionObject
 	}
diff --git a/apps/susimail/src/themes/dark/susimail.css b/apps/susimail/src/themes/dark/susimail.css
index 08a19afef..1aaf15ea7 100644
--- a/apps/susimail/src/themes/dark/susimail.css
+++ b/apps/susimail/src/themes/dark/susimail.css
@@ -50,10 +50,6 @@ body.iframed {
      outline: none;
 }
 
-div.header {
-     padding: 8px 5px 12px 5px;
-}
-
 hr {
      color: #494;
      background: #494;
@@ -133,8 +129,10 @@ p.footer {
      color: #495057 !important;
 }
 
-.iframed .footer {
-     display: none;
+img.footer {
+     max-height: 32px;
+     max-width: 64px;
+     margin: 0 1px -4px 0;
 }
 
 p.mailbody, textarea {
@@ -143,14 +141,6 @@ p.mailbody, textarea {
      text-align: left;
 }
 
-.header {
-     display: none;
-}
-
-.iframed .header {
-     display: none;
-}
-
 div.topbuttons {
      padding: 8px 0 !important;
      font-weight: bold;
diff --git a/apps/susimail/src/themes/light/susimail.css b/apps/susimail/src/themes/light/susimail.css
index 91e691d96..cc3933d5f 100644
--- a/apps/susimail/src/themes/light/susimail.css
+++ b/apps/susimail/src/themes/light/susimail.css
@@ -141,10 +141,6 @@ span.coloured {
      color: #327BBF;
 }
 
-div.header, .iframed .header {
-     display: none;
-}
-
 div.footer {
      border-top: none;
      margin: 14px 0 10px;
@@ -161,8 +157,10 @@ p.footer {
      color: #495057 !important;
 }
 
-.iframed .footer {
-     display: none;
+img.footer {
+     max-height: 32px;
+     max-width: 64px;
+     margin: 0 1px -4px 0;
 }
 
 p.mailbody {
@@ -410,18 +408,6 @@ form {
      line-height: 160%
 }
 
-.header + form {
-     border: 1px solid #7778bf;
-     border-radius: 2px 2px 0 0;
-     background: #f4f4ff;
-     background: linear-gradient(to bottom, #f8f8ff, #f2f2ff);
-     box-shadow: 0 0 0 1px #fff;
-}
-
-.iframed .header + form {
-     margin-bottom: 0;
-}
-
 #message_full {
      border: 1px solid #7778bf;
      border-left: none;