diff --git a/app/models/post.rb b/app/models/post.rb
index aa07c888f..205170f13 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -24,7 +24,9 @@ class Post < ActiveRecord::Base
     t.add :author
     t.add :post_type
     t.add :image_url
+    t.add :object_url
     t.add :root
+    t.add :o_embed_cache
   end
 
   xml_attr :provider_display_name
diff --git a/app/views/templates/activity-streams-photo.ujs b/app/views/templates/activity-streams-photo.ujs
index 2d5fa3954..1c779bf95 100644
--- a/app/views/templates/activity-streams-photo.ujs
+++ b/app/views/templates/activity-streams-photo.ujs
@@ -1 +1,3 @@
-<img src="<%= image_url %>" />
+<a href="<%= object_url %>" class="stream-photo-link">
+  <img src="<%= image_url %>" data-small-photo="<%= image_url %>" data-full-photo="<%= image_url %>" class="stream-photo" />
+</a>
diff --git a/app/views/templates/reshare.ujs b/app/views/templates/reshare.ujs
index a17216e06..480df78da 100644
--- a/app/views/templates/reshare.ujs
+++ b/app/views/templates/reshare.ujs
@@ -1,4 +1,28 @@
-<p>
-  <h2>this is a reshare</h2>
-  <%= root.text %>
-</p>
+<div class="reshare">
+
+  <a href="/people/<%= root.author.id %>">
+    <img src="<%= root.author.avatar.small %>" class="avatar" data-person-id="<%= root.author.id %>"/>
+  </a>
+
+  <div class="content">
+    <div class="post_initial_info">
+      <span class="from">
+        <a href="/people/<%= root.author.id %>">
+          <%= root.author.name %>
+        </a>
+      </span>
+      <span class="details">
+        -
+        <a href="/posts/<%= root.id %>">
+          <time class="timeago" datetime="<%= root.created_at %>"/>
+        </a>
+      </span>
+    </div>
+
+    <!-- duplicate from statusmessage partial -->
+    <p>
+      <%= root.text %>
+    </p>
+
+  </div>
+</div>
diff --git a/app/views/templates/status_message.ujs b/app/views/templates/status_message.ujs
index a36daca39..6d7c40ef7 100644
--- a/app/views/templates/status_message.ujs
+++ b/app/views/templates/status_message.ujs
@@ -1,3 +1,7 @@
 <p>
   <%= text %>
 </p>
+
+<% if(o_embed_cache) { %>
+  <%= o_embed_cache.posts.data.html %>
+<% } %>