From 299b019bf44152adb6b6fd2cedd2cc118ccbc119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 11 Jun 2026 23:03:59 +0200
Subject: [PATCH 1/2] fix: add missing space to mail footer signature delimiter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The signature delimiter on the first line of the mail footer templates was
missing the trailing space required by the signature block convention
(RFC 3676). Without "-- " (dash-dash-space) followed by a line break, mail
clients cannot recognize and collapse the signature.

Fixes #41364

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
---
 changelog/unreleased/41364           | 8 ++++++++
 core/templates/html.mail.footer.php  | 2 +-
 core/templates/plain.mail.footer.php | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 changelog/unreleased/41364

diff --git a/changelog/unreleased/41364 b/changelog/unreleased/41364
new file mode 100644
index 000000000000..b27b329baaf7
--- /dev/null
+++ b/changelog/unreleased/41364
@@ -0,0 +1,8 @@
+Bugfix: Add missing space to mail footer signature delimiter
+
+We've fixed the signature delimiter in the email footer templates. The delimiter
+on the first line was missing the trailing space required by the signature block
+convention (RFC 3676), so mail clients were unable to recognize and collapse the
+signature. The delimiter is now correctly written as "-- " (dash-dash-space).
+
+https://github.com/owncloud/core/issues/41364
diff --git a/core/templates/html.mail.footer.php b/core/templates/html.mail.footer.php
index a024a4857536..69e41947212c 100644
--- a/core/templates/html.mail.footer.php
+++ b/core/templates/html.mail.footer.php
@@ -1,4 +1,4 @@
---<br>
+-- <br>
 <?php p($theme->getName()); ?> -
 <?php p($theme->getSlogan()); ?>
 <br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
diff --git a/core/templates/plain.mail.footer.php b/core/templates/plain.mail.footer.php
index f23600d9a3f0..efbe9f75ba71 100644
--- a/core/templates/plain.mail.footer.php
+++ b/core/templates/plain.mail.footer.php
@@ -1,4 +1,4 @@
---
+-- 
 <?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
 <?php
 p("\n" . $theme->getBaseUrl());

From 45a3bc060a3a21170f0a6bd110ba8d370a081cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Fri, 12 Jun 2026 08:17:37 +0200
Subject: [PATCH 2/2] chore: rename changelog item to PR number and add PR link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renames changelog/unreleased/41364 to 41617 to match the PR number and adds
the PR link, addressing review feedback on #41617.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
---
 changelog/unreleased/{41364 => 41617} | 1 +
 1 file changed, 1 insertion(+)
 rename changelog/unreleased/{41364 => 41617} (90%)

diff --git a/changelog/unreleased/41364 b/changelog/unreleased/41617
similarity index 90%
rename from changelog/unreleased/41364
rename to changelog/unreleased/41617
index b27b329baaf7..2cd6652482d5 100644
--- a/changelog/unreleased/41364
+++ b/changelog/unreleased/41617
@@ -6,3 +6,4 @@ convention (RFC 3676), so mail clients were unable to recognize and collapse the
 signature. The delimiter is now correctly written as "-- " (dash-dash-space).
 
 https://github.com/owncloud/core/issues/41364
+https://github.com/owncloud/core/pull/41617