diff --git a/src/storages/hydrate.ts b/src/storages/hydrate.ts
index 716f251..383a133 100644
--- a/src/storages/hydrate.ts
+++ b/src/storages/hydrate.ts
@@ -42,6 +42,14 @@ async function hydrateEvents(opts: HydrateOpts): Promise<DittoEvent[]> {
     cache.push(event);
   }
 
+  for (const event of await gatherTargetAccounts({ events: cache, storage, signal })) {
+    cache.push(event);
+  }
+
+  for (const event of await gatherReportedStatuses({ events: cache, storage, signal })) {
+    cache.push(event);
+  }
+
   const stats = {
     authors: await gatherAuthorStats(cache),
     events: await gatherEventStats(cache),
@@ -69,6 +77,13 @@ function assembleEvents(
     event.author = b.find((e) => matchFilter({ kinds: [0], authors: [event.pubkey] }, e));
     event.user = b.find((e) => matchFilter({ kinds: [30361], authors: [admin], '#d': [event.pubkey] }, e));
 
+    if (event.kind === 1) {
+      const id = event.tags.find(([name]) => name === 'q')?.[1];
+      if (id) {
+        event.quote_repost = b.find((e) => matchFilter({ kinds: [1], ids: [id] }, e));
+      }
+    }
+
     if (event.kind === 6) {
       const id = event.tags.find(([name]) => name === 'e')?.[1];
       if (id) {
@@ -76,10 +91,27 @@ function assembleEvents(
       }
     }
 
-    if (event.kind === 1) {
-      const id = event.tags.find(([name]) => name === 'q')?.[1];
-      if (id) {
-        event.quote_repost = b.find((e) => matchFilter({ kinds: [1], ids: [id] }, e));
+    if (event.kind === 1984) {
+      const targetAccountId = event.tags.find(([name]) => name === 'p')?.[1];
+      if (targetAccountId) {
+        event.target_account = b.find((e) => matchFilter({ kinds: [0], authors: [targetAccountId] }, e));
+        if (event.target_account) {
+          event.target_account.user = b.find((e) =>
+            matchFilter({ kinds: [30361], authors: [admin], '#d': [event.pubkey] }, e)
+          );
+        }
+      }
+      const reportedEvents: DittoEvent[] = [];
+
+      const { status_ids } = JSON.parse(event.content);
+      if (status_ids && Array.isArray(status_ids)) {
+        for (const id of status_ids) {
+          if (typeof id === 'string') {
+            const reportedEvent = b.find((e) => matchFilter({ kinds: [1], ids: [id] }, e));
+            if (reportedEvent) reportedEvents.push(reportedEvent);
+          }
+        }
+        event.reported_statuses = reportedEvents;
       }
     }
 
@@ -167,6 +199,45 @@ function gatherUsers({ events, storage, signal }: HydrateOpts): Promise<DittoEve
   );
 }
 
+/** Collect reported statuses from the events. */
+function gatherReportedStatuses({ events, storage, signal }: HydrateOpts): Promise<DittoEvent[]> {
+  const ids = new Set<string>();
+  for (const event of events) {
+    if (event.kind === 1984) {
+      const { status_ids } = JSON.parse(event.content);
+      if (status_ids && Array.isArray(status_ids)) {
+        for (const id of status_ids) {
+          if (typeof id === 'string') ids.add(id);
+        }
+      }
+    }
+  }
+
+  return storage.query(
+    [{ kinds: [1], ids: [...ids], limit: ids.size }],
+    { signal },
+  );
+}
+
+/** Collect target accounts (the ones being reported) from the events. */
+function gatherTargetAccounts({ events, storage, signal }: HydrateOpts): Promise<DittoEvent[]> {
+  const pubkeys = new Set<string>();
+
+  for (const event of events) {
+    if (event.kind === 1984) {
+      const pubkey = event.tags.find(([name]) => name === 'p')?.[1];
+      if (pubkey) {
+        pubkeys.add(pubkey);
+      }
+    }
+  }
+
+  return storage.query(
+    [{ kinds: [0], authors: [...pubkeys], limit: pubkeys.size }],
+    { signal },
+  );
+}
+
 /** Collect author stats from the events. */
 function gatherAuthorStats(events: DittoEvent[]): Promise<DittoTables['author_stats'][]> {
   const pubkeys = new Set<string>(