diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars b/app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars
index 4f356f99600..aaa5bb3ccb4 100644
--- a/app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars
+++ b/app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars
@@ -1,3 +1,5 @@
+<p>{{i18n admin.email.preview_digest_desc}}</p>
+
 <div class='admin-controls'>
   <div class='span7 controls'>
     <label for='last-seen'>{{i18n admin.email.last_seen_user}}</label>
diff --git a/app/assets/javascripts/discourse/views/view.js b/app/assets/javascripts/discourse/views/view.js
index 3dc23bbc724..66f11f7e32e 100644
--- a/app/assets/javascripts/discourse/views/view.js
+++ b/app/assets/javascripts/discourse/views/view.js
@@ -14,7 +14,7 @@ Discourse.View.reopenClass({
   /**
     Register a view helper for ease of use
 
-    @method registerHElper
+    @method registerHelper
     @param {String} helperName the name of the helper
     @param {Ember.View} helperClass the view that will be inserted by the helper
   **/
diff --git a/app/views/user_notifications/digest.text.erb b/app/views/user_notifications/digest.text.erb
index caf580b02d9..f22dea64cbf 100644
--- a/app/views/user_notifications/digest.text.erb
+++ b/app/views/user_notifications/digest.text.erb
@@ -10,10 +10,10 @@
 <%= raw(@markdown_linker.create(t.title, t.relative_url)) %>
 
 <%- if t.best_post.present? %>
-<%= raw(t.best_post.excerpt(1000,
+ <div class='digest-post'><%= raw(t.best_post.excerpt(1000,
                             strip_links: true,
                             text_entities: true,
-                            markdown_images: true)) %>
+                            markdown_images: true)) %></div>
 
 --------------------------------------------------------------------------------
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1a57027aeee..75e63eb5fc3 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1080,6 +1080,7 @@ en:
         sent_test: "sent!"
         delivery_method: "Delivery Method"
         preview_digest: "Preview Digest"
+        preview_digest_desc: "This is a tool for previewing the content of the digest emails sent from your forum."
         refresh: "Refresh"
         format: "Format"
         html: "html"
diff --git a/lib/email/renderer.rb b/lib/email/renderer.rb
index f3bf7575b05..24ac6680ec2 100644
--- a/lib/email/renderer.rb
+++ b/lib/email/renderer.rb
@@ -21,7 +21,7 @@ module Email
     end
 
     def html
-      cooked = PrettyText.cook(text, environment: 'email')
+      cooked = PrettyText.cook(text)
 
       if @opts[:html_template]
         ActionView::Base.new(Rails.configuration.paths["app/views"]).render(
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index b2ee0ddb3e3..c154abb3a5b 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -36,6 +36,10 @@ module Email
         pre.replace(pre.text)
       end
 
+      fragment.css('div.digest-post').each do |div|
+        div['style'] = 'margin-left: 15px; margin-top: 20px; max-width: 694px;'
+      end
+
       fragment.to_html
     end