diff --git a/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/FormattedBodyText.swift b/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/FormattedBodyText.swift
index 14cefde5f..408d3511b 100644
--- a/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/FormattedBodyText.swift
+++ b/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/FormattedBodyText.swift
@@ -136,9 +136,11 @@ struct FormattedBodyText_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         body(AttributedStringBuilderV1(cacheKey: "v1", mentionBuilder: MentionBuilder()))
             .previewLayout(.sizeThatFits)
+            .previewDisplayName("v1")
         
         body(AttributedStringBuilderV2(cacheKey: "v2", mentionBuilder: MentionBuilder()))
             .previewLayout(.sizeThatFits)
+            .previewDisplayName("v2")
     }
     
     @ViewBuilder
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-en-GB-0.png
deleted file mode 100644
index e24cba1b7..000000000
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fbc716d1703e6a083bb5ac7cd23b84446251aa78e28d6aa328ef2757b834e1f
-size 1112933
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-en-GB-1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-en-GB-1.png
deleted file mode 100644
index d1fe8177c..000000000
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49f8ab75f5f838e702955a536b90a8bfae2a898f88f665c1b26e6e2ea068e4e6
-size 1093130
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-pseudo-0.png
deleted file mode 100644
index e24cba1b7..000000000
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-pseudo-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fbc716d1703e6a083bb5ac7cd23b84446251aa78e28d6aa328ef2757b834e1f
-size 1112933
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-pseudo-1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-pseudo-1.png
deleted file mode 100644
index d1fe8177c..000000000
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPad-pseudo-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49f8ab75f5f838e702955a536b90a8bfae2a898f88f665c1b26e6e2ea068e4e6
-size 1093130
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-en-GB-0.png
deleted file mode 100644
index d009ddf3a..000000000
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f075576dc6e3b05bbf7187d9b57388b03bc307af720cce672797bf8e0b9bc756
-size 1268528
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-en-GB-1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-en-GB-1.png
deleted file mode 100644
index f2a78d1c8..000000000
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98f0e00bacc7081cea4a949747e6e817006d0b024b8745970a4dca0ea5912fd4
-size 1279652
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-pseudo-0.png
deleted file mode 100644
index d009ddf3a..000000000
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-pseudo-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f075576dc6e3b05bbf7187d9b57388b03bc307af720cce672797bf8e0b9bc756
-size 1268528
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-pseudo-1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-pseudo-1.png
deleted file mode 100644
index f2a78d1c8..000000000
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.iPhone-16-pseudo-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98f0e00bacc7081cea4a949747e6e817006d0b024b8745970a4dca0ea5912fd4
-size 1279652
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPad-en-GB.png
new file mode 100644
index 000000000..3cc793d76
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPad-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ee8b1e8d04998034faee44b9e0ce246b0f4cdf588a7bb61596d9486d14d39a1
+size 1099545
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPad-pseudo.png
new file mode 100644
index 000000000..3cc793d76
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPad-pseudo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ee8b1e8d04998034faee44b9e0ce246b0f4cdf588a7bb61596d9486d14d39a1
+size 1099545
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPhone-16-en-GB.png
new file mode 100644
index 000000000..3872dd159
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPhone-16-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14ee65d98203438e47b96b3f6c841a9ae119d36856ef5e77462f86762d9b9a5e
+size 1258831
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPhone-16-pseudo.png
new file mode 100644
index 000000000..3872dd159
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v1-iPhone-16-pseudo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14ee65d98203438e47b96b3f6c841a9ae119d36856ef5e77462f86762d9b9a5e
+size 1258831
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPad-en-GB.png
new file mode 100644
index 000000000..bf0c3ff37
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPad-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34fb889080b10018db0941940782f5c46ccf0611bb6bbf8cd2cefa8c0492f2a0
+size 1110617
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPad-pseudo.png
new file mode 100644
index 000000000..bf0c3ff37
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPad-pseudo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34fb889080b10018db0941940782f5c46ccf0611bb6bbf8cd2cefa8c0492f2a0
+size 1110617
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPhone-16-en-GB.png
new file mode 100644
index 000000000..c91f788ac
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPhone-16-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60a1a287bd3c02dad38031e4ccfeafac7fc734384034147fa9b421090321eb05
+size 1282490
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPhone-16-pseudo.png
new file mode 100644
index 000000000..c91f788ac
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/formattedBodyText.v2-iPhone-16-pseudo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60a1a287bd3c02dad38031e4ccfeafac7fc734384034147fa9b421090321eb05
+size 1282490