diff --git a/Session/Media Viewing & Editing/MessageInfoView.swift b/Session/Media Viewing & Editing/MessageInfoView.swift
index 1886b514b..cf9c15e26 100644
--- a/Session/Media Viewing & Editing/MessageInfoView.swift	
+++ b/Session/Media Viewing & Editing/MessageInfoView.swift	
@@ -5,6 +5,7 @@ import SessionUIKit
 import SessionSnodeKit
 
 struct MessageInfoView: View {
+    @State var index = 1
     var actions: [ContextMenuVC.Action]
     var messageViewModel: MessageViewModel
     var isMessageFailed: Bool {
@@ -95,22 +96,26 @@ struct MessageInfoView: View {
                         )
                     }
                     
-                    if let attachments = messageViewModel.attachments, !attachments.isEmpty {
-                        // Attachment carousel view
-                        SessionCarouselView_SwiftUI(contentInfos: [.orange, .gray, .blue, .yellow])
-                            .frame(
-                                maxWidth: .infinity,
-                                maxHeight: .infinity,
-                                alignment: .topLeading
-                            )
-                            .padding(
-                                EdgeInsets(
-                                    top: 4,
-                                    leading: 0,
-                                    bottom: 4,
-                                    trailing: 0
+                    if let attachments = messageViewModel.attachments {
+                        if attachments.count > 1 {
+                            // Attachment carousel view
+                            SessionCarouselView_SwiftUI(index: $index, contentInfos: [.orange, .gray, .blue, .yellow])
+                                .frame(
+                                    maxWidth: .infinity,
+                                    maxHeight: .infinity,
+                                    alignment: .topLeading
                                 )
-                            )
+                                .padding(
+                                    EdgeInsets(
+                                        top: 4,
+                                        leading: 0,
+                                        bottom: 4,
+                                        trailing: 0
+                                    )
+                                )
+                        } else {
+                            // TODO: one attachment
+                        }
                         
                         // Attachment Info
                         ZStack {
@@ -202,13 +207,13 @@ struct MessageInfoView: View {
                             alignment: .leading,
                             spacing: 16
                         ) {
-                            InfoBlock(title: "Sent:") {
+                            InfoBlock(title: "MESSAGE_INFO_SENT".localized() + ":") {
                                 Text(messageViewModel.dateForUI.fromattedForMessageInfo)
                                     .font(.system(size: 16))
                                     .foregroundColor(themeColor: .textPrimary)
                             }
                             
-                            InfoBlock(title: "Received:") {
+                            InfoBlock(title: "MESSAGE_INFO_RECEIVED".localized() + ":") {
                                 Text(messageViewModel.receivedDateForUI.fromattedForMessageInfo)
                                     .font(.system(size: 16))
                                     .foregroundColor(themeColor: .textPrimary)
@@ -216,14 +221,14 @@ struct MessageInfoView: View {
                             
                             if isMessageFailed {
                                 let failureText: String = messageViewModel.mostRecentFailureText ?? "Message failed to send"
-                                InfoBlock(title: "Error:") {
+                                InfoBlock(title: "ALERT_ERROR_TITLE".localized() + ":") {
                                     Text(failureText)
                                         .font(.system(size: 16))
                                         .foregroundColor(themeColor: .danger)
                                 }
                             }
                             
-                            InfoBlock(title: "From:") {
+                            InfoBlock(title: "MESSAGE_INFO_FROM".localized() + ":") {
                                 HStack(
                                     spacing: 10
                                 ) {
diff --git a/SessionUIKit/Components/SessionCarouselView+SwiftUI.swift b/SessionUIKit/Components/SessionCarouselView+SwiftUI.swift
index d6315a9e3..7ac54a699 100644
--- a/SessionUIKit/Components/SessionCarouselView+SwiftUI.swift
+++ b/SessionUIKit/Components/SessionCarouselView+SwiftUI.swift
@@ -3,12 +3,12 @@
 import SwiftUI
 
 public struct SessionCarouselView_SwiftUI: View {
-    @State var index = 1
-
+    @Binding var index: Int
     var contentInfos: [Color]
     let numberOfPages: Int
     
-    public init(contentInfos: [Color]) {
+    public init(index: Binding<Int>, contentInfos: [Color]) {
+        self._index = index
         self.contentInfos = contentInfos
         self.numberOfPages = contentInfos.count
         
@@ -191,6 +191,7 @@ struct PageControl: View {
 }
 
 struct SessionCarouselView_SwiftUI_Previews: PreviewProvider {
+    @State static var index = 1
     static var previews: some View {
         ZStack {
             if #available(iOS 14.0, *) {
@@ -199,7 +200,7 @@ struct SessionCarouselView_SwiftUI_Previews: PreviewProvider {
                 Color.black
             }
             
-            SessionCarouselView_SwiftUI(contentInfos: [.red, .orange, .blue])
+            SessionCarouselView_SwiftUI(index: $index, contentInfos: [.red, .orange, .blue])
         }
     }
 }