diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index f921874f2..0b58e2924 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -82,7 +82,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 22
-        versionCode 466
+        versionCode 467
         versionName "2.6.0"
     }
 }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java
index ba3af3b0f..b73647bfb 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java
@@ -111,7 +111,7 @@ public class MentionsAdapter extends BaseFragmentAdapter {
                 int lhsNum = users.indexOf(lhs.id);
                 int rhsNum = users.indexOf(rhs.id);
                 if (lhsNum != -1 && rhsNum != -1) {
-                    return Integer.compare(lhsNum, rhsNum);
+                    return lhsNum < rhsNum ? -1 : (lhsNum == rhsNum ? 0 : 1);
                 } else if (lhsNum != -1 && rhsNum == -1) {
                     return -1;
                 } else if (lhsNum == -1 && rhsNum != -1) {
diff --git a/TMessagesProj/src/main/res/values-ko/strings.xml b/TMessagesProj/src/main/res/values-ko/strings.xml
index 913229857..ef95e4df9 100644
--- a/TMessagesProj/src/main/res/values-ko/strings.xml
+++ b/TMessagesProj/src/main/res/values-ko/strings.xml
@@ -298,10 +298,10 @@
     <string name="ChangePhoneHelp">인증코드 메시지를 새 번호로 전송하겠습니다.</string>
     <string name="ChangePhoneNumberOccupied">그 번호는 이미 텔레그램 계정에 연결되어 있습니다. 새 번호로 이동하기 전에 %1$s 계정에서 탈퇴해 주세요.</string>
     <string name="NotificationsOther">기타</string>
-    <string name="NotificationsDisabled">끄기</string>
-    <string name="VibrationDisabled">끄기</string>
-    <string name="LedDisabled">끄기</string>
-    <string name="RepeatDisabled">끄기</string>
+    <string name="NotificationsDisabled">비활성화됨</string>
+    <string name="VibrationDisabled">비활성화됨</string>
+    <string name="LedDisabled">비활성화됨</string>
+    <string name="RepeatDisabled">끔</string>
     <!--passcode view-->
     <string name="Passcode">잠금번호</string>
     <string name="ChangePasscode">잠금번호 변경</string>
@@ -360,9 +360,9 @@
     <string name="Grain">그레인</string>
     <string name="Sharpen">선명</string>
     <string name="Blur">흐림</string>
-    <string name="BlurOff">Off</string>
-    <string name="BlurLinear">Linear</string>
-    <string name="BlurRadial">Radial</string>
+    <string name="BlurOff">끔</string>
+    <string name="BlurLinear">선형</string>
+    <string name="BlurRadial">방사형</string>
     <string name="AreYouSureDeletePhoto">이 사진을 삭제하시겠습니까?</string>
     <string name="AreYouSureDeleteVideo">이 동영상을 삭제하시겠습니까?</string>
     <string name="DiscardChanges">변경을 취소하시겠습니까?</string>
@@ -616,60 +616,60 @@
     <string name="Users_many">%1$d명의 대화상대</string>
     <string name="Users_other">%1$d명의 대화상대</string>
     <!--forwarded messages-->
-    <string name="ForwardedMessage_zero">%1$d forwarded messages</string>
-    <string name="ForwardedMessage_one">Forwarded message</string>
-    <string name="ForwardedMessage_two">%1$d forwarded messages</string>
-    <string name="ForwardedMessage_few">%1$d forwarded messages</string>
-    <string name="ForwardedMessage_many">%1$d forwarded messages</string>
-    <string name="ForwardedMessage_other">%1$d forwarded messages</string>
-    <string name="ForwardedFile_zero">%1$d forwarded files</string>
-    <string name="ForwardedFile_one">Forwarded file</string>
-    <string name="ForwardedFile_two">%1$d forwarded files</string>
-    <string name="ForwardedFile_few">%1$d forwarded files</string>
-    <string name="ForwardedFile_many">%1$d forwarded files</string>
-    <string name="ForwardedFile_other">%1$d forwarded files</string>
-    <string name="ForwardedPhoto_zero">%1$d forwarded photos</string>
-    <string name="ForwardedPhoto_one">Forwarded photo</string>
-    <string name="ForwardedPhoto_two">%1$d forwarded photos</string>
-    <string name="ForwardedPhoto_few">%1$d forwarded photos</string>
-    <string name="ForwardedPhoto_many">%1$d forwarded photos</string>
-    <string name="ForwardedPhoto_other">%1$d forwarded photos</string>
-    <string name="ForwardedVideo_zero">%1$d forwarded videos</string>
-    <string name="ForwardedVideo_one">Forwarded video</string>
-    <string name="ForwardedVideo_two">%1$d forwarded videos</string>
-    <string name="ForwardedVideo_few">%1$d forwarded videos</string>
-    <string name="ForwardedVideo_many">%1$d forwarded videos</string>
-    <string name="ForwardedVideo_other">%1$d forwarded videos</string>
-    <string name="ForwardedAudio_zero">%1$d forwarded audios</string>
-    <string name="ForwardedAudio_one">Forwarded audio</string>
-    <string name="ForwardedAudio_two">%1$d forwarded audios</string>
-    <string name="ForwardedAudio_few">%1$d forwarded audios</string>
-    <string name="ForwardedAudio_many">%1$d forwarded audios</string>
-    <string name="ForwardedAudio_other">%1$d forwarded audios</string>
-    <string name="ForwardedLocation_zero">%1$d forwarded locations</string>
-    <string name="ForwardedLocation_one">Forwarded location</string>
-    <string name="ForwardedLocation_two">%1$d forwarded locations</string>
-    <string name="ForwardedLocation_few">%1$d forwarded locations</string>
-    <string name="ForwardedLocation_many">%1$d forwarded locations</string>
-    <string name="ForwardedLocation_other">%1$d forwarded locations</string>
-    <string name="ForwardedContact_zero">%1$d forwarded contacts</string>
-    <string name="ForwardedContact_one">Forwarded contact</string>
-    <string name="ForwardedContact_two">%1$d forwarded contacts</string>
-    <string name="ForwardedContact_few">%1$d forwarded contacts</string>
-    <string name="ForwardedContact_many">%1$d forwarded contacts</string>
-    <string name="ForwardedContact_other">%1$d forwarded contacts</string>
-    <string name="ForwardedSticker_zero">%1$d forwarded stickers</string>
-    <string name="ForwardedSticker_one">Forwarded sticker</string>
-    <string name="ForwardedSticker_two">%1$d forwarded stickers</string>
-    <string name="ForwardedSticker_few">%1$d forwarded stickers</string>
-    <string name="ForwardedSticker_many">%1$d forwarded stickers</string>
-    <string name="ForwardedSticker_other">%1$d forwarded stickers</string>
-    <string name="AndOther_zero">and %1$d others</string>
-    <string name="AndOther_one">and %1$d other</string>
-    <string name="AndOther_two">and %1$d others</string>
-    <string name="AndOther_few">and %1$d others</string>
-    <string name="AndOther_many">and %1$d others</string>
-    <string name="AndOther_other">and %1$d others</string>
+    <string name="ForwardedMessage_zero">%1$d 개의 전달된 메시지</string>
+    <string name="ForwardedMessage_one">전달된 메시지</string>
+    <string name="ForwardedMessage_two">%1$d 개의 전달된 메시지</string>
+    <string name="ForwardedMessage_few">%1$d 개의 전달된 메시지</string>
+    <string name="ForwardedMessage_many">%1$d 개의 전달된 메시지</string>
+    <string name="ForwardedMessage_other">%1$d 개의 전달된 메시지</string>
+    <string name="ForwardedFile_zero">%1$d 개의 전달된 파일</string>
+    <string name="ForwardedFile_one">전달된 파일</string>
+    <string name="ForwardedFile_two">%1$d 개의 전달된 파일</string>
+    <string name="ForwardedFile_few">%1$d 개의 전달된 파일</string>
+    <string name="ForwardedFile_many">%1$d 개의 전달된 파일</string>
+    <string name="ForwardedFile_other">%1$d 개의 전달된 파일</string>
+    <string name="ForwardedPhoto_zero">%1$d 개의 전달된 사진</string>
+    <string name="ForwardedPhoto_one">전달된 사진</string>
+    <string name="ForwardedPhoto_two">%1$d 개의 전달된 사진</string>
+    <string name="ForwardedPhoto_few">%1$d 개의 전달된 사진</string>
+    <string name="ForwardedPhoto_many">%1$d 개의 전달된 사진</string>
+    <string name="ForwardedPhoto_other">%1$d 개의 전달된 사진</string>
+    <string name="ForwardedVideo_zero">%1$d 개의 전달된 사진</string>
+    <string name="ForwardedVideo_one">전달된 비디오</string>
+    <string name="ForwardedVideo_two">%1$d 개의 전달된 비디오</string>
+    <string name="ForwardedVideo_few">%1$d 개의 전달된 비디오</string>
+    <string name="ForwardedVideo_many">%1$d 개의 전달된 비디오</string>
+    <string name="ForwardedVideo_other">%1$d 개의 전달된 비디오</string>
+    <string name="ForwardedAudio_zero">%1$d 개의 전달된 오디오</string>
+    <string name="ForwardedAudio_one">전달된 오디오</string>
+    <string name="ForwardedAudio_two">%1$d 개의 전달된 오디오</string>
+    <string name="ForwardedAudio_few">%1$d 개의 전달된 오디오</string>
+    <string name="ForwardedAudio_many">%1$d 개의 전달된 오디오</string>
+    <string name="ForwardedAudio_other">%1$d 개의 전달된 오디오</string>
+    <string name="ForwardedLocation_zero">%1$d 개의 전달된 위치</string>
+    <string name="ForwardedLocation_one">전달된 위치</string>
+    <string name="ForwardedLocation_two">%1$d 개의 전달된 위치</string>
+    <string name="ForwardedLocation_few">%1$d 개의 전달된 위치</string>
+    <string name="ForwardedLocation_many">%1$d 개의 전달된 위치</string>
+    <string name="ForwardedLocation_other">%1$d 개의 전달된 위치</string>
+    <string name="ForwardedContact_zero">%1$d 개의 전달된 연락처</string>
+    <string name="ForwardedContact_one">전달된 연락처</string>
+    <string name="ForwardedContact_two">%1$d 개의 전달된 연락처</string>
+    <string name="ForwardedContact_few">%1$d 개의 전달된 연락처</string>
+    <string name="ForwardedContact_many">%1$d 개의 전달된 연락처</string>
+    <string name="ForwardedContact_other">%1$d 개의 전달된 연락처</string>
+    <string name="ForwardedSticker_zero">%1$d 개의 전달된 스티커</string>
+    <string name="ForwardedSticker_one">전달된 스티커</string>
+    <string name="ForwardedSticker_two">%1$d 개의 전달된 스티커</string>
+    <string name="ForwardedSticker_few">%1$d 개의 전달된 스티커</string>
+    <string name="ForwardedSticker_many">%1$d 개의 전달된 스티커</string>
+    <string name="ForwardedSticker_other">%1$d 개의 전달된 스티커</string>
+    <string name="AndOther_zero">및 %1$d 개</string>
+    <string name="AndOther_one">및 %1$d 개</string>
+    <string name="AndOther_two">및 %1$d 개</string>
+    <string name="AndOther_few">및 %1$d 개</string>
+    <string name="AndOther_many">및 %1$d 개</string>
+    <string name="AndOther_other">및 %1$d 개</string>
     <!--date formatters-->
     <string name="formatterMonthYear">MMMM yyyy</string>
     <string name="formatterMonth">M\'월\' d\'일\'</string>