diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index f3b5f5afc0..d164288b16 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1383,6 +1383,7 @@ class mail_compose
 						? Vfs\Sharing::LINK : $content['filemode'] ?? '';
 				$attach['filemode_title'] = lang(Vfs\Sharing::$modes[$attach['filemode_icon']]['label'] ?? '');
 			}
+			$content['attachmentsBlockTitle'] =  count($content['attachments']).' '.Lang('Attachments');
 		}
 		else
 		{
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index a8685e9602..37361cde5b 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -94,7 +94,6 @@
 							<column disabled="!@showtempname" width="10%"/>
 							<column width="85%"/>
 							<column width="8%"/>
-							<column width="" />
 						</columns>
 						<rows>
 							<row class="row attachmentRow">
@@ -102,7 +101,6 @@
 								<description id="attachments[0][tmp_name]"/>
 								<description class="useEllipsis et2_link" id="attachments[0][name]" no_lang="1" onclick="app.mail.displayUploadedFile"/>
 								<vfs-size align="right" id="attachments[0][size]" />
-								<button id="delete[@attachments[0][tmp_name]]" value="Delete" image="delete"/>
 							</row>
 						</rows>
 					</grid>