diff --git a/CHANGELOG b/CHANGELOG
index 1d8b0b312..22d2d810c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix locked folder rename option on servers supporting RFC2086 only (#1488089)
 - Trigger 'new_messages' hook for all checked folders (#1488083)
 - Fix session race conditions when composing new messages
 - Fix encoding of LDAP contacts identifiers (#1488079)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 8c904561d..d9549affd 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3500,7 +3500,8 @@ class rcube_imap
         }
 
         if (!empty($options['rights'])) {
-            $options['norename'] = !in_array('x', $options['rights']);
+            $options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']);
+
             if (!$options['noselect']) {
                 $options['noselect'] = !in_array('r', $options['rights']);
             }