diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeBL.php b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeBL.php
index 6968419..f522756 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeBL.php
@@ -40,7 +40,12 @@ if (checkSession()) {
 			$oDocType = DocumentType::get($fDocTypeID);
 			$oDocType->setName($fDocTypeName);
 			
+			
 		if ($oDocType->delete()) {
+			
+			//delete all fields as well
+			$oDocType->deleteAllFieldLinks();
+			
 			$oPatternCustom->setHtml(getDeleteSuccessPage());
 			
 		} else {
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc
index b4962c6..9be816b 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc
@@ -77,7 +77,7 @@ $sToRender .= "<td><b>Deletion Failed!</b></td>\n";
 $sToRender .= "</tr>\n";	
 $sToRender .= "<tr></tr>\n";
 $sToRender .= "<tr></tr>\n";
-$sToRender .= "<tr><td>Please Ensure that the Document Type have been Removed from the Fields it Belongs to</td></tr>\n";
+$sToRender .= "<tr><td>Please Ensure that the Document Type has been Removed from ALL Folders</td></tr>\n";
 $sToRender .= "<tr></tr>\n";
 $sToRender .= "</tr>\n";
 $sToRender .= "<tr><td align = right><a href=\"$default->rootUrl/control.php?action=removeDocType\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td></tr>\n";