Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6194)
+++ /controller/wpsg_ShopController.class.php	(revision 6195)
@@ -2814,4 +2814,6 @@
 				
 			}
+			
+			$this->callMods('sendMail', array($mail_key, $o_id, $k_id, &$empfaenger, &$subject, &$mail_text_send, &$headers, &$anhang));
 			 
 			wp_mail($empfaenger, $subject, $mail_text_send, $headers, $anhang);
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 6194)
+++ /lib/wpsg_basket.class.php	(revision 6195)
@@ -337,6 +337,22 @@
 		{
 			
-			$order = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($o_id)."'");
-			$kunde = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_KU."` WHERE `id` = '".wpsg_q($order['k_id'])."'");
+			$order = $this->db->fetchRow("
+				SELECT 
+					* 
+			  	FROM 
+					`".WPSG_TBL_ORDER."` 
+			  	WHERE 
+			  		`id` = '".wpsg_q($o_id)."'
+			");
+			
+			$kunde = $this->db->fetchRow("
+				SELECT 
+					K.*, A.*, K.`id` AS `id` 
+				FROM 
+					`".WPSG_TBL_KU."` AS K
+					 	LEFT JOIN `".WPSG_TBL_ADRESS."` AS A ON (A.`id` = K.`adress_id`)
+				WHERE 
+					K.`id` = '".wpsg_q($order['k_id'])."'
+			");
 			
 			$this->arCheckout = array(
@@ -363,4 +379,16 @@
 			);
 			
+			if ($this->shop->hasMod('wpsg_mod_autodebit'))
+			{
+				
+				$this->arCheckout['mod_autodebit_name'] = wpsg_getStr($order['mod_autodebit_name']);
+		   		$this->arCheckout['mod_autodebit_blz'] = wpsg_getStr($order['mod_autodebit_blz']);
+				$this->arCheckout['mod_autodebit_bic'] = wpsg_getStr($order['mod_autodebit_bic']);
+		   		$this->arCheckout['mod_autodebit_inhaber'] = wpsg_getStr($order['mod_autodebit_inhaber']);
+		   		$this->arCheckout['mod_autodebit_knr'] = wpsg_getStr($order['mod_autodebit_knr']);
+				$this->arCheckout['mod_autodebit_iban'] = wpsg_getStr($order['mod_autodebit_iban']);
+				
+			}
+			
 			$this->arOrder = $order;
 			
@@ -569,5 +597,5 @@
 				if ($bDebug === true) $empfaenger = $this->shop->get_option('wpsg_adminmail_empfaenger');
 				else $empfaenger = $this->arCheckout['email'];
-				
+												
 				$this->shop->sendMail($mail_text, $empfaenger, 'kundenmail', $arAttachments, $order_id, $oOrder->k_id, $mail_html);
 
Index: /mods/wpsg_mod_basic.class.php
===================================================================
--- /mods/wpsg_mod_basic.class.php	(revision 6194)
+++ /mods/wpsg_mod_basic.class.php	(revision 6195)
@@ -525,4 +525,6 @@
 		public function mail_shipping() { }
 		
+		public function sendMail($mail_key, $order_id, $customer_id, &$empfaenger, &$subject, &$mail_text_send, &$headers, &$anhang) { }
+		
 		/** Wird beim speichern eines Kunden wÀhrend der Bestellung aufgerufen */
 		public function basket_save_kunde(&$data, &$checkout) { }
Index: /views/mods/mod_autodebit/order_view_afterpayment.phtml
===================================================================
--- /views/mods/mod_autodebit/order_view_afterpayment.phtml	(revision 6194)
+++ /views/mods/mod_autodebit/order_view_afterpayment.phtml	(revision 6195)
@@ -7,17 +7,17 @@
 ?>
 <br />
-<?php echo wpsg_drawForm_Input('', __('Name der Bank', 'wpsg'), $this->view['wpsg_mod_autodebit']['name'], array('text' => true, 'clear_after' => true)); ?>
+<?php echo wpsg_drawForm_Text(__('Name der Bank', 'wpsg'), $this->view['wpsg_mod_autodebit']['name']); ?>
 
 <?php if ($this->get_option('wpsg_mod_autodebit_iban') == '1') { ?>
-<?php echo wpsg_drawForm_Input('', __('BIC der Bank', 'wpsg'), $this->view['wpsg_mod_autodebit']['bic'], array('text' => true, 'clear_after' => true)); ?>
+<?php echo wpsg_drawForm_Text(__('BIC der Bank', 'wpsg'), $this->view['wpsg_mod_autodebit']['bic']); ?>
 <?php } else { ?>
-<?php echo wpsg_drawForm_Input('', __('BLZ der Bank', 'wpsg'), $this->view['wpsg_mod_autodebit']['blz'], array('text' => true, 'clear_after' => true)); ?>
+<?php echo wpsg_drawForm_Text(__('BLZ der Bank', 'wpsg'), $this->view['wpsg_mod_autodebit']['blz']); ?>
 <?php } ?>
 
-<?php echo wpsg_drawForm_Input('', __('Inhaber', 'wpsg'), $this->view['wpsg_mod_autodebit']['inhaber'], array('text' => true, 'clear_after' => true)); ?>
+<?php echo wpsg_drawForm_Text(__('Inhaber', 'wpsg'), $this->view['wpsg_mod_autodebit']['inhaber']); ?>
 
 <?php if ($this->get_option('wpsg_mod_autodebit_iban') == '1') { ?>
-<?php echo wpsg_drawForm_Input('', __('IBAN Nr.', 'wpsg'), $this->view['wpsg_mod_autodebit']['iban'], array('text' => true, 'clear_after' => true)); ?>
+<?php echo wpsg_drawForm_Text(__('IBAN Nr.', 'wpsg'), $this->view['wpsg_mod_autodebit']['iban']); ?>
 <?php } else { ?>
-<?php echo wpsg_drawForm_Input('', __('Kontonummer', 'wpsg'), $this->view['wpsg_mod_autodebit']['knr'], array('text' => true, 'clear_after' => true)); ?>
+<?php echo wpsg_drawForm_Text(__('Kontonummer', 'wpsg'), $this->view['wpsg_mod_autodebit']['knr']); ?>
 <?php } ?>