diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java
index 7870231c9..e2dc4cfa8 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java
@@ -55,6 +55,8 @@ import java.util.List;
 
 public class NotificationsController {
 
+    private Context mContext;
+
     public static final String EXTRA_VOICE_REPLY = "extra_voice_reply";
 
     private DispatchQueue notificationsQueue = new DispatchQueue("notificationsQueue");
@@ -104,6 +106,7 @@ public class NotificationsController {
     }
 
     public NotificationsController() {
+        mContext = ApplicationLoader.applicationContext;
         notificationManager = NotificationManagerCompat.from(ApplicationLoader.applicationContext);
         SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Context.MODE_PRIVATE);
         inChatSoundEnabled = preferences.getBoolean("EnableInChatSound", true);
@@ -1117,10 +1120,10 @@ public class NotificationsController {
 
             String detailText;
             if (pushDialogs.size() == 1) {
-                detailText = LocaleController.formatPluralString("NewMessages", total_unread_count);
+                detailText = mContext.getResources().getQuantityString(R.plurals.NewMessages, total_unread_count, total_unread_count);
             } else {
                 detailText = LocaleController.formatString("NotificationMessagesPeopleDisplayOrder", R.string.NotificationMessagesPeopleDisplayOrder,
-                        LocaleController.formatPluralString("NewMessages", total_unread_count),
+                        mContext.getResources().getQuantityString(R.plurals.NewMessages, total_unread_count, total_unread_count),
                         LocaleController.formatPluralString("FromChats", pushDialogs.size()));
             }
 
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
index b86943f82..55345792b 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
@@ -3198,7 +3198,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 else if (view instanceof ChatUnreadCell)
                 {
                     ChatUnreadCell unreadCell = (ChatUnreadCell) view;
-                    unreadCell.setText(LocaleController.formatPluralString("NewMessages", markerUnreadCount));
+                    unreadCell.setText(mContext.getResources().getQuantityString(R.plurals.NewMessages, markerUnreadCount, markerUnreadCount));
                 }
             }
         }
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index 0cd2d2b4c..5dbdc447b 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -347,12 +347,10 @@
     <string name="Members_few">%1$d Mitglieder</string>
     <string name="Members_many">%1$d Mitglieder</string>
     <string name="Members_other">%1$d Mitglieder</string>
-    <string name="NewMessages_zero">keine neuen Nachrichten</string>
-    <string name="NewMessages_one">%1$d neue Nachricht</string>
-    <string name="NewMessages_two">%1$d neue Nachrichten</string>
-    <string name="NewMessages_few">%1$d neue Nachrichten</string>
-    <string name="NewMessages_many">%1$d neue Nachrichten</string>
-    <string name="NewMessages_other">%1$d neue Nachrichten</string>
+    <plurals name="NewMessages">
+        <item quantity="one">%d neue Nachricht</item>
+        <item quantity="other">%d neue Nachrichten</item>
+    </plurals>
     <plurals name="messages">
         <item quantity="one">%d Nachricht</item>
         <item quantity="other">%d Nachrichten</item>
diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml
index d2b874bfa..43ff2cb29 100644
--- a/MessengerProj/src/main/res/values-es/strings.xml
+++ b/MessengerProj/src/main/res/values-es/strings.xml
@@ -326,12 +326,10 @@
     <string name="Members_few">%1$d miembros</string>
     <string name="Members_many">%1$d miembros</string>
     <string name="Members_other">%1$d miembros</string>
-    <string name="NewMessages_zero">Sin mensajes nuevos</string>
-    <string name="NewMessages_one">%1$d nuevo mensaje</string>
-    <string name="NewMessages_two">%1$d nuevos mensajes</string>
-    <string name="NewMessages_few">%1$d nuevos mensajes</string>
-    <string name="NewMessages_many">%1$d nuevos mensajes</string>
-    <string name="NewMessages_other">%1$d nuevos mensajes</string>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nuevo mensaje</item>
+        <item quantity="other">%d nuevos mensajes</item>
+    </plurals>
     <plurals name="messages">
         <item quantity="one">%d mensaje</item>
         <item quantity="other">%d mensajes</item>
diff --git a/MessengerProj/src/main/res/values-fr/strings.xml b/MessengerProj/src/main/res/values-fr/strings.xml
index a6efc6b61..57c4fbb40 100644
--- a/MessengerProj/src/main/res/values-fr/strings.xml
+++ b/MessengerProj/src/main/res/values-fr/strings.xml
@@ -344,12 +344,10 @@
     <string name="Members_few">%1$d membres</string>
     <string name="Members_many">%1$d membres</string>
     <string name="Members_other">%1$d membres</string>
