diff --git a/UI/WebServerResources/js/Mailer/MessageController.js b/UI/WebServerResources/js/Mailer/MessageController.js
index d597bfab6..0de37110f 100644
--- a/UI/WebServerResources/js/Mailer/MessageController.js
+++ b/UI/WebServerResources/js/Mailer/MessageController.js
@@ -485,7 +485,10 @@
                  this.message.uid]
           .join('/'),
           wId = this.message.$absolutePath();
-      if (action) url += '/' + action;
+      if (action) {
+        wId += '/' + action;
+        url += '/' + action;
+      }
       popupWindow = $window.open(url, wId,
                                  ["width=680",
                                   "height=520",