CVE-2026-47123

@@ -582,11 +582,32 @@ public function processMessage($message, $message_id, $mailbox, $mailboxes, $ext
                     continue;
                 }
                 // Is it a message from Customer or User replied to the notification
-                preg_match('/^'.$this->formatMessageIdPrefix(\MailHelper::MESSAGE_ID_PREFIX_NOTIFICATION)."\-(\d+)\-(\d+)\-/", $prev_message_id, $m);
+                preg_match('/^'.$this->formatMessageIdPrefix(\MailHelper::MESSAGE_ID_PREFIX_NOTIFICATION)."\-(\d+)\-(\d+)\-([a-z0-9]+)/", $prev_message_id, $m);
 
                 if (!$is_bounce && !empty($m[1]) && !empty($m[2])) {
-                    // Reply from User to the notification
+                    // Reply from User to the notification.
+                    $prev_thread_id = '';
+                    // Check hash.
+                    // https://github.com/freescout-help-desk/freescout/security/advisories/GHSA-6r38-6mcf-2ww3
+                    if (!empty($m[1]) && !empty($m[3])) {
+                        $message_id_hash = $m[3];
+                        if (strlen($message_id_hash) == 16) {
+                            if ($message_id_hash == \MailHelper::getMessageIdHash($m[1])) {
+                                $prev_thread_id = $m[1];
+                            }
+                        } else {
+                            // No backward compatibility for security reasons.
+                            //$prev_thread_id = $m[1];
+                        }
+                    }
+
+                    if (!$prev_thread_id) {
+                        $this->logError('Invalid hash in the Message-ID: '.$prev_message_id);
+                        $this->setSeen($message, $mailbox);
+                        return;
+                    }
                     $prev_thread = Thread::find($m[1]);
+
                     $user_id = $m[2];
                     $user = User::find($user_id);
                     $message_from_customer = false;

@@ -123,7 +123,7 @@ public function handle()
                 }
             }
 
-            $message_id = \App\Misc\Mail::MESSAGE_ID_PREFIX_NOTIFICATION.'-'.$last_thread->id.'-'.$user->id.'-'.time().'@'.$mailbox->getEmailDomain();
+            $message_id = \App\Misc\Mail::MESSAGE_ID_PREFIX_NOTIFICATION.'-'.$last_thread->id.'-'.$user->id.'-'.\MailHelper::getMessageIdHash($last_thread->id).'@'.$mailbox->getEmailDomain();
             $headers['Message-ID'] = $message_id;
 
             // If this is notification on message from customer, set customer as sender name

@@ -744,18 +744,18 @@
     "Auto Replies": "Automatische Antworten",
     "Add a phone number": "Eine Telefonnummer hinzufügen",
     "Company": "Unternehmen",
-    "Social Profiles": "Social-Media Profile",
-    "Add a social profile": "Eine Social-Media Profil hinzufügen",
+    "Social Profiles": "Social-Media Profil",
+    "Add a social profile": "Ein Social-Media-Profil hinzufügen",
     "Age": "Alter",
     "Gender": "Geschlecht",
-    "Male": "Männlich",
-    "Female": "Weiblich",
+    "Male": "männlich",
+    "Female": "weiblich",
     "Country": "Land",
     "Address": "Adresse",
-    "State": "Staat",
+    "State": "Bundesland",
     "City": "Stadt",
     "ZIP": "Postleitzahl",
     "Notes": "Notizen",
     "Access denied": "Zugang verweigert",
-    "Deleting :name will deactivate workflows they are tied to and assign their conversations to:": "Beim Löschen dieses Benutzers werden auch die ihm zugeordneten Workflows deaktiviert und seine Gespräche werden zugewiesen an:"
-}
\ No newline at end of file
+    "Deleting :name will deactivate workflows they are tied to and assign their conversations to:": "Durch das Löschen von :name werden diesem Benutzer zugeordnete Workflows deaktiviert und neue Gespräche werden zugeordnet zu:"
+}