diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index 480478255..24dc28970 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -22,6 +22,7 @@
        - enableUsersView: enable/disable group and user view for all users
        - enableFullSearch: false to don't use fulltext search
        - enableLanguageSelector: false to don't show the language selector after login
+       - enableClipboard: false to hide the clipboard
        - enableFolderTree: false to don't show the folder tree
        - expandFolderTree: 0 to start with tree hidden
        -                   1 to start with tree shown and first level expanded
@@ -36,6 +37,7 @@
       enableEmail = "true"	
       enableUsersView = "true"
       enableFullSearch = "false"
+      enableClipboard = "false"
       enableFolderTree = "true"
       expandFolderTree = "1"
       enableLanguageSelector = "true"
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index a2973cd82..8d87bf2ed 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -143,6 +143,8 @@ class Settings { /* {{{ */
 	var $_calendarDefaultView = "y";
 	// first day of the week (0=sunday, 1=monday, 6=saturday)
 	var $_firstDayOfWeek = 0;
+	// enable/disable display of the clipboard
+	var $_enableClipboard = true;
 	// enable/disable display of the folder tree
 	var $_enableFolderTree = true;
 	// count documents and folders for folderview recursively
@@ -306,6 +308,7 @@ class Settings { /* {{{ */
 		$this->_enableConverting = Settings::boolVal($tab["enableConverting"]);
 		$this->_enableEmail = Settings::boolVal($tab["enableEmail"]);
 		$this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]);
+		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
 		$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);
@@ -557,6 +560,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableConverting", $this->_enableConverting);
     $this->setXMLAttributValue($node, "enableEmail", $this->_enableEmail);
     $this->setXMLAttributValue($node, "enableUsersView", $this->_enableUsersView);
+	$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
     $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
     $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
     $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 8eb11c30a..e703d1c03 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -635,6 +635,8 @@ $text = array(
 'settings_enableAdminRevApp' => "Allow review/approval for admins",
 'settings_enableCalendar_desc' => "Enable/disable calendar",
 'settings_enableCalendar' => "Enable Calendar",
+'settings_enableClipboard' => "Enable Clipboard",
+'settings_enableClipboard_desc' => "Enable/disable the clipboard",
 'settings_enableConverting_desc' => "Enable/disable converting of files",
 'settings_enableConverting' => "Enable Converting",
 'settings_enableDuplicateDocNames_desc' => "Allows to have duplicate document names in a folder.",
diff --git a/op/op.Settings.php b/op/op.Settings.php
index b8d6de77f..55393210f 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -65,6 +65,7 @@ if ($action == "saveSettings")
   $settings->_enableEmail =getBoolValue("enableEmail");
   $settings->_enableUsersView = getBoolValue("enableUsersView");
   $settings->_enableFullSearch = getBoolValue("enableFullSearch");
+  $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
   $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
   $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index 43b2ed4f0..59bc41246 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -59,7 +59,7 @@ if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('orderby', $orderby);
 	$view->setParam('enableFolderTree', $settings->_enableFolderTree);
-	$view->setParam('enableClipboard', false /*$settings->_enableClipboard */);
+	$view->setParam('enableClipboard', $settings->_enableClipboard);
 	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 84c7a6bbb..f10279087 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -147,6 +147,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_stopWordsFile");?>:</td>
         <td><input type="text" name="stopWordsFile" value="<?php echo $settings->_stopWordsFile; ?>" size="100" /></td>
       </tr>
+	  <tr title="<?php printMLText("settings_enableClipboard_desc");?>">
+        <td><?php printMLText("settings_enableClipboard");?>:</td>
+        <td><input name="enableClipboard" type="checkbox" <?php if ($settings->_enableClipboard) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableFolderTree_desc");?>">
         <td><?php printMLText("settings_enableFolderTree");?>:</td>
         <td><input name="enableFolderTree" type="checkbox" <?php if ($settings->_enableFolderTree) echo "checked" ?> /></td>