diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index d9bd8be1..f11e57b0 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -558,7 +558,7 @@ func routingPacket (packet: MeshPacket, connectedNodeNum: Int64, context: NSMana
 					fetchedMessage![0].receivedACK = true
 				}
 				fetchedMessage![0].ackSNR = packet.rxSnr
-				fetchedMessage![0].ackTimestamp = Int32(packet.rxTime)
+				fetchedMessage![0].ackTimestamp = Int32(truncatingIfNeeded: packet.rxTime)
 				
 				if fetchedMessage![0].toUser != nil {
 					fetchedMessage![0].toUser!.objectWillChange.send()
diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings
index e384ed7a..e58c38b6 100644
--- a/de.lproj/Localizable.strings
+++ b/de.lproj/Localizable.strings
@@ -141,6 +141,7 @@
 "map.centering"="Centering";
 "map.tiles.delete"="Delete Cached Map Tiles";
 "map.recentering"="Automatic Re-centering";
+"map.use.legacy"="Use Legacy Mesh Map";
 "map.type"="kartentyp";
 "map.usertrackingmode"="User tracking mode";
 "map.usertrackingmode.none"="None";
diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings
index dda1dade..ae374695 100644
--- a/en.lproj/Localizable.strings
+++ b/en.lproj/Localizable.strings
@@ -145,6 +145,7 @@
 "map.centering"="Centering Mode";
 "map.tiles.delete"="Delete All Map Tiles";
 "map.recentering"="Automatic Re-centering";
+"map.use.legacy"="Use Legacy Mesh Map";
 "map.usertrackingmode"="User tracking mode";
 "map.usertrackingmode.follow"="Follow";
 "map.usertrackingmode.followwithheading"="Follow with heading";
diff --git a/pl.lproj/Localizable.strings b/pl.lproj/Localizable.strings
index 39436e7d..ad7bc540 100644
--- a/pl.lproj/Localizable.strings
+++ b/pl.lproj/Localizable.strings
@@ -144,6 +144,7 @@
 "map.centering"="Tryb Wyśrodkowania";
 "map.tiles.delete"="Usuń Wszystkie Kafle Mapy";
 "map.recentering"="Automatyczne Wyśrodkowywanie";
+"map.use.legacy"="Use Legacy Mesh Map";
 "map.usertrackingmode"="Tryb śledzenia użytkownika";
 "map.usertrackingmode.follow"="Śledź";
 "map.usertrackingmode.followwithheading"="Śledź z kierunkiem";
diff --git a/zh-Hans.lproj/Localizable.strings b/zh-Hans.lproj/Localizable.strings
index 36e85d89..d1b7dcc8 100644
--- a/zh-Hans.lproj/Localizable.strings
+++ b/zh-Hans.lproj/Localizable.strings
@@ -141,6 +141,7 @@
 "map.centering"="居中";
 "map.tiles.delete"="删除已缓存的地图区块";
 "map.recentering"="自动重新居中";
+"map.use.legacy"="Use Legacy Mesh Map";
 "map.type"="地图类型";
 "map.usertrackingmode"="用户跟随模式";
 "map.usertrackingmode.none"="无";