Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 7132)
+++ /controller/wpsg_AdminController.class.php	(revision 7133)
@@ -1616,5 +1616,5 @@
 				{
 
-					$path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_mailconf/';
+					$path = wpsg_getUploadDir('wpsg_mailconf');
 					$htaccess = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_mailconf/.htaccess';
 
@@ -1628,5 +1628,5 @@
 				{
 
-					$path = WPSG_PATH_CONTENT.'uploads/wpsg/wpsg_mailconf/';
+					$path = wpsg_getUploadDir('wpsg_mailconf');
 					$htaccess = WPSG_PATH_CONTENT.'uploads/wpsg/wpsg_mailconf/.htaccess';
 
@@ -1667,4 +1667,5 @@
 					else if ($ending == "jpg" || $ending == "jpeg")
 					{
+					   
 						$destination = $this->getMailConfFilePath('').'wpsg_email_logo.jpg';
 
Index: /views/admin/emailconf.phtml
===================================================================
--- /views/admin/emailconf.phtml	(revision 7132)
+++ /views/admin/emailconf.phtml	(revision 7133)
@@ -193,5 +193,6 @@
 
 		});
-		if(jQuery("#wpsg_email_logo_watermark")[0].checked == true) jQuery(".col-logo-alignment").hide();
+		
+		if(jQuery("#wpsg_email_logo_watermark").first().checked == true) jQuery(".col-logo-alignment").hide();
 
 	} );
Index: /views/admin/form/emailconf.phtml
===================================================================
--- /views/admin/form/emailconf.phtml	(revision 7132)
+++ /views/admin/form/emailconf.phtml	(revision 7133)
@@ -24,36 +24,18 @@
 	<?php } ?>
 
-	<div class="modal fade" tabindex="-1" role="dialog" id="modal<?php echo $this->view['field_key']; ?>">
-		<div class="modal-dialog">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title"><?php echo __('Text im Footer der Mail bearbeiten', 'wpsg'); ?></h4>
-				</div>
-				<div class="modal-body">
+    <br /><p style="font-weight:700;"><?php echo (__('Text unter der E-Mail', 'wpsg')); ?></p>
 
-					<?php
+    <?php
+    
+    // RTE
+    ob_start();
+    wp_editor($this->get_option('wpsg_'.$this->view['field_key'].'_text'), 'wpsg_'.$this->view['field_key'].'_text');
+    $rte_content = ob_get_contents();
+    ob_end_clean();
+    
+    echo $rte_content;
+    
+    ?>
 
-						// RTE
-						ob_start();
-						wp_editor($this->get_option('wpsg_'.$this->view['field_key'].'_text'), 'wpsg_'.$this->view['field_key'].'_text');
-						$rte_content = ob_get_contents();
-						ob_end_clean();
-
-						echo $rte_content;
-
-					?>
-
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo __('Schließen', 'wpsg'); ?></button>
-				</div>
-			</div><!-- /.modal-content -->
-		</div><!-- /.modal-dialog -->
-	</div><!-- /.modal -->
-
-	<?php echo wpsg_drawForm_TextStart(); ?>
-	<a href="#" data-toggle="modal" data-target="#modal<?php echo $this->view['field_key']; ?>"><?php echo __('Text anzeigen/bearbeiten', 'wpsg'); ?></a>
-	<?php echo wpsg_drawForm_TextEnd(__('Text unter der E-Mail', 'wpsg')); ?>
 	<br />
 	<?php echo __('* Der restliche E-Mailtext kann nur im Mailtemplate verÀndert werden', 'wpsg'); ?>