diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 5d30673d11..f3b5f5afc0 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1384,6 +1384,10 @@ class mail_compose
$attach['filemode_title'] = lang(Vfs\Sharing::$modes[$attach['filemode_icon']]['label'] ?? '');
}
}
+ else
+ {
+ unset($content['attachments']);
+ }
if (isset($content['to'])) $content['to'] = self::resolveEmailAddressList($content['to']);
$content['html_toolbar'] = empty(Mail::$mailConfig['html_toolbar']) ?
diff --git a/mail/js/app.js b/mail/js/app.js
index fa4c15b6e6..3a0f67ce99 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4518,17 +4518,8 @@ app.classes.mail = AppJS.extend(
var bodyH = egw_getWindowInnerHeight();
var textArea = this.et2.getWidgetById('mail_plaintext');
var $headerSec = jQuery('.mailComposeHeaderSection');
- var attachments = this.et2.getWidgetById('attachments');
var content = this.et2.getArrayMgr('content').data;
- // @var arrbitary int represents px
- // Visible height of attachment progress
- var prgV_H = 150;
-
- // @var arrbitary int represents px
- // Visible height of attchements list
- var attchV_H = 68;
-
if (typeof textArea != 'undefined' && textArea != null)
{
if (textArea.getParent().disabled)
@@ -4536,11 +4527,11 @@ app.classes.mail = AppJS.extend(
textArea = this.et2.getWidgetById('mail_htmltext');
}
// Tolerate values base on plain text or html, in order to calculate freespaces
- var textAreaDelta = textArea.id == "mail_htmltext"?20:40;
+ var textAreaDelta = textArea.id == "mail_htmltext"?120:40;
// while attachments are in progress take progress visiblity into account
// otherwise the attachment progress is finished and consider attachments list
- var delta = (attachments.table.find('li').length>0 && attachments.table.height() > 0)? prgV_H: (content.attachments? attchV_H: textAreaDelta);
+ var delta = textAreaDelta;
var bodySize = (bodyH - Math.round($headerSec.height() + $headerSec.offset().top) - delta);
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index a8afbee02c..4ccdd026de 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -281,7 +281,6 @@ pre {
white-space: nowrap;
overflow: hidden;
word-wrap: break-word;
- max-width: 0px;
}
#mail-index {
position: relative
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 601efe2005..a8685e9602 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -24,7 +24,7 @@
-
+
@@ -86,19 +86,28 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -116,6 +125,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+