diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index a5bc93555..a31fb4ce6 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -166,6 +166,9 @@ function clickedEditorSend(sender) {
   if (!document.busyAnim)
     document.busyAnim = startAnimation(toolbar);
   
+  var lastRow = $("lastRow");
+  lastRow.down("select").name = "popup_last";
+  
   window.shouldPreserve = true;
   document.pageform.action = "send";
   document.pageform.submit();
@@ -249,6 +252,9 @@ function clickedEditorSave(sender) {
   if (input)
     input.parentNode.removeChild(input);
 
+  var lastRow = $("lastRow");
+  lastRow.down("select").name = "popup_last";
+
   window.shouldPreserve = true;
   document.pageform.action = "save";
   document.pageform.submit();