diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index a1ddde76d..43d35908f 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -316,6 +316,19 @@ class rcube_imap
     }
 
 
+    /**
+     * Activate/deactivate debug mode
+     *
+     * @param boolean $dbg True if IMAP conversation should be logged
+     * @access public
+     */
+    function set_debug($dbg = true)
+    {
+        $this->options['debug'] = $dbg;
+        $this->conn->setDebug($dbg, array($this, 'debug_handler'));
+    }
+
+
     /**
      * Set default message charset
      *
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index ab891e3ea..4fb379254 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -1357,6 +1357,18 @@ class rcube_ldap extends rcube_addressbook
     }
 
 
+    /**
+     * Activate/deactivate debug mode
+     *
+     * @param boolean $dbg True if LDAP commands should be logged
+     * @access public
+     */
+    function set_debug($dbg = true)
+    {
+        $this->debug = $dbg;
+    }
+
+
     /**
      * Quotes attribute value string
      *