diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index 2ba3cde9ee0..044b4eb3128 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -36,9 +36,9 @@ module UserNotificationsHelper
     doc = Nokogiri::HTML(html)
 
     result = ""
-    doc.css('p').each do |p|
-      if p.text.present?
-        result << p.to_s
+    doc.css('body > p, aside.onebox').each do |node|
+      if node.text.present?
+        result << node.to_s
         return result if result.size >= 100
       end
     end
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index c2bad2f75d6..a6fb8e27327 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -152,7 +152,6 @@ module Email
     end
 
     def format_html
-      # lowest priority first
       style('.with-accent-colors', "background-color: #{SiteSetting.email_accent_bg_color}; color: #{SiteSetting.email_accent_fg_color};")
       style('h4', 'color: #222;')
       style('h3', 'margin: 15px 0 20px 0;')
@@ -162,7 +161,6 @@ module Email
       style('li', 'padding-bottom: 10px')
       style('div.footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;')
       style('span.post-count', 'margin: 0 5px; color: #777;')
-      style('.post-excerpt img', "max-width: 50%; max-height: 400px;")
       style('pre', 'word-wrap: break-word; max-width: 694px;')
       style('code', 'background-color: #f1f1ff; padding: 2px 5px;')
       style('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;')
@@ -170,6 +168,8 @@ module Email
 
       onebox_styles
       plugin_styles
+
+      style('.post-excerpt img', "max-width: 50%; max-height: 400px;")
     end
 
     # this method is reserved for styles specific to plugin