diff --git a/CHANGELOG.md b/CHANGELOG.md
index c27123ca..3b41d6ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.3.3] - 2023-??-??
+
+- [0007549](https://bugs.oxid-esales.com/view.php?id=7549): Optional field in shop admin -> refund "Note to buyer" is transmitted to PayPal
+
 ## [2.3.2] - 2023-10-05
 
 - [0007537](https://bugs.oxid-esales.com/view.php?id=7537): Show PayNow-Button on PP-Standard instead of Continue-Button
diff --git a/metadata.php b/metadata.php
index 621ec39c..3c55b772 100644
--- a/metadata.php
+++ b/metadata.php
@@ -56,7 +56,7 @@
         'en' => 'Use of the online payment service from PayPal. Documentation: <a href="https://docs.oxid-esales.com/modules/paypal-checkout/en/latest/" target="_blank">PayPal Checkout</a>'
     ],
     'thumbnail' => 'out/img/paypal.png',
-    'version' => '2.3.2',
+    'version' => '2.3.3-rc.1',
     'author' => 'OXID eSales AG',
     'url' => 'https://www.oxid-esales.com',
     'email' => 'info@oxid-esales.com',
diff --git a/src/Controller/Admin/PayPalOrderController.php b/src/Controller/Admin/PayPalOrderController.php
index 033567d0..7f4a2d62 100644
--- a/src/Controller/Admin/PayPalOrderController.php
+++ b/src/Controller/Admin/PayPalOrderController.php
@@ -200,7 +200,7 @@ public function refund(): void
         $refundAmount = preg_replace("/[\,\.](\d{3})/", "$1", $refundAmount);
         $invoiceId = $request->getRequestEscapedParameter('invoiceId');
         $refundAll = $request->getRequestEscapedParameter('refundAll');
-        $noteToPayer = $request->getRequestParameter('noteToPayer');
+        $noteToPayer = $request->getRequestEscapedParameter('noteToPayer');
 
         /** @var Order $order */
         $order = $this->getOrder();
diff --git a/views/admin/tpl/oscpaypalorder.tpl b/views/admin/tpl/oscpaypalorder.tpl
index af87f566..8d1bfca4 100644
--- a/views/admin/tpl/oscpaypalorder.tpl
+++ b/views/admin/tpl/oscpaypalorder.tpl
@@ -211,8 +211,8 @@
                         <td><input type="text" id="invoiceId" name="invoiceId" maxlength="127"></td>
                     </tr>
                     <tr>
-                        <td><label for="noteToBuyer">[{oxmultilang ident="OSC_PAYPAL_NOTE_TO_BUYER"}]</label></td>
-                        <td><textarea id="noteToBuyer" name="noteToBuyer" maxlength="255"></textarea></td>
+                        <td><label for="noteToPayer">[{oxmultilang ident="OSC_PAYPAL_NOTE_TO_BUYER"}]</label></td>
+                        <td><textarea id="noteToPayer" name="noteToPayer" maxlength="255"></textarea></td>
                     </tr>
                     <tr>
                         <td><label for="refundAll">[{oxmultilang ident="OSC_PAYPAL_REFUND_ALL"}]</label></td>