diff --git a/Configuration/FlexForms/FlexformPi1.xml b/Configuration/FlexForms/FlexformPi1.xml
index c8b651a1b..1c0de29f3 100644
--- a/Configuration/FlexForms/FlexformPi1.xml
+++ b/Configuration/FlexForms/FlexformPi1.xml
@@ -83,21 +83,21 @@
 							<renderType>selectSingle</renderType>
 							<items type="array">
 								<numIndex index="0">
-									<label >LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.type.0</label>
+									<label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.type.0</label>
 									<value>0</value>
 								</numIndex>
 								<numIndex index="1">
 									<label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.type.1</label>
 									<value>1</value>
 								</numIndex>
-								<numIndex index="3">
-									<label index="0">LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.type.3</label>
-									<value>3</value>
-								</numIndex>
 								<numIndex index="2">
 									<label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.type.2</label>
 									<value>2</value>
 								</numIndex>
+								<numIndex index="3">
+									<label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.type.3</label>
+									<value>3</value>
+								</numIndex>
 							</items>
 							<size>1</size>
 							<minitems>1</minitems>
@@ -126,7 +126,7 @@
 							<type>text</type>
 							<cols>32</cols>
 							<rows>2</rows>
-                            <max>1000</max>
+							<max>1000</max>
 						</config>
 					</settings.flexform.receiver.email>
 					<settings.flexform.receiver.fe_group>
@@ -201,24 +201,24 @@
 						</config>
 					</settings.flexform.receiver.subject>
 					<settings.flexform.receiver.body>
-                        <exclude>1</exclude>
-                        <label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.body</label>
-                        <config>
-                            <type>text</type>
-                            <default>{powermail_all}</default>
-                            <enableRichtext>1</enableRichtext>
-                        </config>
+						<exclude>1</exclude>
+						<label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.body</label>
+						<config>
+							<type>text</type>
+							<default>{powermail_all}</default>
+							<enableRichtext>1</enableRichtext>
+						</config>
 					</settings.flexform.receiver.body>
-                    <settings.flexform.receiver.attachment>
-                        <displayCond>USER:In2code\Powermail\UserFunc\TestForFeature->isFeatureEnabled:powermailEditorsAreAllowedToSendAttachments</displayCond>
-                        <exclude>1</exclude>
-                        <label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.attachment</label>
-                        <config>
-                            <type>check</type>
-                            <default>0</default>
-                        </config>
-                    </settings.flexform.receiver.attachment>
-                </el>
+					<settings.flexform.receiver.attachment>
+						<displayCond>USER:In2code\Powermail\UserFunc\TestForFeature->isFeatureEnabled:powermailEditorsAreAllowedToSendAttachments</displayCond>
+						<exclude>1</exclude>
+						<label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.receiver.attachment</label>
+						<config>
+							<type>check</type>
+							<default>0</default>
+						</config>
+					</settings.flexform.receiver.attachment>
+				</el>
 			</ROOT>
 		</receiver>
 		<sender>
@@ -259,16 +259,16 @@
 							<enableRichtext>1</enableRichtext>
 						</config>
 					</settings.flexform.sender.body>
-                    <settings.flexform.sender.attachment>
-                        <displayCond>USER:In2code\Powermail\UserFunc\TestForFeature->isFeatureEnabled:powermailEditorsAreAllowedToSendAttachments</displayCond>
-                        <exclude>1</exclude>
-                        <label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.sender.attachment</label>
-                        <config>
-                            <type>check</type>
-                            <default>0</default>
-                        </config>
-                    </settings.flexform.sender.attachment>
-                </el>
+					<settings.flexform.sender.attachment>
+						<displayCond>USER:In2code\Powermail\UserFunc\TestForFeature->isFeatureEnabled:powermailEditorsAreAllowedToSendAttachments</displayCond>
+						<exclude>1</exclude>
+						<label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.sender.attachment</label>
+						<config>
+							<type>check</type>
+							<default>0</default>
+						</config>
+					</settings.flexform.sender.attachment>
+				</el>
 			</ROOT>
 		</sender>
 		<thx>
@@ -289,9 +289,7 @@
 						<exclude>1</exclude>
 						<label>LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:flexform.thx.redirect</label>
 						<config>
-							<type>input</type>
-							<eval>trim</eval>
-							<renderType>inputLink</renderType>
+							<type>link</type>
 						</config>
 					</settings.flexform.thx.redirect>
 				</el>