diff --git a/lib/browse/BrowseColumns.inc.php b/lib/browse/BrowseColumns.inc.php
index 0166db3..e37c28f 100644
--- a/lib/browse/BrowseColumns.inc.php
+++ b/lib/browse/BrowseColumns.inc.php
@@ -343,7 +343,7 @@ class WorkflowColumn extends BrowseColumn {
 class DownloadColumn extends BrowseColumn {
     
     function renderHeader($sReturnURL) {         
-        $text = $this->label; 
+        $text = ' '; 
         
         return $text;
     }
diff --git a/lib/documentmanagement/documentutil.inc.php b/lib/documentmanagement/documentutil.inc.php
index cd9c8cb..f4ee968 100644
--- a/lib/documentmanagement/documentutil.inc.php
+++ b/lib/documentmanagement/documentutil.inc.php
@@ -560,6 +560,8 @@ class KTDocumentUtil {
         }
         if (PEAR::isError($oDocument) || ($oDocument == false)) { return PEAR::raiseError('Invalid document object.'); }
         
+        if ($oDocument->getIsCheckedOut() == true) { return PEAR::raiseError(sprintf(_('The document is checked out and cannot be deleted: %s'), $oDocument->getName())); }
+        
         // IF we're deleted ...
         if ($oDocument->getStatusID() == DELETED) { return true; }
         
diff --git a/lib/foldermanagement/folderutil.inc.php b/lib/foldermanagement/folderutil.inc.php
index f466e94..f3984ca 100644
--- a/lib/foldermanagement/folderutil.inc.php
+++ b/lib/foldermanagement/folderutil.inc.php
@@ -233,7 +233,7 @@ class KTFolderUtil {
             // child documents
             $aChildDocs = Document::getList(array('folder_id = ?',array($iFolderId)));
             foreach ($aChildDocs as $oDoc) {
-                if ($bIgnorePermissions || KTPermissionUtil::userHasPermissionOnItem($oUser, $oPerm, $oFolder)) {
+                if ($bIgnorePermissions || (KTPermissionUtil::userHasPermissionOnItem($oUser, $oPerm, $oDoc) && ($oDoc->getIsCheckedOut() == false)) ) {
                     $aDocuments[] = $oDoc;
                 } else {
                     $aFailedDocuments[] = $oDoc->getName();