diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 137326eca..87aafcd63 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -184,8 +184,6 @@ class Settings { /* {{{ */
 	var $_enableDropUpload = true;
 	// Enable multiple file upload
 	var $_enableMultiUpload = false;
-	// Enable upload of attachments with document upload
-	var $_enableAttachmentUpload = false;
 	// enable/disable display of the folder tree
 	var $_enableFolderTree = true;
 	// count documents and folders for folderview recursively
@@ -419,7 +417,6 @@ class Settings { /* {{{ */
 		$this->_enableSessionList = Settings::boolVal($tab["enableSessionList"]);
 		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
 		$this->_enableDropUpload = Settings::boolVal($tab["enableDropUpload"]);
-		$this->_enableAttachmentUpload = Settings::boolVal($tab["enableAttachmentUpload"]);
 		$this->_enableMultiUpload = Settings::boolVal($tab["enableMultiUpload"]);
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
@@ -730,7 +727,6 @@ class Settings { /* {{{ */
 		$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
 		$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);
 		$this->setXMLAttributValue($node, "enableMultiUpload", $this->_enableMultiUpload);
-		$this->setXMLAttributValue($node, "enableAttachmentUpload", $this->_enableAttachmentUpload);
     $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
     $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
     $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 9b62701bd..c7e5ec779 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -85,7 +85,6 @@ if ($action == "saveSettings")
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableMultiUpload = getBoolValue("enableMultiUpload");
-  $settings->_enableAttachmentUpload = getBoolValue("enableAttachmentUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
   $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
   $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index be20e5f5a..3100a3830 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -277,10 +277,6 @@ if(!is_writeable($settings->_configFilePath)) {
 	    <tr title="<?php printMLText("settings_enableMultiUpload_desc");?>">
         <td><?php printMLText("settings_enableMultiUpload");?>:</td>
         <td><input name="enableMultiUpload" type="checkbox" <?php if ($settings->_enableMultiUpload) echo "checked" ?> /></td>
-      </tr>
-	    <tr title="<?php printMLText("settings_enableAttachmentUpload_desc");?>">
-        <td><?php printMLText("settings_enableAttachmentUpload");?>:</td>
-        <td><input name="enableAttachmentUpload" type="checkbox" <?php if ($settings->_enableAttachmentUpload) echo "checked" ?> /></td>
       </tr>
       <tr title="<?php printMLText("settings_enableFolderTree_desc");?>">
         <td><?php printMLText("settings_enableFolderTree");?>:</td>