diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 394e40cbf..9c570e658 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -3356,18 +3356,18 @@ public class WebMail extends HttpServlet
 				button( REPLYALL, _t("Reply All") ) +
 				button( FORWARD, _t("Forward") ) +
 				button( SAVE_AS, _t("Save As")));
-			if (mail.hasBody() && !mc.getFolderName().equals(DIR_DRAFTS)) {
-				// can't move unless has body
-				// can't move from drafts
-				out.println(button(MOVE_TO, _t("Move to Folder") + ':'));
-				showFolderSelect(out, mc.getFolderName(), true);
-			}
 			if (sessionObject.reallyDelete)
 				out.println(button2(DELETE, _t("Delete")));
 			else
 				out.println(button(DELETE, _t("Delete")));
 		}
 		out.println(button(LOGOUT, _t("Logout") ));
+		if (mail.hasBody() && !mc.getFolderName().equals(DIR_DRAFTS)) {
+			// can't move unless has body
+			// can't move from drafts
+			out.println(button(MOVE_TO, _t("Move to Folder") + ':'));
+			showFolderSelect(out, mc.getFolderName(), true);
+		}
 		// processRequest() will P-R-G the PREV and NEXT so we have a consistent URL
 		out.println("<div id=\"messagenav\">");
 		Folder<String> folder = mc.getFolder();
diff --git a/installer/resources/themes/susimail/light/susimail.css b/installer/resources/themes/susimail/light/susimail.css
index 156b7433a..8fc4feffa 100644
--- a/installer/resources/themes/susimail/light/susimail.css
+++ b/installer/resources/themes/susimail/light/susimail.css
@@ -1175,6 +1175,12 @@ h3#config {
      float: none !important;
 }
 
+input.moveto {
+     float: left;
+     margin-left: 14px;
+     margin-top: 2px !important;
+}
+
 .topbuttons select.select1,
 .topbuttons input.new, .topbuttons input.refresh, .topbuttons input.logout,
 .topbuttons input.reply, .topbuttons input.replyall, .topbuttons input.forward, .topbuttons input.saveas, .topbuttons input.delete {