diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
index 5d7dde7d67..f7c21e8505 100644
--- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -100,7 +100,7 @@
 "PUSH_MESSAGE_ROUND" = "%1$@|sent you a video message";
 "PUSH_MESSAGE" = "%1$@|sent you a message";
 "PUSH_MESSAGES_TEXT_1" = "sent you a message";
-"PUSH_MESSAGES_TEXT_any" = "sent you %2$d messages";
+"PUSH_MESSAGES_TEXT_any" = "sent you %d messages";
 "PUSH_ALBUM" = "%1$@|sent you an album";
 "PUSH_MESSAGE_FILES_TEXT_1" = "sent you a file";
 "PUSH_MESSAGE_FILES_TEXT_any" = "sent you %d files";
diff --git a/build-system/GenerateStrings/GenerateStrings.py b/build-system/GenerateStrings/GenerateStrings.py
index 6730df0ee9..52a54af3b1 100644
--- a/build-system/GenerateStrings/GenerateStrings.py
+++ b/build-system/GenerateStrings/GenerateStrings.py
@@ -402,9 +402,15 @@ static _FormattedString * _Nonnull formatWithArgumentRanges(
             [result appendString:[string substringWithRange:
                 NSMakeRange(currentLocation, range.range.location - currentLocation)]];
         }
+        NSString *argument = nil;
+        if (range.index >= 0 && range.index < arguments.count) {
+            argument = arguments[range.index];
+        } else {
+            argument = @"?";
+        }
         [resultingRanges addObject:[[_FormattedStringRange alloc] initWithIndex:range.index
-            range:NSMakeRange(result.length, arguments[range.index].length)]];
-        [result appendString:arguments[range.index]];
+            range:NSMakeRange(result.length, argument.length)]];
+        [result appendString:argument];
         currentLocation = range.range.location + range.range.length;
     }