diff --git a/Tusker/Screens/Conversation/ConversationTableViewController.swift b/Tusker/Screens/Conversation/ConversationTableViewController.swift
index d678c1c4..b03e042e 100644
--- a/Tusker/Screens/Conversation/ConversationTableViewController.swift
+++ b/Tusker/Screens/Conversation/ConversationTableViewController.swift
@@ -274,7 +274,7 @@ class ConversationTableViewController: EnhancedTableViewController {
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if case let .expandThread(childThreads: childThreads, inline: _) = dataSource.itemIdentifier(for: indexPath),
            case let .status(id: id, state: state) = dataSource.itemIdentifier(for: IndexPath(row: indexPath.row - 1, section: indexPath.section)) {
-            let conv = ConversationTableViewController(for: id, state: state, mastodonController: mastodonController)
+            let conv = ConversationViewController(for: id, state: state, mastodonController: mastodonController)
             conv.statusIDToScrollToOnLoad = childThreads.first!.status.id
             conv.showStatusesAutomatically = showStatusesAutomatically
             show(conv)
diff --git a/Tusker/Screens/Conversation/ConversationViewController.swift b/Tusker/Screens/Conversation/ConversationViewController.swift
index 9d2d0b98..5dc955e8 100644
--- a/Tusker/Screens/Conversation/ConversationViewController.swift
+++ b/Tusker/Screens/Conversation/ConversationViewController.swift
@@ -151,7 +151,6 @@ class ConversationViewController: UIViewController {
             }
         }
         
-        
         if let cached = mastodonController.persistentContainer.status(for: mainStatusID) {
             // if we have a cached copy, display it immediately but still try to refresh it
             Task {