diff --git a/api/js/etemplate/Et2Vfs/Et2VfsSelect.styles.ts b/api/js/etemplate/Et2Vfs/Et2VfsSelect.styles.ts
index 47fd07104d..47ce135266 100644
--- a/api/js/etemplate/Et2Vfs/Et2VfsSelect.styles.ts
+++ b/api/js/etemplate/Et2Vfs/Et2VfsSelect.styles.ts
@@ -10,6 +10,9 @@ export default css`
 		flex-direction: column;
 		gap: var(--sl-spacing-small);
 	}
+    et2-dialog et2-vfs-select-row{
+        overflow-wrap: anywhere;
+    }
 
 	.et2_toolbar {
 		display: flex;
diff --git a/api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts b/api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts
index f2cbb9e466..295877f250 100644
--- a/api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts
+++ b/api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts
@@ -197,7 +197,7 @@ export class Et2VfsSelectDialog
 		return this.egw().request(this.egw().link(this.egw().ajaxUrl(this.egw().decodePath(Et2VfsSelectDialog.SERVER_URL))),
 			[content, attrs]).then((results) =>
 		{
-			debugger;
+			//debugger;
 
 		});
 	}
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index be33658566..2d74f3652e 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -1775,6 +1775,7 @@ ul.et2_vfs {
 }
 
 .et2_vfs li.vfsFilename {
+    overflow-wrap: anywhere;
     display: inline;
 }
 
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index c9e4580c30..5a78fe4ba1 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -174,6 +174,9 @@ A.sieveRowInActive
 table tr.attachmentRow > td{
 	vertical-align: middle;
 }
+table tr.attachmentRow > td et2-description{
+	width: 84vw;
+}
 table tr.attachmentRow > td > img {
 	background:transparent;
 	padding-left: 5px;
@@ -237,7 +240,7 @@ pre {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	overflow: hidden;
-	word-wrap: break-word;
+	overflow-wrap: anywhere;
 }
 #mail-index {
 	position: relative;
@@ -356,7 +359,7 @@ div.mailUploadSection > div.et2_hbox > label {
 	min-width: 15ex;
 }
 #mail-compose_selectFromVFSForCompose{
-	display: none;
+	height:0;
 	width:20px;
 	float:none;
 	background-color: transparent;