33250: when deleting all attachments, fix displaying information abou…

…t all deleted attachments

CHANGELOG.md

@@ -1,6 +1,7 @@
 - E-mail: Set internal date on IMAP APPEND command's. This way the internal date when moving or copying messages to another account is preserved
 - Core: added endpoint api/up.php that checks the database connection and filesystem disks for uptime monitoring.
 - Core / e-mail: Fixed problem where typing ü would insert a , in the mail composer on german QWERTZ layout
+- E-mail: Fix 'delete all attachments' bug.
 
 14-10-2024: 6.8.77
 - Timeregistration: Fixed time dialog tracking time starting at midnight

www/modules/email/model/ImapMessage.php

@@ -810,9 +810,17 @@ public function deleteAttachments(): bool
 		}
 		while ($att = array_shift($atts)) {
 			if ($att->disposition == 'attachment' || empty($att->content_id)) {
+				// Do not delete S/MINE certificate
+				if ($att->mime === "application/x-pkcs7-signature") {
+					continue;
+				}
+
 				$str = $this->addPartString($att, $bIsPlain);
 				$a = Attachment::fromString($str, "", ($bIsPlain ? 'text/plain' : 'text/html'), Attachment::ENCODING_7BIT);
-				$a->setId("");
+
+				// Fool PHPMailer into attaching all attachments. If the IDs are identical, later attachments are not
+				// being attached inline.
+				$a->setId(random_bytes(12));
 				$msg->embed($a);
 			}
 		}