diff --git a/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/Contents.json
new file mode 100644
index 000000000..d69e18648
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "microphone.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/microphone.svg b/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/microphone.svg
new file mode 100644
index 000000000..7808332fc
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/microphone.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="mic_FILL1_wght400_GRAD0_opsz20 1">
+<path id="Vector" d="M12.0294 14.15C11.1764 14.15 10.4458 13.8458 9.83746 13.2375C9.22913 12.6292 8.92496 11.9 8.92496 11.05V5.075C8.92496 4.22083 9.22913 3.49479 9.83746 2.89688C10.4458 2.29896 11.1764 2 12.0294 2C12.8823 2 13.6073 2.29896 14.2044 2.89688C14.8014 3.49479 15.1 4.22083 15.1 5.075V11.05C15.1 11.9 14.8014 12.6292 14.2044 13.2375C13.6073 13.8458 12.8823 14.15 12.0294 14.15ZM12.025 21C11.7416 21 11.4958 20.8958 11.2875 20.6875C11.0791 20.4792 10.975 20.2333 10.975 19.95V18.0047C9.44163 17.8016 8.14163 17.1625 7.07496 16.0875C6.0083 15.0125 5.34996 13.725 5.09996 12.225C5.04996 11.9153 5.13136 11.6421 5.34416 11.4052C5.55698 11.1684 5.84225 11.05 6.19996 11.05C6.4333 11.05 6.64163 11.1333 6.82496 11.3C7.0083 11.4667 7.12496 11.6833 7.17496 11.95C7.38833 13.0953 7.94636 14.0525 8.84906 14.8215C9.75178 15.5905 10.8104 15.975 12.025 15.975C13.2332 15.975 14.2864 15.5905 15.1845 14.8215C16.0825 14.0525 16.6377 13.0953 16.85 11.95C16.9 11.6833 17.0166 11.4667 17.2 11.3C17.3833 11.1333 17.6003 11.05 17.8509 11.05C18.191 11.05 18.4675 11.1684 18.6805 11.4052C18.8935 11.6421 18.975 11.9153 18.925 12.225C18.6949 13.7279 18.0457 15.0162 16.9774 16.0897C15.9091 17.1632 14.6083 17.8016 13.075 18.0047V19.95C13.075 20.2333 12.9708 20.4792 12.7625 20.6875C12.5541 20.8958 12.3083 21 12.025 21Z" fill="#1B1D22"/>
+</g>
+</svg>
diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
index 3bfd0c95a..536f943ce 100644
--- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
@@ -148,6 +148,7 @@
 "common_verification_cancelled" = "Verification cancelled";
 "common_verification_complete" = "Verification complete";
 "common_video" = "Video";
+"common_voice_message" = "Voice message";
 "common_waiting" = "Waiting…";
 "common_poll_end_confirmation" = "Are you sure you want to end this poll?";
 "common_poll_summary" = "Poll: %1$@";
diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift
index fd93f899b..5ccdf4761 100644
--- a/ElementX/Sources/Generated/Assets.swift
+++ b/ElementX/Sources/Generated/Assets.swift
@@ -65,6 +65,7 @@ internal enum Asset {
     internal static let locationPointer = ImageAsset(name: "images/location-pointer")
     internal static let mediaPause = ImageAsset(name: "images/media-pause")
     internal static let mediaPlay = ImageAsset(name: "images/media-play")
+    internal static let microphone = ImageAsset(name: "images/microphone")
     internal static let addReaction = ImageAsset(name: "images/add-reaction")
     internal static let copy = ImageAsset(name: "images/copy")
     internal static let editOutline = ImageAsset(name: "images/edit-outline")
diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift
index 2bf203476..c568229b7 100644
--- a/ElementX/Sources/Generated/Strings.swift
+++ b/ElementX/Sources/Generated/Strings.swift
@@ -332,6 +332,8 @@ public enum L10n {
   public static var commonVerificationComplete: String { return L10n.tr("Localizable", "common_verification_complete") }
   /// Video
   public static var commonVideo: String { return L10n.tr("Localizable", "common_video") }
+  /// Voice message
+  public static var commonVoiceMessage: String { return L10n.tr("Localizable", "common_voice_message") }
   /// Waiting…
   public static var commonWaiting: String { return L10n.tr("Localizable", "common_waiting") }
   /// %1$@ crashed the last time it was used. Would you like to share a crash report with us?
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift b/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
index e4e7321ee..4be9b085e 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
@@ -30,7 +30,7 @@ struct TimelineReplyView: View {
             switch timelineItemReplyDetails {
             case .loaded(let sender, let content):
                 switch content {
-                case .audio(let content), .voice(let content):
+                case .audio(let content):
                     ReplyView(sender: sender,
                               plainBody: content.body,
                               formattedBody: nil,
@@ -62,6 +62,11 @@ struct TimelineReplyView: View {
                               plainBody: content.body,
                               formattedBody: nil,
                               icon: content.thumbnailSource.map { .init(kind: .mediaSource($0), cornerRadii: iconCornerRadii) })
+                case .voice:
+                    ReplyView(sender: sender,
+                              plainBody: L10n.commonVoiceMessage,
+                              formattedBody: nil,
+                              icon: .init(kind: .icon(Asset.Images.microphone.name), cornerRadii: iconCornerRadii))
                 case .location:
                     ReplyView(sender: sender,
                               plainBody: L10n.commonSharedLocation,
@@ -182,23 +187,25 @@ struct TimelineReplyView: View {
 struct TimelineReplyView_Previews: PreviewProvider, TestablePreview {
     static let viewModel = RoomScreenViewModel.mock
     
-    static var previews: some View {
-        VStack(alignment: .leading, spacing: 20) {
-            TimelineReplyView(placement: .timeline, timelineItemReplyDetails: .notLoaded(eventID: ""))
+    static var previewItems: [TimelineReplyView] {
+        let imageSource = MediaSourceProxy(url: "https://mock.com", mimeType: "image/png")
+
+        return [
+            TimelineReplyView(placement: .timeline, timelineItemReplyDetails: .notLoaded(eventID: "")),
             
-            TimelineReplyView(placement: .timeline, timelineItemReplyDetails: .loading(eventID: ""))
+            TimelineReplyView(placement: .timeline, timelineItemReplyDetails: .loading(eventID: "")),
             
             TimelineReplyView(placement: .timeline,
                               timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
-                                                                contentType: .text(.init(body: "This is a reply"))))
+                                                                contentType: .text(.init(body: "This is a reply")))),
             
             TimelineReplyView(placement: .timeline,
                               timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
-                                                                contentType: .emote(.init(body: "says hello"))))
+                                                                contentType: .emote(.init(body: "says hello")))),
             
             TimelineReplyView(placement: .timeline,
                               timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Bot"),
-                                                                contentType: .notice(.init(body: "Hello world"))))
+                                                                contentType: .notice(.init(body: "Hello world")))),
             
             TimelineReplyView(placement: .timeline,
                               timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
@@ -206,32 +213,46 @@ struct TimelineReplyView_Previews: PreviewProvider, TestablePreview {
                                                                                           duration: 0,
                                                                                           waveform: nil,
                                                                                           source: nil,
-                                                                                          contentType: nil))))
+                                                                                          contentType: nil)))),
             
             TimelineReplyView(placement: .timeline,
                               timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
                                                                 contentType: .file(.init(body: "Some file",
                                                                                          source: nil,
                                                                                          thumbnailSource: nil,
-                                                                                         contentType: nil))))
-            
-            let imageSource = MediaSourceProxy(url: "https://mock.com", mimeType: "image/png")
+                                                                                         contentType: nil)))),
             
             TimelineReplyView(placement: .timeline,
                               timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
                                                                 contentType: .image(.init(body: "Some image",
                                                                                           source: imageSource,
-                                                                                          thumbnailSource: imageSource))))
+                                                                                          thumbnailSource: imageSource)))),
             
             TimelineReplyView(placement: .timeline,
                               timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
                                                                 contentType: .video(.init(body: "Some video",
                                                                                           duration: 0,
                                                                                           source: nil,
-                                                                                          thumbnailSource: imageSource))))
+                                                                                          thumbnailSource: imageSource)))),
             TimelineReplyView(placement: .timeline,
                               timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
-                                                                contentType: .location(.init(body: ""))))
+                                                                contentType: .location(.init(body: "")))),
+            
+            TimelineReplyView(placement: .timeline,
+                              timelineItemReplyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
+                                                                contentType: .voice(.init(body: "Some voice message",
+                                                                                          duration: 0,
+                                                                                          waveform: nil,
+                                                                                          source: nil,
+                                                                                          contentType: nil))))
+        ]
+    }
+    
+    static var previews: some View {
+        VStack(alignment: .leading, spacing: 20) {
+            ForEach(0..<previewItems.count, id: \.self) { index in
+                previewItems[index]
+            }
         }
         .environmentObject(viewModel.context)
     }
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
index 945083b9c..008a187e8 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
@@ -31,8 +31,9 @@ struct RoomMessageEventStringBuilder {
                 return AttributedString(L10n.commonEmote(senderDisplayName, content.body))
             }
         // Message types that should be prefixed with the sender's name.
-        case .audio:
-            message = L10n.commonAudio
+        case .audio(content: let content):
+            let isVoiceMessage = content.voice != nil
+            message = isVoiceMessage ? L10n.commonVoiceMessage : L10n.commonAudio
         case .image:
             message = L10n.commonImage
         case .video:
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
index 31cb3b323..30f6b41b3 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a74ff8483162c39fe5b127174b9d1bb5bc81bb7c63385148ac59ef45b3a33c80
-size 123268
+oid sha256:d20d3c8a4bcebf86630fb5173f1e19b80c25fa2aad136024cbc36c876cca47cb
+size 132631
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceRoomPlaybackView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomPlaybackView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceRoomPlaybackView.1.png
rename to UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomPlaybackView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceRoomTimelineView.Bubble.png b/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceRoomTimelineView.Bubble.png
rename to UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceRoomTimelineView.Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceRoomTimelineView.Plain.png
rename to UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png