Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7328)
+++ /lib/wpsg_basket.class.php	(revision 7329)
@@ -559,6 +559,9 @@
 			
 			$this->shop->view['o_id'] = $order_id;
+			$this->shop->view['k_id'] = $oOrder->k_id;
 			$this->shop->view['order'] = $this->shop->cache->loadOrder($order_id);
 			$this->shop->view['customer'] = $this->shop->cache->loadKunden($this->shop->view['oOrder']->k_id);
+			
+			$this->shop->view['basket']['checkout']['k_id'] = $oOrder->k_id;
 			
 			if ($bDebug === true)
Index: /views/mailtemplates/html/customer.phtml
===================================================================
--- /views/mailtemplates/html/customer.phtml	(revision 7328)
+++ /views/mailtemplates/html/customer.phtml	(revision 7329)
@@ -1,2 +1,3 @@
+
 <?php if ($this->hasMod('wpsg_mod_shippingadress') && $this->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', array('k_id' => $this->view['basket']['checkout']['k_id'], 'o_id' => $this->view['o_id']))) { ?>
 <h2><?php echo __('Rechnungsadresse:', 'wpsg'); ?></h2> 
Index: /views/mailtemplates/html/logo.phtml
===================================================================
--- /views/mailtemplates/html/logo.phtml	(revision 7328)
+++ /views/mailtemplates/html/logo.phtml	(revision 7329)
@@ -5,4 +5,7 @@
 
 <?php
+	
+	$logoPath = '';
+	
 	if($this->get_option('wpsg_email_logo_activated'))
 	{
@@ -27,7 +30,9 @@
 ?>
 
-<?php if(file_exists($logoPath) && $this->get_option('wpsg_email_logo_activated')) { ?>
+<?php if (file_exists($logoPath) && $this->get_option('wpsg_email_logo_activated')) { ?>
+	
 	<?php echo "<div class='email-logo $logoWatermark' style='text-align:$logoAlignment; opacity:$logoTransparency;'>" ?>
 	<?php echo "<img alt='Emaillogo' class='email-logo-$logoAlignment' src='$logoBase64'>"; ?>
 	<?php echo "</div>"; ?>
+	
 <?php } ?>
Index: /views/mods/mod_prepayment/mail_html.phtml
===================================================================
--- /views/mods/mod_prepayment/mail_html.phtml	(revision 7328)
+++ /views/mods/mod_prepayment/mail_html.phtml	(revision 7329)
@@ -29,5 +29,5 @@
 	<tr>
 		<td><?php echo __('Betreff', 'wpsg'); ?>:</td>
-		<td><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?></td>
+		<td style="text-align:right;"><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?></td>
 	</tr>
  </table>