diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index bd171c5..9bad9ee 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -507,8 +507,6 @@ 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><br /><br /></div>";
   $text = "";
   $emailtype = $form_state['values']['email-type'];
 
@@ -549,7 +547,16 @@ function _booking_email_get_preview_callback($form, $form_state) {
   //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;
   //watchdog('booking_debug', "<pre>Email generation:\n@info</pre>", array('@info' => print_r( $text, true)));
-  
+
+  if(variable_get('booking_enable_html_mail', 0) == 1) {
+    $markup_pre = "<div id=\"booking_email_preview_wrapper\"><h3>Email Preview</h3>";
+    $markup_post = "<br /><br /></div>";    
+  }
+  else {
+    $markup_pre = "<div id=\"booking_email_preview_wrapper\"><h3>Email Preview</h3><pre>";
+    $markup_post = "</pre><br /><br /></div>";    
+  }
+
   //generate html that will be used to update div booking_email_preview_wrapper
   return $markup_pre . $text . $markup_post;
 }
diff --git a/theme/mimemail-message-registration_mail.tpl.php b/theme/mimemail-message-registration_mail.tpl.php
index 4525f1a..9dbe405 100644
--- a/theme/mimemail-message-registration_mail.tpl.php
+++ b/theme/mimemail-message-registration_mail.tpl.php
@@ -199,8 +199,6 @@ a[x-apple-data-detectors=true] {
             <div class="col num12" style="min-width: 320px;max-width: 700px;width: 700px;width: calc(38000% - 265300px);background-color: #FFFFFF;">
               <div style="background-color: transparent; width: 100% !important;">
               <!--[if (!mso)&(!IE)]><!--><div style="border-top: 0px solid transparent; border-left: 0px solid transparent; border-bottom: 0px solid transparent; border-right: 0px solid transparent; padding-top:5px; padding-bottom:5px; padding-right: 0px; padding-left: 0px;"><!--<![endif]-->
-
-                  
                     <div align="center" class="img-container center fullwidth" style="padding-right: 0px;  padding-left: 0px;">
 <!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 0px; padding-left: 0px;" align="center"><![endif]-->
 <div style="line-height:15px;font-size:1px">&nbsp;</div>  <img class="center fullwidth" align="center" border="0" src="<?php echo $GLOBALS['base_url']; ?>/sites/all/modules/booking/images/Final_Logo.png" alt="Image" title="Image" style="outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;clear: both;display: block !important;border: 0;height: auto;float: none;width: 100%;max-width: 700px" width="700">
@@ -292,7 +290,7 @@ a[x-apple-data-detectors=true] {
                   
                     <!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top: 20px; padding-bottom: 10px;"><![endif]-->
 <div style="font-family:Verdana, Geneva, sans-serif;line-height:120%;color:#0068A5; padding-right: 10px; padding-left: 10px; padding-top: 20px; padding-bottom: 10px;">	
-	<div><p style="margin: 0;font-size: 14px;line-height: 17px;text-align: center"><span style="font-size: 36px; line-height: 43px;"><strong><span style="line-height: 43px; font-size: 36px;"><?php print $subject ?></span></strong></span></p></div>	
+	<div><p style="margin: 0;text-align: center"><strong><span style="line-height: 43px; font-size: 36px;"><?php print $subject ?></span></strong></p></div>	
 </div>
 <!--[if mso]></td></tr></table><![endif]-->