diff --git a/Tusker/Screens/Profile/ProfileTableViewController.swift b/Tusker/Screens/Profile/ProfileTableViewController.swift
index cc474e1f..873fa2d0 100644
--- a/Tusker/Screens/Profile/ProfileTableViewController.swift
+++ b/Tusker/Screens/Profile/ProfileTableViewController.swift
@@ -22,7 +22,7 @@ class ProfileTableViewController: EnhancedTableViewController {
         }
     }
     
-    var statusIDs: [String] = [] {
+    var timelineSegments: [TimelineSegment<Status>] = [] {
         didSet {
             DispatchQueue.main.async {
                 self.tableView.reloadData()
@@ -120,8 +120,10 @@ class ProfileTableViewController: EnhancedTableViewController {
         
         getStatuses() { response in
             guard case let .success(statuses, pagination) = response else { fatalError() }
+            
             MastodonCache.addAll(statuses: statuses)
-            self.statusIDs = statuses.map { $0.id }
+            self.timelineSegments.append(TimelineSegment(objects: statuses))
+            
             self.older = pagination?.older
             self.newer = pagination?.newer
         }
@@ -146,47 +148,44 @@ class ProfileTableViewController: EnhancedTableViewController {
     // MARK: - Table view data source
 
     override func numberOfSections(in tableView: UITableView) -> Int {
-        return 2
+        return 1 + timelineSegments.count
     }
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        switch section {
-        case 0:
+        if section == 0 {
             return accountID == nil || MastodonCache.account(for: accountID) == nil ? 0 : 1
-        case 1:
-            return statusIDs.count
-        default:
-            return 0
+        } else {
+            return timelineSegments[section - 1].count
         }
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        switch indexPath.section {
-        case 0:
+        if indexPath.section == 0 {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "headerCell", for: indexPath) as? ProfileHeaderTableViewCell else { fatalError() }
             cell.selectionStyle = .none
             cell.delegate = self
             cell.updateUI(for: accountID)
             return cell
-        case 1:
+        } else {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "statusCell", for: indexPath) as? StatusTableViewCell else { fatalError() }
-            cell.updateUI(statusID: statusIDs[indexPath.row])
+            let statusID = timelineSegments[indexPath.section - 1][indexPath.row]
+            cell.updateUI(statusID: statusID)
             cell.delegate = self
             return cell
-        default:
-            fatalError("Invalid section \(indexPath.section) for profile VC")
         }
     }
     
     override func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
-        if indexPath.section == 1 && indexPath.row == statusIDs.count - 1 {
+        if indexPath.section == timelineSegments.count && indexPath.row == timelineSegments[indexPath.section - 1].count - 1 {
             guard let older = older else { return }
             
             getStatuses(for: older) { response in
                 guard case let .success(newStatuses, pagination) = response else { fatalError() }
-                self.older = pagination?.older
+                
                 MastodonCache.addAll(statuses: newStatuses)
-                self.statusIDs.append(contentsOf: newStatuses.map { $0.id })
+                self.timelineSegments[indexPath.section - 1].append(objects: newStatuses)
+
+                self.older = pagination?.older
             }
         }
     }
@@ -208,9 +207,12 @@ class ProfileTableViewController: EnhancedTableViewController {
         
         getStatuses(for: newer) { response in
             guard case let .success(newStatuses, pagination) = response else { fatalError() }
-            self.newer = pagination?.newer
+            
             MastodonCache.addAll(statuses: newStatuses)
-            self.statusIDs.insert(contentsOf: newStatuses.map { $0.id }, at: 0)
+            self.timelineSegments[0].insertAtBeginning(objects: newStatuses)
+
+            self.newer = pagination?.newer
+
             DispatchQueue.main.async {
                 self.refreshControl?.endRefreshing()
             }
@@ -272,9 +274,9 @@ extension ProfileTableViewController: ProfileHeaderTableViewCellDelegate {
 
 extension ProfileTableViewController: UITableViewDataSourcePrefetching {
     func tableView(_ tableView: UITableView, prefetchRowsAt indexPaths: [IndexPath]) {
-        for indexPath in indexPaths {
-            guard indexPath.section == 1,
-                let status = MastodonCache.status(for: statusIDs[indexPath.row]) else { continue }
+        for indexPath in indexPaths where indexPath.section > 0 {
+            let statusID = timelineSegments[indexPath.section - 1][indexPath.row]
+            guard let status = MastodonCache.status(for: statusID) else { continue }
             ImageCache.avatars.get(status.account.avatar, completion: nil)
             for attachment in status.attachments {
                 ImageCache.attachments.get(attachment.url, completion: nil)
@@ -283,9 +285,9 @@ extension ProfileTableViewController: UITableViewDataSourcePrefetching {
     }
     
     func tableView(_ tableView: UITableView, cancelPrefetchingForRowsAt indexPaths: [IndexPath]) {
-        for indexPath in indexPaths {
-            guard indexPath.section == 1,
-                let status = MastodonCache.status(for: statusIDs[indexPath.row]) else { continue }
+        for indexPath in indexPaths where indexPath.section > 0 {
+            let statusID = timelineSegments[indexPath.section - 1][indexPath.row]
+            guard let status = MastodonCache.status(for: statusID) else { continue }
             ImageCache.avatars.cancel(status.account.avatar)
             for attachment in status.attachments {
                 ImageCache.attachments.cancel(attachment.url)