diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index d047798..6d74069 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -382,7 +382,7 @@ function booking_manual_email_form($form, &$form_state)
 
     $form['booking-email-preview'] = array(
     '#type' => 'container',
-    '#children' => "<p>Email Preview</p><pre>Blah</pre>",
+    '#children' => "<h3>Email Preview</h3><pre>No email type selected.</pre>",
     '#prefix' => '<div id="booking_email_preview_wrapper">',
     '#suffix' => '</div>',    
   );
@@ -486,7 +486,7 @@ function booking_manual_email_form($form, &$form_state)
 function _booking_email_get_preview_callback($form, $form_state) {
   global $event;
   $markup_pre = "<div id=\"booking_email_preview_wrapper\"><h3>Email Preview</h3><pre>";
-  $markup_post = "</pre></div>";
+  $markup_post = "</pre><br /><br /></div>";
   $text = "";
   $emailtype = $form_state['values']['email-type'];
 
@@ -511,54 +511,15 @@ function _booking_email_get_preview_callback($form, $form_state) {
       break;
     case "remindertravelrequired":
       $text = variable_get('booking_email_travel_reminder_email_text');
-      break;      
+      break; 
+    case "travelcomplete":
+      $text = variable_get('booking_email_travel_complete_text');
+      break;             
   }
   //handle custom email types
   if (strpos($emailtype, 'custom') !== false) {
     $text = variable_get('booking_email_' . $form_state['values']['email-type']);
   }
-/*
-        if ($form_state['values']['email-type'] == 'registration') {
-          $message = t('Processing a manual registration email to id @info', array ('@info' => $key));
-          _booking_registration_email($key, false, true);
-        }		
-        elseif ($form_state['values']['email-type'] == 'initialtravelrequired') {
-          $message = t('Processing a manual initial travel form request email to id @info', array ('@info' => $key));
-          _booking_travelform_initial_request_email($key);
-        }
-        elseif ($form_state['values']['email-type'] == 'remindertravelrequired') {
-          $message = t('Processing a manual reminder travel form request email to id @info', array ('@info' => $key));
-          _booking_travelform_reminder_request_email($key);
-        }	        
-        elseif ($form_state['values']['email-type'] == 'balance') {
-          $message = t('Processing a manual outstanding balance email to id @info', array ('@info' => $key));
-          _booking_balance_payment_email($key);  
-        }
-        elseif ($form_state['values']['email-type'] == 'complete') {
-          $message = t('Processing a manual registration complete email to id @info', array ('@info' => $key));
-          _booking_registration_email($key, true, true); 
-        }	
-        elseif ($form_state['values']['email-type'] == 'travelcomplete') {
-          $message = t('Processing a manual travelform complete email to id @info', array ('@info' => $key));
-          _booking_travelform_confirmation_email($key); 
-        }
-        elseif ($form_state['values']['email-type'] == 'withdrawal') {
-          $message = t('Processing a manual withdrawal email to id @info', array ('@info' => $key));
-          _booking_demoted_to_notcoming_email($key); 
-        }
-        elseif ($form_state['values']['email-type'] == 'missedpayment') {
-          $message = t('Processing a manual missedpayment email to id @info', array ('@info' => $key));
-          _booking_missedpayment_email($key); 
-        }
-        elseif (strpos($form_state['values']['email-type'], 'customlogistics') !== false) {
-          $message = t('Processing a @custom type email from logistics to id @info', array ('@custom' => $form_state['values']['email-type'], '@info' => $key));
-          _booking_custom_email($key, $form_state['values']['email-type'], 'logistics');  
-        }									
-        elseif (strpos($form_state['values']['email-type'], 'custom') !== false) {
-          $message = t('Processing a @custom type email to id @info', array ('@custom' => $form_state['values']['email-type'], '@info' => $key));
-          _booking_custom_email($key, $form_state['values']['email-type'], 'contact');  
-        }
-*/
 
   //generate html that will be used to update div booking_email_preview_wrapper
   return $markup_pre . $text . $markup_post;