Fix read_when_deleted behavior + javascript codestyle

git-svn-id: https://svn.roundcube.net/trunk@1617 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 6 insertions, 1 deletions

diff --git a/roundcubemail/program/steps/mail/move_del.inc b/roundcubemail/program/steps/mail/move_del.inc
index d8a017171..5fbb41c55 100644
--- a/roundcubemail/program/steps/mail/move_del.inc
+++ b/roundcubemail/program/steps/mail/move_del.inc
@@ -29,7 +29,12 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_targe
     $target = get_input_value('_target_mbox', RCUBE_INPUT_POST);
     $moved = $IMAP->move_message($uids, $target, get_input_value('_mbox', RCUBE_INPUT_POST));
   
-    if (!$moved) {
+    if ($moved) {
+        // flag old messages as read because rcube_imap will not send expunge command after moving
+        if ($CONFIG['read_when_deleted'])
+            $IMAP->set_flag($uids, 'SEEN');
+    }
+    else {
         // send error message
         $OUTPUT->command('list_mailbox');
         $OUTPUT->show_message('errormoving', 'error');