diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
index 71625f7cf..092dccabe 100644
--- a/app/views/shared/_reshare.haml
+++ b/app/views/shared/_reshare.haml
@@ -7,6 +7,6 @@
     = link_to t('.reshare'), "#"
 
   %ul.reshare_box
-    - for aspect in current_user.aspects
+    - for aspect in aspects
       %li.aspect_to_share= link_to aspect, :controller => "aspects", :action => "show", :id => aspect.id, :prefill => post.message
 
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index ea9097dc5..446eec4e9 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -22,7 +22,9 @@
                   %a{:href => "/aspects/#{aspect.id}"}=aspect.name
 
         .right
-          = render 'shared/reshare', :current_user => current_user, :post => post if post.is_a? StatusMessage
+          - reshare_aspects = aspects.reject{|a| post.aspect_ids.include?(a.id)}
+          - unless reshare_aspects.empty?
+            = render 'shared/reshare', :current_user => current_user, :aspects => aspects, :post => post
           = link_to t('delete'), status_message_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
     = render 'status_messages/status_message', :post => post, :photos => post.photos