diff --git a/iOS/Timeline/Cell/SingleLineUILabelSizer.swift b/iOS/Timeline/Cell/SingleLineUILabelSizer.swift
index 901df9a77..f45e7b54c 100644
--- a/iOS/Timeline/Cell/SingleLineUILabelSizer.swift
+++ b/iOS/Timeline/Cell/SingleLineUILabelSizer.swift
@@ -12,7 +12,7 @@ import UIKit
 // Uses a cache.
 // Main thready only.
 
-final class SingleLineUILabelSizer {
+@MainActor final class SingleLineUILabelSizer {
 
 	let font: UIFont
 	private var cache = [String: CGSize]()
@@ -36,7 +36,7 @@ final class SingleLineUILabelSizer {
 		
 	}
 
-	static private var sizers = [UIFont: SingleLineUILabelSizer]()
+	@MainActor static private var sizers = [UIFont: SingleLineUILabelSizer]()
 
 	static func sizer(for font: UIFont) -> SingleLineUILabelSizer {
 
diff --git a/iOS/Timeline/Cell/TimelineAccessibilityCellLayout.swift b/iOS/Timeline/Cell/TimelineAccessibilityCellLayout.swift
index bf9ea28c5..943eec476 100644
--- a/iOS/Timeline/Cell/TimelineAccessibilityCellLayout.swift
+++ b/iOS/Timeline/Cell/TimelineAccessibilityCellLayout.swift
@@ -74,7 +74,7 @@ struct TimelineAccessibilityCellLayout: TimelineCellLayout {
 
 private extension TimelineAccessibilityCellLayout {
 	
-	static func rectForDate(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
+	@MainActor static func rectForDate(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 		
 		var r = CGRect.zero
 		
diff --git a/iOS/Timeline/Cell/TimelineCellLayout.swift b/iOS/Timeline/Cell/TimelineCellLayout.swift
index 8726b4ae7..4775daf36 100644
--- a/iOS/Timeline/Cell/TimelineCellLayout.swift
+++ b/iOS/Timeline/Cell/TimelineCellLayout.swift
@@ -94,7 +94,7 @@ extension TimelineCellLayout {
 		
 	}
 
-	static func rectForFeedName(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
+	@MainActor static func rectForFeedName(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 		
 		var r = CGRect.zero
 		r.origin = point
diff --git a/iOS/Timeline/Cell/TimelineDefaultCellLayout.swift b/iOS/Timeline/Cell/TimelineDefaultCellLayout.swift
index 4c7bf8c76..0800c6211 100644
--- a/iOS/Timeline/Cell/TimelineDefaultCellLayout.swift
+++ b/iOS/Timeline/Cell/TimelineDefaultCellLayout.swift
@@ -109,7 +109,7 @@ struct TimelineDefaultCellLayout: TimelineCellLayout {
 
 extension TimelineDefaultCellLayout {
 
-	static func rectForDate(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
+	@MainActor static func rectForDate(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 		
 		var r = CGRect.zero