diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index e393eee85af..aeef876c491 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -3,6 +3,7 @@ require_dependency 'email/message_builder'
 require_dependency 'age_words'
 
 class UserNotifications < ActionMailer::Base
+  include UserNotificationsHelper
   helper :application
   default charset: 'UTF-8'
 
@@ -106,20 +107,27 @@ class UserNotifications < ActionMailer::Base
     end
 
     @popular_topics = topics_for_digest[0,SiteSetting.digest_topics]
-    @other_new_for_you = topics_for_digest.size > SiteSetting.digest_topics ? topics_for_digest[SiteSetting.digest_topics..-1] : []
-
-    @popular_posts = if SiteSetting.digest_posts > 0
-      Post.order("posts.score DESC")
-          .for_mailing_list(user, min_date)
-          .where('posts.post_type = ?', Post.types[:regular])
-          .where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false')
-          .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 5.0)
-          .limit(SiteSetting.digest_posts)
-    else
-      []
-    end
 
     if @popular_topics.present?
+      @other_new_for_you = topics_for_digest.size > SiteSetting.digest_topics ? topics_for_digest[SiteSetting.digest_topics..-1] : []
+
+      @popular_posts = if SiteSetting.digest_posts > 0
+        Post.order("posts.score DESC")
+            .for_mailing_list(user, min_date)
+            .where('posts.post_type = ?', Post.types[:regular])
+            .where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false')
+            .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 5.0)
+            .limit(SiteSetting.digest_posts)
+      else
+        []
+      end
+
+      @excerpts = {}
+
+      @popular_topics.map do |t|
+        @excerpts[t.first_post.id] = email_excerpt(t.first_post.cooked) if t.first_post.present?
+      end
+
       # Try to find 3 interesting stats for the top of the digest
 
       new_topics_count = Topic.new_since_last_seen(user, min_date).count
diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index c9261000b0c..66e5930732b 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -149,7 +149,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
           <p style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= t.user.username -%></p>
         <% end %>
       </td>
-      <%- if show_image_with_url(t.image_url) && t.featured_link.nil? -%>
+      <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%>
         <td style="margin:0;padding:0 16px 0 8px;text-align:right;" align="right">
           <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-align:right;text-decoration:none;">
         </td>
@@ -163,7 +163,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
   <tbody>
     <tr>
       <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;text-align:left;width:100%;font-weight:normal;">
-        <%= email_excerpt(t.first_post.cooked) %>
+        <%= @excerpts[t.first_post.id] %>
       </td>
     </tr>
   </tbody>