diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index ac8b89b13dd..25a2c60bf9c 100644
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -22,6 +22,7 @@ v6.3.0-git
 v6.2.2
 ------
 
+[mms] Fix resuming draft from mailbox page in basic view.
 [mms] Fix displaying Virtual Trash mailbox (Bug #13418).
 [mms] Fix menu actions on the minimal message page (Bug #13440).
 [jan] Fix switching to HTML editor in basic mode if signature display is not
diff --git a/imp/lib/Basic/Mailbox.php b/imp/lib/Basic/Mailbox.php
index c1d1c10b614..c173d946436 100644
--- a/imp/lib/Basic/Mailbox.php
+++ b/imp/lib/Basic/Mailbox.php
@@ -875,10 +875,11 @@ protected function _init()
 
             /* Generate the target link. */
             if ($mailbox->drafts || $mailbox->templates) {
-                $target = $clink->copy()->add(array(
-                    'actionID' => ($mailbox->drafts ? 'draft' : 'template'),
-                    'buid' => $msg['buid'],
-                    'mailbox' => $mailbox
+                $clink_copy = clone $clink_ob;
+                $clink_copy->args['buid'] = $msg['buid'];
+                $clink_copy->args['mailbox'] = $mailbox;
+                $target = $clink_copy->link()->add(array(
+                    'actionID' => ($mailbox->drafts ? 'draft' : 'template')
                 ));
             } else {
                 $target = $mailbox->url('message', $msg['buid']);
diff --git a/imp/package.xml b/imp/package.xml
index 191c4f7f1a7..1077cb9320d 100644
--- a/imp/package.xml
+++ b/imp/package.xml
@@ -3725,6 +3725,7 @@
    <date>2014-08-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Fix resuming draft from mailbox page in basic view.
 * [mms] Fix displaying Virtual Trash mailbox (Bug #13418).
 * [mms] Fix menu actions on the minimal message page (Bug #13440).
 * [jan] Fix switching to HTML editor in basic mode if signature display is not active.