diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index b2c04c58fb2957d65254e6ec976dc2ab45001d68..bc5c1fb743f24b30d01becd8d38e3cec2afac163 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -3274,12 +3274,6 @@ public class WebMail extends HttpServlet
 		if (i == 0)
 			out.println("<tr><td colspan=\"9\" align=\"center\"><div id=\"emptymailbox\"><i>" + _t("No messages") + "</i></div></td></tr>");
 		out.println( "<tr class=\"bottombuttons\"></tr>");
-		if (folder.getPages() > 1 && i > 30) {
-			// show the buttons again if page is big
-			out.println("<tr class=\"bottombuttons\"><td colspan=\"9\" align=\"center\">");
-			showPageButtons(out, folderName, page, folder.getPages(), false);
-			out.println("</td></tr>");
-		}
 		out.println("<tr class=\"bottombuttons\"><td colspan=\"5\" align=\"left\">");
 		if (i > 0) {
 			// TODO do this in js
@@ -3309,6 +3303,12 @@ public class WebMail extends HttpServlet
 		out.print(button(CONFIGURE, _t("Settings")));
 		out.println("</td></tr>");
 		out.println( "</table>");
+		if (folder.getPages() > 1 && i > 30) {
+			// show the buttons again if page is big
+			out.println("<div class=\"topbuttons\">");
+			showPageButtons(out, folderName, page, folder.getPages(), false);
+			out.println("</div>");
+		}
 	}
 
 	/**
diff --git a/apps/susimail/src/themes/light/susimail.css b/apps/susimail/src/themes/light/susimail.css
index a03a7cd40c03775f19b7843cfd6bf1b75f909b79..d64145637758bd65e2f97000031ee74fad0cd4d9 100644
--- a/apps/susimail/src/themes/light/susimail.css
+++ b/apps/susimail/src/themes/light/susimail.css
@@ -147,7 +147,7 @@ div.header, .iframed .header {
 
 div.footer {
      border-top: none;
-     margin: -14px 0 10px;
+     margin: 14px 0 10px;
      border: 1px solid #f1f3f5;
      background: #f1f3f5;
 }
@@ -1158,11 +1158,10 @@ h3#config {
 }
 
 .topbuttons {
-     margin: -1px -1px 0;
+     margin: -1px;
      padding: 5px 5px 4px;
      text-align: center;
      border: 1px solid #7778bf;
-     border-bottom: none;
      z-index: 100;
      font-weight: bold;
      vertical-align: middle;