diff --git a/submodules/CalendarMessageScreen/BUILD b/submodules/CalendarMessageScreen/BUILD
index 1ba7060388..88c9da47b7 100644
--- a/submodules/CalendarMessageScreen/BUILD
+++ b/submodules/CalendarMessageScreen/BUILD
@@ -19,7 +19,8 @@ swift_library(
         "//submodules/AccountContext:AccountContext",
         "//submodules/TelegramPresentationData:TelegramPresentationData",
         "//submodules/PhotoResources:PhotoResources",
-        "//submodules/DirectMediaImageCache:DirectMediaImageCache"
+        "//submodules/DirectMediaImageCache:DirectMediaImageCache",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/CalendarMessageScreen/Sources/CalendarMessageScreen.swift b/submodules/CalendarMessageScreen/Sources/CalendarMessageScreen.swift
index c7e669b456..3ac2e56f7d 100644
--- a/submodules/CalendarMessageScreen/Sources/CalendarMessageScreen.swift
+++ b/submodules/CalendarMessageScreen/Sources/CalendarMessageScreen.swift
@@ -10,6 +10,7 @@ import TelegramPresentationData
 import ComponentFlow
 import PhotoResources
 import DirectMediaImageCache
+import TelegramStringFormatting
 
 private final class MediaPreviewView: UIView {
     private let context: AccountContext
@@ -119,37 +120,6 @@ private final class MediaPreviewView: UIView {
     }
 }
 
-private func monthName(index: Int, strings: PresentationStrings) -> String {
-    switch index {
-    case 0:
-        return strings.Month_GenJanuary
-    case 1:
-        return strings.Month_GenFebruary
-    case 2:
-        return strings.Month_GenMarch
-    case 3:
-        return strings.Month_GenApril
-    case 4:
-        return strings.Month_GenMay
-    case 5:
-        return strings.Month_GenJune
-    case 6:
-        return strings.Month_GenJuly
-    case 7:
-        return strings.Month_GenAugust
-    case 8:
-        return strings.Month_GenSeptember
-    case 9:
-        return strings.Month_GenOctober
-    case 10:
-        return strings.Month_GenNovember
-    case 11:
-        return strings.Month_GenDecember
-    default:
-        return ""
-    }
-}
-
 private func dayName(index: Int, strings: PresentationStrings) -> String {
     switch index {
     case 0:
@@ -685,9 +655,11 @@ private final class MonthComponent: CombinedComponent {
             let usableWeekdayWidth = floor((context.availableSize.width - sideInset * 2.0 - weekdaySpacing * 6.0) / 7.0)
             let weekdayWidth = floor((context.availableSize.width - sideInset * 2.0) / 7.0)
 
+            let monthName = stringForMonth(strings: context.component.strings, month: Int32(context.component.model.index - 1), ofYear: Int32(context.component.model.year - 1900))
+
             let title = title.update(
                 component: Text(
-                    text: "\(monthName(index: context.component.model.index - 1, strings: context.component.strings)) \(context.component.model.year)",
+                    text: monthName,
                     font: Font.semibold(17.0),
                     color: context.component.foregroundColor
                 ),