diff --git a/booking.emails.inc b/booking.emails.inc
index 60aed36..a38201a 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -43,10 +43,14 @@ function _booking_registration_email($nid, $balance_payment, $manual = false) {
 
 	//apply a theme to the HTML body of the email
 	$html_body = theme('booking_htmlmail_template', 
-		array('variables' => array(
-			'body' => _booking_registration_email_generate($node, $waiting_list, $balance_payment, $manual),
+		array(
+			'module' => 'booking',
+			'key' => 'registration_mail',
+			'variables' => array(
+				'body' => _booking_registration_email_generate($node, $waiting_list, $balance_payment, $manual),
+			)
 		)
-	));
+	);
 	watchdog('booking_debug', "<pre>HTML body themed\n@info</pre>", array('@info' => print_r($html_body, true)));
 	$params['body'] = $html_body;		
 
diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 54d567c..1fc5008 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -499,7 +499,7 @@ function _booking_email_get_preview_callback($form, $form_state) {
   switch ($emailtype) {
     case "registration":
       $text = variable_get('booking_email_bookedin_text');
-      watchdog('booking_debug', "<pre>Email generation:\n@info</pre>", array('@info' => print_r( $text, true)));
+      //watchdog('booking_debug', "<pre>Email generation:\n@info</pre>", array('@info' => print_r( $text, true)));
       //use the html value if it is set, otherwise use the plaintext input which is just a string
       $text = isset($text['format']) ? $text['value'] : $text;
       break;