diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj
index fe8c576f1..e3d3fe0a5 100644
--- a/Session.xcodeproj/project.pbxproj
+++ b/Session.xcodeproj/project.pbxproj
@@ -112,6 +112,7 @@
 		7B46AAAF28766DF4001AF2DC /* AllMediaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B46AAAE28766DF4001AF2DC /* AllMediaViewController.swift */; };
 		7B4C75CB26B37E0F0000AC89 /* UnsendRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C75CA26B37E0F0000AC89 /* UnsendRequest.swift */; };
 		7B4C75CD26BB92060000AC89 /* DeletedMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C75CC26BB92060000AC89 /* DeletedMessageView.swift */; };
+		7B4EF25A2934743000CB351D /* SessionTableViewTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4EF2592934743000CB351D /* SessionTableViewTitleView.swift */; };
 		7B50D64D28AC7CF80086CCEC /* silence.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 7B50D64C28AC7CF80086CCEC /* silence.aiff */; };
 		7B5233C42900E90F00F8F375 /* SessionLabelCarouselView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B5233C32900E90F00F8F375 /* SessionLabelCarouselView.swift */; };
 		7B5233C6290636D700F8F375 /* _011_DisappearingMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B5233C5290636D700F8F375 /* _011_DisappearingMessage.swift */; };
@@ -1184,6 +1185,7 @@
 		7B46AAAE28766DF4001AF2DC /* AllMediaViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllMediaViewController.swift; sourceTree = "<group>"; };
 		7B4C75CA26B37E0F0000AC89 /* UnsendRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsendRequest.swift; sourceTree = "<group>"; };
 		7B4C75CC26BB92060000AC89 /* DeletedMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletedMessageView.swift; sourceTree = "<group>"; };
+		7B4EF2592934743000CB351D /* SessionTableViewTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionTableViewTitleView.swift; sourceTree = "<group>"; };
 		7B50D64C28AC7CF80086CCEC /* silence.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; path = silence.aiff; sourceTree = "<group>"; };
 		7B5233C32900E90F00F8F375 /* SessionLabelCarouselView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionLabelCarouselView.swift; sourceTree = "<group>"; };
 		7B5233C5290636D700F8F375 /* _011_DisappearingMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _011_DisappearingMessage.swift; sourceTree = "<group>"; };
@@ -2591,6 +2593,7 @@
 				FD52090828B59411006098F6 /* ScreenLockUI.swift */,
 				FD37EA0828AA2D27003AE748 /* SessionTableViewModel.swift */,
 				FD37EA0628AA2CCA003AE748 /* SessionTableViewController.swift */,
+				7B4EF2592934743000CB351D /* SessionTableViewTitleView.swift */,
 			);
 			path = Shared;
 			sourceTree = "<group>";
@@ -5593,6 +5596,7 @@
 				FDF2220B2818F38D000A4995 /* SessionApp.swift in Sources */,
 				FD7115EB28C5D78E00B47552 /* ThreadSettingsViewModel.swift in Sources */,
 				B8041AA725C90927003C2166 /* TypingIndicatorCell.swift in Sources */,
+				7B4EF25A2934743000CB351D /* SessionTableViewTitleView.swift in Sources */,
 				B8CCF63723961D6D0091D419 /* NewDMVC.swift in Sources */,
 				FDFDE12A282D056B0098B17F /* MediaZoomAnimationController.swift in Sources */,
 				4C1885D2218F8E1C00B67051 /* PhotoGridViewCell.swift in Sources */,
diff --git a/Session/Shared/SessionTableViewController.swift b/Session/Shared/SessionTableViewController.swift
index f4a5014ca..9f967eab0 100644
--- a/Session/Shared/SessionTableViewController.swift
+++ b/Session/Shared/SessionTableViewController.swift
@@ -26,6 +26,8 @@ class SessionTableViewController<NavItemId: Equatable, Section: SessionTableSect
     
     // MARK: - Components
     
+    private lazy var titleView: SessionTableViewTitleView = SessionTableViewTitleView()
+    
     private lazy var tableView: UITableView = {
         let result: UITableView = UITableView()
         result.translatesAutoresizingMaskIntoConstraints = false
@@ -92,11 +94,8 @@ class SessionTableViewController<NavItemId: Equatable, Section: SessionTableSect
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        ViewControllerUtilities.setUpDefaultSessionStyle(
-            for: self,
-            title: viewModel.title,
-            hasCustomBackButton: false
-        )
+        navigationItem.titleView = titleView
+        titleView.update(title: self.viewModel.title, subTitle: nil)
         
         view.themeBackgroundColor = .backgroundPrimary
         view.addSubview(tableView)
diff --git a/Session/Shared/SessionTableViewTitleView.swift b/Session/Shared/SessionTableViewTitleView.swift
new file mode 100644
index 000000000..b222ba9bf
--- /dev/null
+++ b/Session/Shared/SessionTableViewTitleView.swift
@@ -0,0 +1,97 @@
+// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
+
+import UIKit
+import SessionUIKit
+import SessionMessagingKit
+import SessionUtilitiesKit
+
+final class SessionTableViewTitleView: UIView {
+    private var oldSize: CGSize = .zero
+    
+    override var intrinsicContentSize: CGSize {
+        return UIView.layoutFittingExpandedSize
+    }
+
+    // MARK: - UI Components
+    
+    private lazy var titleLabel: UILabel = {
+        let result: UILabel = UILabel()
+        result.font = .boldSystemFont(ofSize: Values.mediumFontSize)
+        result.themeTextColor = .textPrimary
+        result.lineBreakMode = .byTruncatingTail
+        
+        return result
+    }()
+
+    private lazy var subtitleLabel: UILabel = {
+        let result: UILabel = UILabel()
+        result.font = .systemFont(ofSize: 13)
+        result.themeTextColor = .textPrimary
+        result.lineBreakMode = .byTruncatingTail
+        
+        return result
+    }()
+    
+    private lazy var stackView: UIStackView = {
+        let result = UIStackView(arrangedSubviews: [ titleLabel, subtitleLabel ])
+        result.axis = .vertical
+        result.alignment = .center
+        
+        return result
+    }()
+
+    // MARK: - Initialization
+    
+    init() {
+        super.init(frame: .zero)
+        
+        addSubview(stackView)
+        
+        stackView.pin([ UIView.HorizontalEdge.trailing, UIView.VerticalEdge.top, UIView.VerticalEdge.bottom ], to: self)
+        stackView.pin(.leading, to: .leading, of: self, withInset: 0)
+    }
+
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+    
+    required init?(coder: NSCoder) {
+        preconditionFailure("Use init() instead.")
+    }
+
+    // MARK: - Content
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        // There is an annoying issue where pushing seems to update the width of this
+        // view resulting in the content shifting to the right during
+        guard self.oldSize != .zero, self.oldSize != bounds.size else {
+            self.oldSize = bounds.size
+            return
+        }
+        
+        let diff: CGFloat = (bounds.size.width - oldSize.width)
+//        self.stackViewTrailingConstraint.constant = -max(0, diff)
+        self.oldSize = bounds.size
+    }
+    
+    public func update(title: String, subTitle: String?) {
+        guard Thread.isMainThread else {
+            DispatchQueue.main.async { [weak self] in
+                self?.update(title: title, subTitle: subTitle)
+            }
+            return
+        }
+        
+        self.titleLabel.text = title
+        self.titleLabel.font = .boldSystemFont(
+            ofSize: (subTitle != nil ?
+                Values.mediumFontSize :
+                Values.veryLargeFontSize
+            )
+        )
+        
+        self.subtitleLabel.text = subTitle
+    }
+}