diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties
index c2ffa8928..255d7076c 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties
@@ -92,5 +92,5 @@ ui.portlet.action.new.doclink=New DocLink
 ui.intended_audience_cannot_be_null=Intended Audience cannot be null
 ui.error.sending_document=An error occurred while trying to send document
 ui.invalid_term=Invalid term
-ui.folder.not_empty=Folders must be empty before they can be deleted
+ui.folder.deletion_while_not_empty=Folders must be empty before they can be deleted
 ui.error.unexpected=An unexpected error occurred
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties
index c2ffa8928..255d7076c 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties
@@ -92,5 +92,5 @@ ui.portlet.action.new.doclink=New DocLink
 ui.intended_audience_cannot_be_null=Intended Audience cannot be null
 ui.error.sending_document=An error occurred while trying to send document
 ui.invalid_term=Invalid term
-ui.folder.not_empty=Folders must be empty before they can be deleted
+ui.folder.deletion_while_not_empty=Folders must be empty before they can be deleted
 ui.error.unexpected=An unexpected error occurred
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java
index d30138600..eb13f0396 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java
@@ -182,7 +182,7 @@ class FolderContentsTableForm extends Form
                 if (resource.isFolder()) {
                     if (! ((Folder) resource).isEmpty()) {
                         throw new FormProcessException(GlobalizationUtil.globalize(
-                                "ui.folder.not_empty"));
+                                "ui.folder.deletion_while_not_empty"));
                     }
                 }
             }  catch (PersistenceException exc) {