diff --git a/Classes/Domain/Service/SendMailService.php b/Classes/Domain/Service/SendMailService.php
index 29a7966..a45e613 100644
--- a/Classes/Domain/Service/SendMailService.php
+++ b/Classes/Domain/Service/SendMailService.php
@@ -1,6 +1,7 @@
 <?php
 namespace In2code\Powermailextended\Domain\Service;
 
+use In2code\Powermail\Domain\Service\SendMailService as SendMailServicePowermail;
 use TYPO3\CMS\Core\Mail\MailMessage;
 
 /**
@@ -15,14 +16,15 @@ class SendMailService
      * Manipulate message object short before powermail send the mail
      *
      * @param MailMessage $message
+     * @param array $email
+     * @param SendMailServicePowermail $originalService
      */
-    public function manipulateMail($message)
+    public function manipulateMail($message, &$email, SendMailServicePowermail $originalService)
     {
-        // overwrite the receiver
-        $message->setTo(
-            [
-                'anotheremail@domain.org' => 'receiverName'
-            ]
-        );
+        // overwrite the receiver in the email array to have it saved correctly!
+        $email['receiverName'] = 'John Mega';
+        $email['receiverEmail'] = 'john@mega.com';
+
+        $message->setTo([$email['receiverEmail'] => $email['receiverName']]);
     }
 }