diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index d222204db..2356d37b5 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -79,14 +79,6 @@
     </ul>
   </div>
   
-  <div class="menu" id="addressMenu">
-    <ul>
-      <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
-      <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
-      <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
-    </ul>
-  </div>
-
   <div class="menu" id="messageListMenu">
     <ul>
       <li><var:string label:value="Open Message In New Window"/></li>
diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox
index 6b892b56a..2f7f01b4d 100644
--- a/UI/Templates/MailerUI/UIxMailPopupView.wox
+++ b/UI/Templates/MailerUI/UIxMailPopupView.wox
@@ -7,5 +7,7 @@
     className="UIxPageFrame"
     title="title"
     const:popup="YES">
-    <var:component className="UIxMailView" />
-  </var:component>
+    <span id="messageContent">
+      <var:component className="UIxMailView" />
+    </span>
+   </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index 8ae114005..68d3e7434 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -73,4 +73,12 @@
       <var:component value="contentViewerComponent"
         bodyInfo="clientObject.bodyStructure" />
     </div>
+
+    <div class="menu" id="addressMenu">
+      <ul>
+        <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
+        <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
+        <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
+      </ul>
+    </div>
   </container>
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index fcf07c2e1..a5cd1c5af 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -400,6 +400,9 @@ TD.mailer_fieldvalue a
   vertical-align: top;
 }
 
+TR.deleted TD
+{ text-decoration: line-through; }
+
 img.mailer_imagecontent
 {
   border: 0px;
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index ddc8f027b..f9a708dd0 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -144,17 +144,14 @@ function openMessageWindowsForSelection(action, firstOnly) {
     var messageList = $("messageList");
     var rows = messageList.getSelectedRowsId();
     if (rows.length > 0) {
-      if (firstOnly)
-	openMessageWindow(rows[0].substr(4),
+      for (var i = 0; i < rows.length; i++) {
+	openMessageWindow(rows[i].substr(4),
 			  ApplicationBaseURL + currentMailbox
-			  + "/" + rows[0].substr(4)
+			  + "/" + rows[i].substr(4)
 			  + "/" + action);
-      else
-	for (var i = 0; i < rows.length; i++)
-	  openMessageWindow(rows[i].substr(4),
-			    ApplicationBaseURL + currentMailbox
-			    + "/" + rows[i].substr(4)
-			    + "/" + action);
+	if (firstOnly)
+	  break;
+      }
     } else {
       window.alert(labels["Please select a message."]);
     }
@@ -240,6 +237,7 @@ function deleteSelectedMessagesCallback(http) {
 
 	var row = $("row_" + data["id"]);
 	row.parentNode.removeChild(row);
+//	row.addClassName("deleted"); // when we'll offer "mark as deleted"
 
 	deleteMessageRequestCount--;
       }
@@ -417,6 +415,7 @@ function openMailbox(mailbox, reload, idx) {
 	      + "&asc=" + sorting["ascending"]);
     if (idx)
       url += "&idx=" + idx;
+
     if (document.messageListAjaxRequest) {
       document.messageListAjaxRequest.aborted = true;
       document.messageListAjaxRequest.abort();
@@ -704,8 +703,9 @@ function configureLinksInMessage() {
   var messageDiv = $('messageContent');
   var mailContentDiv = document.getElementsByClassName('mailer_mailcontent',
 						       messageDiv)[0];
-  Event.observe(mailContentDiv, "contextmenu",
-		onMessageContentMenu.bindAsEventListener(mailContentDiv));
+  if (!document.body.hasClassName("popup"))
+    Event.observe(mailContentDiv, "contextmenu",
+		  onMessageContentMenu.bindAsEventListener(mailContentDiv));
   var anchors = messageDiv.getElementsByTagName('a');
   for (var i = 0; i < anchors.length; i++)
     if (anchors[i].href.substring(0,7) == "mailto:") {
@@ -823,9 +823,6 @@ function moveTo(uri) {
   alert("MoveTo: " + uri);
 }
 
-function deleteSelectedMails() {
-}
-
 /* message menu entries */
 function onMenuOpenMessage(event) {
   return openMessageWindowsForSelection('popupview');
@@ -1332,7 +1329,7 @@ function buildMailboxes(accountName, encoded) {
   return account;
 }
 
-function onMenuCreateFolder(event) { log ("onMenuCreateFolder " + document.menuTarget);
+function onMenuCreateFolder(event) {
   var name = window.prompt(labels["Name :"], "");
   if (name && name.length > 0) {
     var folderID = document.menuTarget.getAttribute("dataname");
@@ -1505,16 +1502,15 @@ function messageFlagCallback(http) {
 
 function onLabelMenuPrepareVisibility() {
   var messageList = $("messageList");
-  var rows = messageList.getSelectedRows();
-
   var flags = {};
-  for (var i = 1; i < 6; i++)
-    flags["label" + i] = true;
-  for (var i = 0; i < rows.length; i++) {
-    var rowFlags = rows[i].getAttribute("labels").split(" ");
-    for (var flag in flags)
-      if (flags[flag] && rowFlags.indexOf(flag) == -1)
-	flags[flag] = false;
+
+  if (messageList) {
+    var rows = messageList.getSelectedRows();
+    for (var i = 0; i < rows.length; i++) {
+      $w(rows[i].getAttribute("labels")).each(function(flag) {
+	flags[flag] = true;
+	});
+    }
   }
 
   var lis = this.childNodesWithTag("ul")[0].childNodesWithTag("li")
diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js
index bfbed7db0..b9cb5946c 100644
--- a/UI/WebServerResources/UIxMailPopupView.js
+++ b/UI/WebServerResources/UIxMailPopupView.js
@@ -4,4 +4,9 @@ function onPrintCurrentMessage(event) {
   preventDefault(event);
 }
 
-addEvent(window, 'load', resizeMailContent);
+function initPopupMailer(event) {
+  configureLinksInMessage();
+  resizeMailContent();
+}
+
+addEvent(window, 'load', initPopupMailer);