diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox
index 53441a327..9b1cb220a 100644
--- a/UI/Templates/MailerUI/UIxMailPopupView.wox
+++ b/UI/Templates/MailerUI/UIxMailPopupView.wox
@@ -7,6 +7,10 @@
     className="UIxPageFrame"
     title="title"
     const:popup="YES">
+  <script type="text/javascript">
+    var messageName = '<var:string value="clientObject.relativeImap4Name"/>';
+    var mailboxName = '/<var:string value="clientObject.container.container.nameInContainer"/>/<var:string value="clientObject.container.nameInContainer"/>';
+  </script>
     <span id="messageContent">
       <var:component className="UIxMailView" />
     </span>
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 497637a77..4c48e2b92 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -386,8 +386,10 @@ function onMenuDeleteMessage(event) {
 
 function deleteMessage(url, id, mailbox, messageId) {
   var data = { "id": new Array(id), "mailbox": mailbox, "path": new Array(messageId) };
+	var parameters = "uid=" + id;
   deleteMessageRequestCount++;
-  triggerAjaxRequest(url, deleteSelectedMessagesCallback, data);
+  triggerAjaxRequest(url, deleteSelectedMessagesCallback, data, parameters,
+										 { "Content-type": "application/x-www-form-urlencoded" });
 }
 
 function deleteMessageWithDelay(url, id, mailbox, messageId) {
diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js
index cd064c6dd..5c6b6c92c 100644
--- a/UI/WebServerResources/UIxMailPopupView.js
+++ b/UI/WebServerResources/UIxMailPopupView.js
@@ -44,15 +44,10 @@ function onICalendarButtonClick(event) {
 
 function onMenuDeleteMessage(event) {
   if (window.opener && window.opener.open && !window.opener.closed) {
-		var rowId_index = window.name.search(/[0-9]+$/);
-    var rowId = window.name.substr(rowId_index);
-    var messageId = window.opener.Mailer.currentMailbox + "/" + rowId;
-    var url = ApplicationBaseURL + messageId + "/trash";
+		var url = ApplicationBaseURL + encodeURI(mailboxName) + "/deleteMessages";
+		var path = mailboxName + "/" + messageName;
 
-    window.opener.deleteMessageWithDelay(url,
-																				 rowId,
-																				 window.opener.Mailer.currentMailbox,
-																				 messageId);
+    window.opener.deleteMessageWithDelay(url, messageName, mailboxName, path);
   }
   
   window.close();