From db59035f79cbf61d320a90149172e4a791302c14 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Thu, 12 Jun 2014 15:39:40 -0600
Subject: [PATCH] Bug #13258: Use mailbox provided to message action for
 viewport updating

---
 imp/js/dimpbase.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
index 74e121e1385..f2ff1bdd29b 100644
--- a/imp/js/dimpbase.js
+++ b/imp/js/dimpbase.js
@@ -853,13 +853,11 @@ var DimpBase = {
         });
     },
 
-    addViewportParams: function(params)
+    addViewportParams: function(params, vs)
     {
-        var tmp = this.viewport.addRequestParams();
-        if (params) {
-            tmp.update(params);
-        }
-        return tmp;
+        return this.viewport.addRequestParams(params, {
+            view: (vs ? vs.getBuffer().getView() : null)
+        });
     },
 
     emptyMsg: function()
@@ -3638,7 +3636,7 @@ var DimpBase = {
             // This needs to be synchronous Ajax if we are calling from a
             // popup window because Mozilla will not correctly call the
             // callback function if the calling window has been closed.
-            DimpCore.doAction(type, this.addViewportParams(args), {
+            DimpCore.doAction(type, this.addViewportParams(args, vs), {
                 ajaxopts: { asynchronous: !(opts.uid && opts.mailbox) },
                 loading: opts,
                 uids: vs
@@ -3702,7 +3700,7 @@ var DimpBase = {
             DimpCore.doAction('flagMessages', this.addViewportParams(params.merge({
                 add: ~~(!!add),
                 flags: Object.toJSON([ flag ])
-            })), {
+            }), vs), {
                 uids: vs
             });
         }