1 files changed, 16 insertions, 14 deletions
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index f70e2c890..eeb2fec00 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -3,20 +3,22 @@
 - is_successor    ||= false
 - centered        ||= include_threads && !is_predecessor && !is_successor
 
-- if status.reply? && include_threads
-  = render partial: 'status', collection: @ancestors, as: :status, locals: { is_predecessor: true }
+%div{ class: [is_predecessor && 'u-in-reply-to h-cite', is_successor && 'u-comment h-cite', !is_predecessor && !is_successor && 'h-entry'] }
+  - if status.reply? && include_threads
+    = render partial: 'status', collection: @ancestors, as: :status, locals: { is_predecessor: true }
 
-.entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) }
-  - if status.reblog?
-    .pre-header
-      %div.pre-header__icon
-        = fa_icon('retweet fw')
-      %span
-        = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
-          %strong= display_name(status.account)
-        = t('stream_entries.reblogged')
+  .entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) }
+    - if status.reblog?
+      .pre-header
+        %div.pre-header__icon
+          = fa_icon('retweet fw')
+        %span
+          = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
+            %strong= display_name(status.account)
+          = t('stream_entries.reblogged')
 
-  = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) }
+    %div{ class: [status.reblog? && 'u-repost-of h-cite'] }
+      = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) }
 
-- if include_threads
-  = render partial: 'status', collection: @descendants, as: :status, locals: { is_successor: true }
+  - if include_threads
+    = render partial: 'status', collection: @descendants, as: :status, locals: { is_successor: true }