4 files changed, 14 insertions, 8 deletions
diff --git a/app/views/profile/_status.html.haml b/app/views/profile/_status.html.haml
index c2033b4f7..1edd8df77 100644
--- a/app/views/profile/_status.html.haml
+++ b/app/views/profile/_status.html.haml
@@ -1,16 +1,23 @@
-%div.entry{ class: status.reblog? ? 'entry-reblog' : 'entry-status' }
+- if status.reply? && include_threads
+  = render partial: 'status', locals: { status: status.thread, include_threads: false, is_predecessor: true, is_successor: false }
+
+.entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) }
   - if status.reblog?
     .pre-header
       %i.fa.fa-retweet
       Shared by
       = link_to display_name(status.account), profile_url(status.account), class: 'name'
-  .entry-container
+  .entry__container
     .avatar
-      = image_tag status.reblog? ? status.reblog.account.avatar.url(:small) : status.account.avatar.url(:small)
-    .container
+      = image_tag avatar_for_status_url(status)
+    .entry__container__container
       .header
         = render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status }
       .content
         = status.content
       .counters
         = render partial: 'status_footer', locals: { status: status.reblog? ? status.reblog : status }
+
+- if include_threads
+  - status.replies.each do |status|
+    = render partial: 'status', locals: { status: status, include_threads: false, is_successor: true, is_predecessor: false }
diff --git a/app/views/profile/_status_header.html.haml b/app/views/profile/_status_header.html.haml
index e1c810088..225a89d71 100644
--- a/app/views/profile/_status_header.html.haml
+++ b/app/views/profile/_status_header.html.haml
@@ -4,5 +4,4 @@
 
 = link_to status_url(status), class: 'time' do
   %span{ title: status.created_at }
-    = time_ago_in_words(status.created_at)
-    ago
+    = relative_time(status.created_at)
diff --git a/app/views/profile/entry.html.haml b/app/views/profile/entry.html.haml
index 8d0b23607..33eaa5f1d 100644
--- a/app/views/profile/entry.html.haml
+++ b/app/views/profile/entry.html.haml
@@ -1,2 +1,2 @@
 %div.activity-stream
-  = render partial: @type, locals: { @type.to_sym => @entry.activity }
+  = render partial: @type, locals: { @type.to_sym => @entry.activity, include_threads: true, is_predecessor: false, is_successor: false }
diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml
index b93791734..b7f4bdeaf 100644
--- a/app/views/profile/show.html.haml
+++ b/app/views/profile/show.html.haml
@@ -7,4 +7,4 @@
 
 .activity-stream
   - @account.statuses.order('id desc').each do |status|
-    = render partial: 'status', locals: { status: status }
+    = render partial: 'status', locals: { status: status, include_threads: false, is_successor: false, is_predecessor: false }