From c968bd4e05e06116d3459f2cb177eae014f580b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= <p.schuele@metaways.de>
Date: Wed, 6 Nov 2024 13:27:34 +0100
Subject: [PATCH 1/2] text(Felamimail/Message/Send): improve error message on
 credential decrypt failure

---
 tine20/Felamimail/Controller/Message/Send.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tine20/Felamimail/Controller/Message/Send.php b/tine20/Felamimail/Controller/Message/Send.php
index 19501268e03..5fe2a79d776 100644
--- a/tine20/Felamimail/Controller/Message/Send.php
+++ b/tine20/Felamimail/Controller/Message/Send.php
@@ -780,10 +780,15 @@ protected function _setMailRecipients(Zend_Mail $_mail, Felamimail_Model_Message
         return $nonPrivateRecipients;
     }
 
-    protected function _getErrorException($messageText)
+    protected function _getErrorException(string $messageText): Tinebase_Exception_SystemGeneric
     {
         $translation = Tinebase_Translation::getTranslation('Felamimail');
-        $message = sprintf($translation->_('Error: %s'), $messageText);
+        if (preg_match('/evp_decrypt/i', $messageText)) {
+            $message = $translation->_(
+                'Decryption Error: Maybe your shared credential cache key is longer than 24 chars?');
+        } else {
+            $message = sprintf($translation->_('Error: %s'), $messageText);
+        }
         $tesg = new Tinebase_Exception_SystemGeneric($message);
         $tesg->setTitle($translation->_('Could not send message'));
 

From 52b8add4af41b35282e69858c348b2815ad8cf01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= <p.schuele@metaways.de>
Date: Wed, 6 Nov 2024 15:57:38 +0100
Subject: [PATCH 2/2] docs(RELEASENOTES): featureShowAccountEmail has been
 removed

---
 tine20/RELEASENOTES.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tine20/RELEASENOTES.md b/tine20/RELEASENOTES.md
index 6a59cb409e1..07bdff558fe 100644
--- a/tine20/RELEASENOTES.md
+++ b/tine20/RELEASENOTES.md
@@ -3,7 +3,7 @@ TINE RELEASENOTES
 =====================
                     
   Release:     Pelle (2024.11)
-  Last change: 2024-10-22
+  Last change: 2024-11-06
 
 # GENERAL CHANGES (Administrative/Operative)
 
@@ -32,6 +32,10 @@ TINE RELEASENOTES
 ## number range configuration (for example for Sales product numbers)
 ## Send Password via SMS
 ## Show Mailaccount Sieve-Script
+## Tinebase feature "featureShowAccountEmail" has been removed
+
+It is now possible to configure the account "title" display via TWIG templates.
+See Tinebase_Config::ACCOUNT_TWIG configuration.
 
 # SSO