2 more places to convert an encoded form mailbox name

diff --git a/imp/mailbox.php b/imp/mailbox.php
index 0ed048a..4892013 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -148,11 +148,12 @@ case 'undelete_messages':
 case 'move_messages':
 case 'copy_messages':
     if (isset($vars->targetMbox) && count($indices)) {
+        $targetMbox = IMP::formMbox($vars->targetMbox, false);
         if (!empty($vars->newMbox) && ($vars->newMbox == 1)) {
-            $targetMbox = IMP::folderPref($vars->targetMbox, true);
+            $targetMbox = IMP::folderPref($targetMbox, true);
             $newMbox = true;
         } else {
-            $targetMbox = $vars->targetMbox;
+            $targetMbox = $targetMbox;
             $newMbox = false;
         }
         $injector->getInstance('IMP_Message')->copy($targetMbox, ($actionID == 'move_messages') ? 'move' : 'copy', $indices, array('create' => $newMbox));

diff --git a/imp/message.php b/imp/message.php
index 94374b3..57079bd 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -105,13 +105,14 @@ case 'undelete_message':
 case 'move_message':
 case 'copy_message':
     if (isset($vars->targetMbox)) {
+        $targetMbox = IMP::formMbox($vars->targetMbox, false);
         if ($vars->newMbox) {
-            $vars->targetMbox = IMP::folderPref($vars->targetMbox, true);
+            $vars->targetMbox = IMP::folderPref($targetMbox, true);
             $newMbox = true;
         } else {
             $newMbox = false;
         }
-        $imp_message->copy($vars->targetMbox, ($vars->actionID == 'move_message') ? 'move' : 'copy', $indices, array('create' => $newMbox));
+        $imp_message->copy($targetMbox, ($vars->actionID == 'move_message') ? 'move' : 'copy', $indices, array('create' => $newMbox));
         if ($prefs->getValue('mailbox_return')) {
             _returnToMailbox($imp_mailbox->getMessageIndex());
             require IMP_BASE . '/mailbox.php';