diff --git a/templates/mail/email_base.xhtml b/templates/mail/email_base.xhtml
index c381e6cf5..726ea213d 100644
--- a/templates/mail/email_base.xhtml
+++ b/templates/mail/email_base.xhtml
@@ -14,7 +14,9 @@
                 <table cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF" align="center" width="644" style="padding: 20px; margin-top: 24px;border: 1px solid #BABABA;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;color:#333;">
                     <tr>
                         <td align="center">
+                            {% block header %}
                             <a href="http://{% current_domain %}{{ user.profile.autologin_url }}"><img alt="NewsBlur" src="http://{% current_domain %}/media/img/logo_newsblur_blur.png" title="NewsBlur" style="width:312px;height:55px;border: none;"></a>
+                            {% endblock header %}
                         </td>
                     </tr>
                     <tr>
diff --git a/templates/mail/email_story_html.xhtml b/templates/mail/email_story_html.xhtml
index a099875ad..01fb6369d 100644
--- a/templates/mail/email_story_html.xhtml
+++ b/templates/mail/email_story_html.xhtml
@@ -1,10 +1,12 @@
 {% extends "mail/email_base.xhtml" %}
 {% load social_tags %}
 
+{% block header %}{% endblock %}
+
 {% block body %}
     
-    <p style="font-size: 24px; color:#555555; margin-top: 18px;margin-bottom: 10px;padding-top:6px;line-height: 36px;">
-        <a href="{{ share_user_profile.blurblog_url }}"><img src="{{ share_user_profile.email_photo_url }}" style="width: 48px; height: 48px;margin: 0 12px 0 0;border-radius: 3px;border: none;float: left"></a> {{ from_name }} is sharing a story with you entitled "<a href="{{ story.story_permalink|safe }}">{{ story.story_title }}</a>"{% if feed %} from <img src="{{ feed.favicon_url_fqdn }}" style="width: 16px;height: 16px;vertical-align: middle"> {{ feed.feed_title }}{% endif %}:
+    <p style="font-size: 24px; color:#555555; margin-top: 0;margin-bottom: 10px;padding-top:0px;line-height: 28px;">
+        <a href="{{ share_user_profile.blurblog_url }}"><img src="{{ share_user_profile.email_photo_url }}" style="width: 48px; height: 48px;margin: 0 12px 0 0;border-radius: 3px;border: none;float: left"></a> {{ from_name }} is sharing a story with you entitled "<a href="{{ story.story_permalink|safe }}">{{ story.story_title }}</a>"{% if feed %} from <img src="{{ feed.favicon_url_fqdn }}" style="width: 16px;height: 16px;vertical-align: middle"> {{ feed.feed_title }}{% endif %}
     </p>
     
     {% if comments %}
@@ -12,7 +14,7 @@
     {{ comments }}</p>
     {% endif %}
     
-    <div style="border-top: 3px solid #404040; padding: 4px 0;"></div>
+    <div style="margin: 24px 0 12px; border-top: 3px solid #404040; padding: 4px 0;"></div>
 
     <h2>{{ story.story_title }}</h2>