diff --git a/app/helpers/reshares_helper.rb b/app/helpers/reshares_helper.rb
index 6ba1a0241..d889ce1d6 100644
--- a/app/helpers/reshares_helper.rb
+++ b/app/helpers/reshares_helper.rb
@@ -7,7 +7,11 @@ module ResharesHelper
     end
   end
 
-  def reshare_link post
-    link_to t("reshares.reshare.reshare", :count => post.reshares.size), reshares_path(:root_guid => post.guid), :method => :post, :remote => true, :confirm => t('reshares.reshare.reshare_confirmation', :author => post.author.name, :text => post.text)
+  def reshare_link(post)
+    if reshare?(post)
+      link_to t("reshares.reshare.reshare_original"), reshares_path(:root_guid => post.root.guid), :method => :post, :remote => true, :confirm => t('reshares.reshare.reshare_confirmation', :author => post.root.author.name)
+    else
+      link_to t("reshares.reshare.reshare", :count => post.reshares.size), reshares_path(:root_guid => post.guid), :method => :post, :remote => true, :confirm => t('reshares.reshare.reshare_confirmation', :author => post.author.name)
+    end
   end
 end
diff --git a/app/views/reshares/_reshare.haml b/app/views/reshares/_reshare.haml
index 38fe531f6..add2e59a8 100644
--- a/app/views/reshares/_reshare.haml
+++ b/app/views/reshares/_reshare.haml
@@ -8,10 +8,14 @@
     = person_image_link(post.author, :size => :thumb_small)
 
     .content
-      .right
-        = link_to t(".show_original"), post_path(post)
       %span.from
         = person_link(post.author, :class => "hovercardable")
+        %span.details
+          –
+          %span.timeago
+            = link_to(how_long_ago(post), post_path(post))
+          –
+          = t("reshares.reshare.reshare", :count => post.reshares.size)
 
       - if post.activity_streams?
         = link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link"
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 70375a2ed..cfcc37c72 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -58,7 +58,7 @@
           %span.like_action
             = like_action(post, current_user)
 
-          - if (post.author_id != current_user.person.id) && (post.public?) && !reshare?(post)
+          - if (post.author_id != current_user.person.id) && (post.public?)
             ·
             %span.reshare_action
               = reshare_link(post)
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 7d85cba13..22cdb588f 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -591,14 +591,15 @@ en:
         other: "%{count} new requests!"
   reshares:
     reshare:
+      reshare_original: "Reshare orignial"
       reshare:
         zero: "Reshare"
-        one: "1 reshare"
-        few: "%{count} reshares"
-        many: "%{count} reshares"
-        other: "%{count} reshares"
+        one: "1 Reshare"
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        other: "%{count} Reshares"
       show_original: "Show original"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_confirmation: "Reshare %{author}'s post?"
       deleted: "Original post deleted by author."
     create:
       failure: "There was an error resharing this post."
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 64475b53e..4859b17ec 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -492,8 +492,12 @@ ul.as-selections
   :margin
     :bottom 5px
 
-.details
-  :color #aaa
+.from
+  .details,
+  .details *
+    :color #aaa
+    :font
+      :weight normal
 
 .post_scope
   :cursor default
@@ -612,8 +616,12 @@ ul.show_comments,
       :display inline
 
 .stream_element .reshare
-  :padding 10px
-  :border 1px solid #eee
+  :padding
+    :left 10px
+  :border-left 2px solid #ddd
+  :margin
+    :top 5px
+    :bottom 10px
 
 ul.show_comments
   :padding