Index: /views/admin/form/text.phtml
===================================================================
--- /views/admin/form/text.phtml	(revision 7933)
+++ /views/admin/form/text.phtml	(revision 7934)
@@ -1,3 +1,3 @@
-<div class="form-group form-group-text form-group-sm <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?> <?php echo wpsg_getStr($this->view['field_config']['class_wrap']); ?>">
+<div class="form-group form-group-text form-group-sm <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?> <?php echo wpsg_getStr($this->view['field_config']['class_wrap']); ?>" <?php echo ((isset($this->view['field_config']['wrap_id']))?'id="'.$this->view['field_config']['wrap_id'].'" ':''); ?>>
     
 	<label class="col-sm-6 control-label" for=""><?php echo $this->view['field_label']; ?></label>
Index: /views/mods/mod_kundenkontakt/order_index_bottom.phtml
===================================================================
--- /views/mods/mod_kundenkontakt/order_index_bottom.phtml	(revision 7933)
+++ /views/mods/mod_kundenkontakt/order_index_bottom.phtml	(revision 7934)
@@ -23,7 +23,33 @@
         <?php echo wpsg_drawForm_Select('wpsg_mod_kundenkontakt_template', __('Template', 'wpsg'), $arTemplateSelect, '0'); ?>
         <?php echo wpsg_drawForm_Input('wpsg_mod_kundenkontakt_subject', __('Betreff', 'wpsg'), '', ['wrap_id' => 'wpsg_mod_kundenkontakt_subject_wrap']); ?>
-        <?php echo wpsg_drawForm_Textarea('wpsg_mod_kundenkontakt_text', __('Text', 'wpsg'), '', ['wrap_id' => 'wpsg_mod_kundenkontakt_text_wrap']); ?>
-              
+        
+        <?php /* echo wpsg_drawForm_Textarea('wpsg_mod_kundenkontakt_text', __('Text', 'wpsg'), '', ['wrap_id' => 'wpsg_mod_kundenkontakt_text_wrap']); */ ?>
+        			
+        <div class="form-group form-group-sm form-textarea" id="wpsg_mod_kundenkontakt_text_wrap">	
+                <label class="col-sm-6 control-label" for="wpsg_mod_kundenkontakt_text">Text</label>                
+                <div class="col-sm-6">                    
+                    <div class="wpsg_field_wrap">
+            
+                        <?php if ($this->get_option('wpsg_htmlmail') === '1') { ?>
+                            
+                            <?php wp_editor('', 'wpsg_mod_kundenkontakt_text'); ?>
+                            
+                        <?php } else { ?>
+                        
+                            <textarea class="form-control" id="wpsg_mod_kundenkontakt_text" name="wpsg_mod_kundenkontakt_text"></textarea>
+                    
+                        <?php } ?>
+                        
+                    </div>
+                        
+            </div>
+            
+            <div class="clearfix wpsg_clear"></div>
+            
+        </div> 
+            
         <?php echo wpsg_drawForm_Button(__('Kunden informieren', 'wpsg'), '', ['wrap_id' => 'wpsg_mod_kundenkontakt_submit_wrap', 'field_id' => 'wpsg_mod_kundenkontakt_submit']); ?>
+        
+        <?php echo wpsg_drawForm_Text('', __('Bitte warten ...', 'wpsg'), 'wpsg_mod_kundenverwaltung_loading', ['wrap_id' => 'wpsg_mod_kundenkontakt_loading_wrap']); ?>
         
     </div>
@@ -43,4 +69,6 @@
     let el_wpsg_mod_kundenkontakt_submit_wrap = document.getElementById('wpsg_mod_kundenkontakt_submit_wrap');
     
+    let el_wpsg_mod_kundenkontakt_loading_wrap = document.getElementById('wpsg_mod_kundenkontakt_loading_wrap');
+    
     let el_doaction = document.getElementById('doaction');
     
