diff --git a/includes/ecard.entity.inc b/includes/ecard.entity.inc
index eb27b1a..eedd198 100644
--- a/includes/ecard.entity.inc
+++ b/includes/ecard.entity.inc
@@ -181,9 +181,12 @@ function ecard_render_ecard($hash, $args, $options) {
         && $ecard->entity_id == $args['entity_id']) {
 
         $ecard->text = token_replace($ecard->text, (array) $ecard);
-        $element['ecard'] = $ecard;
-        $element['entity'] = entity_load($ecard->entity_type, array($ecard->entity_id));
-        $ecard_render .= theme('ecard_formatter_view', $element);
+        $variables['ecard'] = $ecard;
+        $variables['entity'] = entity_load($ecard->entity_type, array($ecard->entity_id));
+        $variables['name_to'] = t('Hey @name_to,', $ecard->name_to);
+        $variables['content'] = $ecard->text;
+        $variables['footer'] = t('Regards @name_from', $ecard->name_from);
+        $ecard_render .= theme('ecard_formatter_view', $variables);
       }
     }
   }
diff --git a/includes/ecard.mail.inc b/includes/ecard.mail.inc
index 9d3de4a..862611c 100644
--- a/includes/ecard.mail.inc
+++ b/includes/ecard.mail.inc
@@ -22,11 +22,11 @@ function ecard_mail_send_ecard($ecard, $key = 'ecard_ecard') {
   switch ($key) {
     case 'ecard_ecard':
       $to = ecard_recipient($ecard->mail_to, $ecard->name_to);
-      $send_message = t('Your E-Card was send.');
+      $send_message = t('Your E-Card was sent.');
       break;
     case 'ecard_copy':
       $to = ecard_recipient($ecard->mail_from, $ecard->name_from);
-      $send_message = t('A copy of your E-Card was send to you.');
+      $send_message = t('A copy of your E-Card was sent to you.');
       break;
   }
   if ($ecard->mail_from) {
diff --git a/theme/ecard_field.tpl.php b/theme/ecard_field.tpl.php
index ab2a092..0718c66 100644
--- a/theme/ecard_field.tpl.php
+++ b/theme/ecard_field.tpl.php
@@ -5,7 +5,7 @@
 ?>
 
 <div class="ecard">
-  <div class="name-to">Hey <?php print $variables['ecard']->name_to ?>,</div>
-  <div class="content"><?php print $variables['ecard']->text ?></div>
-  <div class="content">Regards <?php print $variables['ecard']->name_from ?></div>
+  <div class="name-to"><?php print $name_to; ?></div>
+  <div class="content"><?php print $content; ?></div>
+  <div class="footer"><?php print $footer; ?></div>
 </div>
\ No newline at end of file