Index: ds/mod_addressvalidation/settings_edit.phtml
===================================================================
--- /mods/mod_addressvalidation/settings_edit.phtml	(revision 6999)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?php
-
-	/**
-	 * Template fÃŒr die Einstellungen des Moduls "Adressvalidation"
-	 */
-
-?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_addressvalidation_apikey', __('API-Key', 'wpsg'), $this->get_option('wpsg_mod_addressvalidation_apikey'), array('help' => 'wpsg_mod_addressvalidation_apikey')); ?>
-
-<a class="button-primary" id="button-google" target="popup" href="http://www.address-validator.net/address-online-verification-api.html" onclick="window.open('', 'popup', 'width=500;height=200,resizable=yes,menubar=yes')">
-	<?php echo __('SchlÃŒssel anfordern', 'wpsg'); ?>
-</a>
Index: /mods/wpsg_mod_voucherproduct.class.php
===================================================================
--- /mods/wpsg_mod_voucherproduct.class.php	(revision 6999)
+++ /mods/wpsg_mod_voucherproduct.class.php	(revision 7000)
@@ -235,5 +235,5 @@
 					$mail_text = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_voucherproduct/gutschein_mail.phtml', false);
 				
-					if ($this->get_option('wpsg_htmlmail') === '1')
+					if ($this->shop->get_option('wpsg_htmlmail') === '1')
 					{