diff --git a/booking.admin.inc b/booking.admin.inc
index 5733189..90afd6b 100644
--- a/booking.admin.inc
+++ b/booking.admin.inc
@@ -9,6 +9,11 @@ function booking_admin() {
   
   //regenerate all our menu hooks when loading this form
   menu_rebuild();
+
+  //dodgy hack for testing
+  mailsystem_set(array(
+    'booking' => 'BookingMailSystem',
+  ));
   
   //create the mysql view booking_person_view if necessary
   try {
diff --git a/booking.module b/booking.module
index f19ac32..7780aa0 100644
--- a/booking.module
+++ b/booking.module
@@ -828,7 +828,7 @@ function booking_theme($existing, $type, $theme, $path) {
     return array(
     	'booking_details' => array('arguments' => array('node' => NULL)),			
       'booking_htmlmail_template' => array(
-        'variables' => array('module' => NULL, 'key' => NULL, 'recipient' => NULL, 'subject' => NULL, 'body' => NULL, 'message' => array()),
+        'variables' => array('module' => NULL, 'key' => NULL, 'css' => NULL, 'recipient' => NULL, 'subject' => NULL, 'body' => NULL, 'message' => array()),
 				'path' => drupal_get_path('module', 'booking'). '/theme',
         'template' => 'mimemail-message'	// extension of .tpl.php automatically added
       ),