@@ -48,5 +76,7 @@
             
     	if (event.target.value !== '0') {
-                		
+            
+    		el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'block';
+    		
             jQuery.ajax({ 
                 url: "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&noheader=1&do=kk_switchTemplate",
@@ -57,4 +87,6 @@
                 success: function(data) {
             
+                	el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'none';
+                	
                 	el_wpsg_mod_kundenkontakt_subject_wrap.style.display = 'block';
     		        el_wpsg_mod_kundenkontakt_text_wrap.style.display = 'block';  
@@ -62,5 +94,10 @@
                 	
                     el_wpsg_mod_kundenkontakt_subject.value = data.subject;
+                    
+                    <?php if ($this->get_option('wpsg_htmlmail') === '1') { ?>
+                    tinyMCE.get('wpsg_mod_kundenkontakt_text').setContent(data.content);
+                    <?php } else { ?>
                     el_wpsg_mod_kundenkontakt_text.value = data.content;
+                    <?php } ?>
                     
                 }
@@ -72,4 +109,5 @@
     		el_wpsg_mod_kundenkontakt_text_wrap.style.display = 'none';
     		el_wpsg_mod_kundenkontakt_submit_wrap.style.display = 'none';
+    		el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'none';
     		    		
         }
@@ -96,4 +134,8 @@
     	
     	el_wpsg_mod_kundenkontakt_submit.setAttribute("disabled", "disabled");
+    	el_wpsg_mod_kundenkontakt_subject.setAttribute("disabled", "disabled");
+        el_wpsg_mod_kundenkontakt_text.setAttribute("disabled", "disabled");
+    	  
+    	el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'block';
     	
     	jQuery.ajax({ 
@@ -105,6 +147,26 @@
             },
             success: function(data) {
-        
+                    	            	
+            	document.getElementById('wpsg_mod_kundenkontakt_template').selectedIndex = 0;
+            	
+            	for (let el of document.querySelectorAll('.col_set_checkbox')) {
+            		
+            		el.checked = false;
+            		
+	            }
+            	
+            	el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'none';
+            	
+            	el_wpsg_mod_kundenkontakt_subject_wrap.style.display = 'none';
+            	el_wpsg_mod_kundenkontakt_subject.value = '';
+            	
+            	el_wpsg_mod_kundenkontakt_text_wrap.style.display = 'none';
+            	el_wpsg_mod_kundenkontakt_text.value = '';
+            	        
             	el_wpsg_mod_kundenkontakt_submit.removeAttribute("disabled");
+            	el_wpsg_mod_kundenkontakt_subject.removeAttribute("disabled");
+                el_wpsg_mod_kundenkontakt_text.removeAttribute("disabled");
+            	
+            	el_wpsg_mod_kundenkontakt_submit_wrap.style.display = 'none';
             	
             	alert(data);
@@ -139,4 +201,9 @@
     #wpsg_mod_kundenkontakt_text_wrap { display:none; }
     #wpsg_mod_kundenkontakt_submit_wrap { display:none; }
+    #wpsg_mod_kundenkontakt_loading_wrap { display:none; }
+    #wpsg_mod_kundenkontakt_layer .form-group > label { width:15% !important; }
+    #wpsg_mod_kundenkontakt_layer .wpsg_form_field > .wpsg_form_left { width:15% !important; }
+    #wpsg_mod_kundenkontakt_layer .form-group > div:nth-child(2),
+    #wpsg_mod_kundenkontakt_layer .wpsg_form_field > .wpsg_form_right { width:85% !important; }
     
 </style>
Index: /views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml
===================================================================
--- /views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml	(revision 7933)
+++ /views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml	(revision 7934)
@@ -2,6 +2,4 @@
 	
 	global $template_name, $template_betreff, $absender_name, $absender_email;
-
-	include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml');
 
 	/**
@@ -11,5 +9,5 @@
 	$template_betreff = __('wpShopGermany: Zahlungsaufforderung', 'wpsg');
  
-?><p><?php echo __('Hallo %kunde_anrede% %kunde_vname% %kunde_name%,', 'wpsg'); ?>,</p>
+?><p><?php echo __('Hallo %kunde_anrede% %kunde_vname% %kunde_name%,', 'wpsg'); ?></p>
  
 <p><?php echo __('Sie sind Ihren Zahlungsverpflichtungen nicht nachgekommen. Bitte begleichen Sie umgehend den Rechnungsbetrag von %order_topay_brutto_formated%.', 'wpsg') ?></p>
Index: /views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml
===================================================================
--- /views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml	(revision 7933)
+++ /views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml	(revision 7934)
@@ -2,7 +2,5 @@
 
 	global $template_name, $template_betreff, $absender_name, $absender_email;
-
-	include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml');
-
+ 
 	/**
 	 * Betreff des Templates
Index: /views/order/index.phtml
===================================================================
--- /views/order/index.phtml	(revision 7933)
+++ /views/order/index.phtml	(revision 7934)
@@ -16,5 +16,5 @@
 	
 ?>
-
+ 
 <div class="wpsg_order" id="wpsg-bs">