diff --git a/Classes/Controller/FormController.php b/Classes/Controller/FormController.php
index 5a97d31..1e8e723 100755
--- a/Classes/Controller/FormController.php
+++ b/Classes/Controller/FormController.php
@@ -1,20 +1,23 @@
 <?php
 namespace In2code\Powermailextended\Controller;
 
+use In2code\Powermail\Controller\FormController as FormControllerPowermail;
+use In2code\Powermail\Domain\Model\Mail;
+
 /**
- * Using a Slot to call a Powermail Signal
+ * Class FormController
  *
- * Class FormControllerExtended
  * @package In2code\Powermailextended\Controller
  */
 class FormController {
 
 	/**
-	 * @param \In2code\Powermail\Domain\Model\Mail $mail
+	 * @param Mail $mail
 	 * @param string $hash
-	 * @param \In2code\Powermail\Controller\FormController $pObj
+	 * @param FormControllerPowermail $pObj
+	 * @return void
 	 */
-	public function manipulateMailObjectOnCreate($mail, $hash, $pObj) {
+	public function manipulateMailObjectOnCreate(Mail $mail, $hash, $pObj) {
 		foreach ($mail->getAnswers() as $answer) {
 			if ($answer->getValue() === 'alex') {
 				$answer->setValue('alexander');
diff --git a/Classes/Domain/Service/SendMailService.php b/Classes/Domain/Service/SendMailService.php
new file mode 100644
index 0000000..7161c21
--- /dev/null
+++ b/Classes/Domain/Service/SendMailService.php
@@ -0,0 +1,31 @@
+<?php
+namespace In2code\Powermailextended\Domain\Service;
+
+use In2code\Powermail\Domain\Model\Mail;
+use TYPO3\CMS\Core\Mail\MailMessage;
+
+/**
+ * SendMailService
+ *
+ * @package powermailextend
+ */
+class SendMailService {
+
+	/**
+	 * Manipulate message object short before powermail send the mail
+	 *
+	 * @param MailMessage $message
+	 * @param array $email
+	 * @param Mail $mail
+	 * @param array $settings
+	 * @param string $type Email to "sender" or "receiver"
+	 */
+	public function manipulateMail($message, $email, $mail, $settings, $type) {
+		// overwrite the receiver
+		$message->setTo(
+			array(
+				'anotheremail@domain.org' => 'receiverName'
+			)
+		);
+	}
+}
diff --git a/ext_localconf.php b/ext_localconf.php
index a549ba7..3e786ae 100755
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,10 +1,25 @@
 <?php
-// enable SignalSlot
-//$signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Extbase\SignalSlot\Dispatcher');
+/**
+ * Register some Slots
+ */
+/** @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher $signalSlotDispatcher */
+$signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager')
+	->get('TYPO3\\CMS\\Extbase\\SignalSlot\Dispatcher');
+
+// Manipulate a value before sending
 //$signalSlotDispatcher->connect(
 //	'In2code\Powermail\Controller\FormController',
 //	'createActionBeforeRenderView',
 //	'In2code\Powermailextended\Controller\FormController',
 //	'manipulateMailObjectOnCreate',
 //	FALSE
+//);
+
+// Change receiver mail
+//$signalSlotDispatcher->connect(
+//	'In2code\Powermail\Domain\Service\SendMailService',
+//	'sendTemplateEmailBeforeSend',
+//	'In2code\Powermailextended\Domain\Service\SendMailService',
+//	'manipulateMail',
+//	FALSE
 //);
\ No newline at end of file