diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java
index 01f83f1af..b2dee5fa1 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java
@@ -344,7 +344,7 @@ public class AssetFolderBrowser extends Table {
                                               CmsConstants.CMS_FOLDER_BUNDLE)));
                 link.setConfirmation(
                     new GlobalizedMessage(
-                        "cms.ui.folder.delete_confirmation",
+                        "cms.ui.folder.delete_confirmation_assets",
                         CmsConstants.CMS_FOLDER_BUNDLE));
                 return link;
             }
diff --git a/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources.properties b/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources.properties
index db6305e2a..45d075374 100755
--- a/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources.properties
+++ b/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources.properties
@@ -78,3 +78,5 @@ cms.ui.folder.copy.action=Copy
 cms.ui.folder.publish.action=(Re-)publish
 cms.ui.folder.unpublish.action=Unpublish
 cms.ui.folder.same_folder=Folders are equal
+cms.ui.folder.delete_confirmation_assets=Are you sure to delete this folder/asset?
+cms.ui.folder.no_assets=No assets or sub folders in this folder
diff --git a/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties b/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties
index ef78b895f..2bca18ad3 100755
--- a/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties
+++ b/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties
@@ -78,3 +78,5 @@ cms.ui.folder.copy.action=Kopieren
 cms.ui.folder.publish.action=(Re-)Publizieren
 cms.ui.folder.unpublish.action=Depublizieren
 cms.ui.folder.same_folder=Folders are equal
+cms.ui.folder.delete_confirmation_assets=Sind die sicher dass Sie diesen Ordner/dieses Asset l\u00f6schen wollen?
+cms.ui.folder.no_assets=Dieser Ordner hat (noch) keine Inhalt.
diff --git a/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties b/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties
index a47657bbc..ecf7dc3cf 100755
--- a/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties
+++ b/ccm-cms/src/main/resources/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties
@@ -73,3 +73,5 @@ cms.ui.folder.copy.action=
 cms.ui.folder.publish.action=
 cms.ui.folder.unpublish.action=
 cms.ui.folder.same_folder=Der als Ziel gew\u00e4hlte Ordner ist der gleiche Ordner wie der zu verschiebene Ordner.
+cms.ui.folder.delete_confirmation_assets=Are you sure to delete this folder/asset?
+cms.ui.folder.no_assets=No assets or sub folders in this folder