diff --git a/Session/Media Viewing & Editing/MessageInfoScreen.swift b/Session/Media Viewing & Editing/MessageInfoScreen.swift
index 52c2ef1df..62d2829e5 100644
--- a/Session/Media Viewing & Editing/MessageInfoScreen.swift	
+++ b/Session/Media Viewing & Editing/MessageInfoScreen.swift	
@@ -164,7 +164,7 @@ struct MessageInfoScreen: View {
                                     alignment: .center
                                 ) {
                                     let resolution: String = {
-                                        guard let width = attachment.width, let height = attachment.height else { return "N/A" }
+                                        guard let width = attachment.width, let height = attachment.height else { return "attachmentsNa".localized() }
                                         return "\(width)×\(height)"
                                     }()
                                     InfoBlock(title: "ATTACHMENT_INFO_RESOLUTION".localized() + ":") {
@@ -176,7 +176,7 @@ struct MessageInfoScreen: View {
                                     Spacer()
                                     
                                     let duration: String = {
-                                        guard let duration = attachment.duration else { return "N/A" }
+                                        guard let duration = attachment.duration else { return "attachmentsNa".localized() }
                                         return floor(duration).formatted(format: .videoDuration)
                                     }()
                                     InfoBlock(title: "ATTACHMENT_INFO_DURATION".localized() + ":") {
diff --git a/Session/Meta/Translations/ar.lproj/Localizable.strings b/Session/Meta/Translations/ar.lproj/Localizable.strings
index 374182979..c507d041c 100644
--- a/Session/Meta/Translations/ar.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ar.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/be.lproj/Localizable.strings b/Session/Meta/Translations/be.lproj/Localizable.strings
index 0150f7cf2..de0535e43 100644
--- a/Session/Meta/Translations/be.lproj/Localizable.strings
+++ b/Session/Meta/Translations/be.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/bg.lproj/Localizable.strings b/Session/Meta/Translations/bg.lproj/Localizable.strings
index 768d99c89..cf0f7f94a 100644
--- a/Session/Meta/Translations/bg.lproj/Localizable.strings
+++ b/Session/Meta/Translations/bg.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/bn.lproj/Localizable.strings b/Session/Meta/Translations/bn.lproj/Localizable.strings
index 15735154d..09cc209eb 100644
--- a/Session/Meta/Translations/bn.lproj/Localizable.strings
+++ b/Session/Meta/Translations/bn.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/cs.lproj/Localizable.strings b/Session/Meta/Translations/cs.lproj/Localizable.strings
index 1c94c1dd8..22dbae5a2 100644
--- a/Session/Meta/Translations/cs.lproj/Localizable.strings
+++ b/Session/Meta/Translations/cs.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/da.lproj/Localizable.strings b/Session/Meta/Translations/da.lproj/Localizable.strings
index 9cfb2843a..84363521d 100644
--- a/Session/Meta/Translations/da.lproj/Localizable.strings
+++ b/Session/Meta/Translations/da.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings
index f6f680cce..b48bb9c26 100644
--- a/Session/Meta/Translations/de.lproj/Localizable.strings
+++ b/Session/Meta/Translations/de.lproj/Localizable.strings
@@ -1118,3 +1118,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/el.lproj/Localizable.strings b/Session/Meta/Translations/el.lproj/Localizable.strings
index ef892991d..3517b8759 100644
--- a/Session/Meta/Translations/el.lproj/Localizable.strings
+++ b/Session/Meta/Translations/el.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings
index 6976ae1f3..513c0d881 100644
--- a/Session/Meta/Translations/en.lproj/Localizable.strings
+++ b/Session/Meta/Translations/en.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/eo.lproj/Localizable.strings b/Session/Meta/Translations/eo.lproj/Localizable.strings
index d382bf709..76f1bb9b4 100644
--- a/Session/Meta/Translations/eo.lproj/Localizable.strings
+++ b/Session/Meta/Translations/eo.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/es-ES.lproj/Localizable.strings b/Session/Meta/Translations/es-ES.lproj/Localizable.strings
index 07a33dc10..a3c76b172 100644
--- a/Session/Meta/Translations/es-ES.lproj/Localizable.strings
+++ b/Session/Meta/Translations/es-ES.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings
index 69703be50..d5c530e12 100644
--- a/Session/Meta/Translations/fa.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fa.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings
index 298394222..8d45051a0 100644
--- a/Session/Meta/Translations/fi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fi.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/fil.lproj/Localizable.strings b/Session/Meta/Translations/fil.lproj/Localizable.strings
index 548d39a54..13ff25e71 100644
--- a/Session/Meta/Translations/fil.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fil.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings
index d87474624..c9be2726b 100644
--- a/Session/Meta/Translations/fr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fr.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings
index 535c98d5a..83cff08a1 100644
--- a/Session/Meta/Translations/hi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hi.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings
index d95f3de0d..ddf41089f 100644
--- a/Session/Meta/Translations/hr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hr.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/hu.lproj/Localizable.strings b/Session/Meta/Translations/hu.lproj/Localizable.strings
index 794647224..7ac433606 100644
--- a/Session/Meta/Translations/hu.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hu.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/id.lproj/Localizable.strings b/Session/Meta/Translations/id.lproj/Localizable.strings
index e0ca0fba6..1b961f37c 100644
--- a/Session/Meta/Translations/id.lproj/Localizable.strings
+++ b/Session/Meta/Translations/id.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings
index 18b1254fb..4d925e121 100644
--- a/Session/Meta/Translations/it.lproj/Localizable.strings
+++ b/Session/Meta/Translations/it.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings
index 05fd5f163..bb84a1851 100644
--- a/Session/Meta/Translations/ja.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ja.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/ko.lproj/Localizable.strings b/Session/Meta/Translations/ko.lproj/Localizable.strings
index 48423d113..660cbaa6b 100644
--- a/Session/Meta/Translations/ko.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ko.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/ku.lproj/Localizable.strings b/Session/Meta/Translations/ku.lproj/Localizable.strings
index c2325d1db..d1a1c6a78 100644
--- a/Session/Meta/Translations/ku.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ku.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/lt.lproj/Localizable.strings b/Session/Meta/Translations/lt.lproj/Localizable.strings
index 5a4e0df49..6e9e7d97c 100644
--- a/Session/Meta/Translations/lt.lproj/Localizable.strings
+++ b/Session/Meta/Translations/lt.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/lv.lproj/Localizable.strings b/Session/Meta/Translations/lv.lproj/Localizable.strings
index 55b8c1b7d..2abc8ddc3 100644
--- a/Session/Meta/Translations/lv.lproj/Localizable.strings
+++ b/Session/Meta/Translations/lv.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings
index 7c16cfe8f..930a318f7 100644
--- a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings
index 94b06041f..dc9efc54d 100644
--- a/Session/Meta/Translations/nl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/nl.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/no.lproj/Localizable.strings b/Session/Meta/Translations/no.lproj/Localizable.strings
index adffd3cf7..91f60cb7f 100644
--- a/Session/Meta/Translations/no.lproj/Localizable.strings
+++ b/Session/Meta/Translations/no.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings
index 73f6b1f89..0bb699b83 100644
--- a/Session/Meta/Translations/pl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pl.lproj/Localizable.strings
@@ -1118,3 +1118,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings
index 28f292117..e1feda689 100644
--- a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings
index 34f0c46ad..1bb8d5184 100644
--- a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings
@@ -1123,3 +1123,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/ro.lproj/Localizable.strings b/Session/Meta/Translations/ro.lproj/Localizable.strings
index 25a3f36f0..813057bcf 100644
--- a/Session/Meta/Translations/ro.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ro.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings
index 215144117..29998f69f 100644
--- a/Session/Meta/Translations/ru.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ru.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/si-LK.lproj/Localizable.strings b/Session/Meta/Translations/si-LK.lproj/Localizable.strings
index e880b39b9..af9b27f14 100644
--- a/Session/Meta/Translations/si-LK.lproj/Localizable.strings
+++ b/Session/Meta/Translations/si-LK.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings
index 4377f7ae6..cd07efcaa 100644
--- a/Session/Meta/Translations/sk.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sk.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/sl.lproj/Localizable.strings b/Session/Meta/Translations/sl.lproj/Localizable.strings
index ca096f0a7..0dcecf222 100644
--- a/Session/Meta/Translations/sl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sl.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings
index 97be1020d..d3745a188 100644
--- a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings
index 58ef566d7..54565ea70 100644
--- a/Session/Meta/Translations/th.lproj/Localizable.strings
+++ b/Session/Meta/Translations/th.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/tr.lproj/Localizable.strings b/Session/Meta/Translations/tr.lproj/Localizable.strings
index 41c6d0af9..09c533ff1 100644
--- a/Session/Meta/Translations/tr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/tr.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/uk.lproj/Localizable.strings b/Session/Meta/Translations/uk.lproj/Localizable.strings
index 8476170d2..1452ce1d2 100644
--- a/Session/Meta/Translations/uk.lproj/Localizable.strings
+++ b/Session/Meta/Translations/uk.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/vi.lproj/Localizable.strings b/Session/Meta/Translations/vi.lproj/Localizable.strings
index 4f0f93f84..58f272fe9 100644
--- a/Session/Meta/Translations/vi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/vi.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings
index b0369c043..f667db3e0 100644
--- a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings
+++ b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings
index 490aa74de..b3dd26b5e 100644
--- a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings
+++ b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings
@@ -1117,3 +1117,7 @@ The point that a message will disappear in a disappearing message update message
 "accountIdErrorInvalid" = "This Account ID is invalid. Please check and try again.";
 "new_message_screen_error_msg_unrecognized_ons" = "We couldn’t recognize this ONS. Please check and try again.";
 "onsErrorUnableToSearch" = "We were unable to search for this ONS. Please try again later.";
+
+//General
+"attachmentsNa" = "N/A";
+"search" = "Search";
diff --git a/SessionUIKit/Components/SearchBar.swift b/SessionUIKit/Components/SearchBar.swift
index 6b429f2c2..5c1e78bcb 100644
--- a/SessionUIKit/Components/SearchBar.swift
+++ b/SessionUIKit/Components/SearchBar.swift
@@ -1,6 +1,7 @@
 // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
 
 import UIKit
+import SessionUtilitiesKit
 
 public final class SearchBar : UISearchBar {
     
@@ -53,7 +54,7 @@ public extension UISearchBar {
             guard let textColor: UIColor = theme.color(for: .textSecondary) else { return }
             
             searchTextField?.attributedPlaceholder = NSAttributedString(
-                string: "Search",
+                string: "search".localized(),
                 attributes: [
                     .foregroundColor: textColor
                 ])
diff --git a/SessionUIKit/Components/SwiftUI/SessionSearchBar.swift b/SessionUIKit/Components/SwiftUI/SessionSearchBar.swift
index 050008c15..f88a78fd0 100644
--- a/SessionUIKit/Components/SwiftUI/SessionSearchBar.swift
+++ b/SessionUIKit/Components/SwiftUI/SessionSearchBar.swift
@@ -1,6 +1,7 @@
 // Copyright © 2024 Rangeproof Pty Ltd. All rights reserved.
 
 import SwiftUI
+import SessionUtilitiesKit
 
 public struct SessionSearchBar: View {
     @Binding var searchText: String
@@ -31,7 +32,7 @@ public struct SessionSearchBar: View {
                 
                 ZStack(alignment: .leading) {
                     if searchText.isEmpty {
-                        Text("Search")
+                        Text("search".localized())
                             .font(.system(size: Values.smallFontSize))
                             .foregroundColor(themeColor: .textSecondary)
                     }