-    <string name="NewMessages_zero">aucun nouveau message</string>
-    <string name="NewMessages_one">%1$d nouveau message</string>
-    <string name="NewMessages_two">%1$d nouveaux messages</string>
-    <string name="NewMessages_few">%1$d nouveaux messages</string>
-    <string name="NewMessages_many">%1$d nouveaux messages</string>
-    <string name="NewMessages_other">%1$d nouveau messages</string>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nouveau message</item>
+        <item quantity="other">%d nouveaux messages</item>
+    </plurals>
     <plurals name="messages">
         <item quantity="one">%d message</item>
         <item quantity="other">%d messages</item>
diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml
index 726af0590..4569ec3e2 100644
--- a/MessengerProj/src/main/res/values-it/strings.xml
+++ b/MessengerProj/src/main/res/values-it/strings.xml
@@ -326,12 +326,10 @@
     <string name="Members_few">%1$d membri</string>
     <string name="Members_many">%1$d membri</string>
     <string name="Members_other">%1$d membri</string>
-    <string name="NewMessages_zero">nessun nuovo messaggio</string>
-    <string name="NewMessages_one">%1$d nuovo messaggio</string>
-    <string name="NewMessages_two">%1$d nuovi messaggi</string>
-    <string name="NewMessages_few">%1$d nuovi messaggi</string>
-    <string name="NewMessages_many">%1$d nuovi messaggi</string>
-    <string name="NewMessages_other">%1$d nuovi messaggi</string>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nuovo messaggio</item>
+        <item quantity="other">%d nuovi messaggi</item>
+    </plurals>
     <plurals name="messages">
         <item quantity="one">%d messaggio</item>
         <item quantity="other">%d messaggi</item>
diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml
index 34ed95447..449ceee52 100644
--- a/MessengerProj/src/main/res/values-nl/strings.xml
+++ b/MessengerProj/src/main/res/values-nl/strings.xml
@@ -326,12 +326,10 @@
     <string name="Members_few">%1$d leden</string>
     <string name="Members_many">%1$d leden</string>
     <string name="Members_other">%1$d leden</string>
-    <string name="NewMessages_zero">geen nieuwe berichten</string>
-    <string name="NewMessages_one">%1$d nieuw bericht</string>
-    <string name="NewMessages_two">%1$d nieuwe berichten</string>
-    <string name="NewMessages_few">%1$d nieuwe berichten</string>
-    <string name="NewMessages_many">%1$d nieuwe berichten</string>
-    <string name="NewMessages_other">%1$d nieuwe berichten</string>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nieuw bericht</item>
+        <item quantity="other">%d nieuwe berichten</item>
+    </plurals>
     <plurals name="messages">
         <item quantity="one">%d bericht</item>
         <item quantity="other">%d berichten</item>
diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml
index 9ddee33a0..78a5340bc 100644
--- a/MessengerProj/src/main/res/values-pt/strings.xml
+++ b/MessengerProj/src/main/res/values-pt/strings.xml
@@ -326,12 +326,10 @@
     <string name="Members_few">%1$d membros</string>
     <string name="Members_many">%1$d membros</string>
     <string name="Members_other">%1$d membros</string>
-    <string name="NewMessages_zero">sem novas mensagens</string>
-    <string name="NewMessages_one">%1$d nova mensagem</string>
-    <string name="NewMessages_two">%1$d novas mensagens</string>
-    <string name="NewMessages_few">%1$d novas mensagens</string>
-    <string name="NewMessages_many">%1$d novas mensagens</string>
-    <string name="NewMessages_other">%1$d novas mensagens</string>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nova mensagem</item>
+        <item quantity="other">%d novas mensagens</item>
+    </plurals>
     <plurals name="messages">
         <item quantity="one">%d mensagem</item>
         <item quantity="other">%d mensagens</item>
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index 1144bfc8d..1d8f24060 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -346,12 +346,10 @@
     <string name="Members_few">%1$d members</string>
     <string name="Members_many">%1$d members</string>
     <string name="Members_other">%1$d members</string>
-    <string name="NewMessages_zero">no new messages</string>
-    <string name="NewMessages_one">%1$d new message</string>
-    <string name="NewMessages_two">%1$d new messages</string>
-    <string name="NewMessages_few">%1$d new messages</string>
-    <string name="NewMessages_many">%1$d new messages</string>
-    <string name="NewMessages_other">%1$d new messages</string>
+    <plurals name="NewMessages">
+        <item quantity="one">%d new message</item>
+        <item quantity="other">%d new messages</item>
+    </plurals>
     <plurals name="messages">
         <item quantity="one">%d message</item>
         <item quantity="other">%d messages</item>