diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index f0e91875b..a531acaa9 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -285,7 +285,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 2136
+    defaultConfig.versionCode = 2137
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
index 3007713d3..199b05b06 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
@@ -18,7 +18,7 @@ public class BuildVars {
     public static boolean LOGS_ENABLED = false;
     public static boolean USE_CLOUD_STRINGS = true;
     public static boolean CHECK_UPDATES = true;
-    public static int BUILD_VERSION = 2136;
+    public static int BUILD_VERSION = 2137;
     public static String BUILD_VERSION_STRING = "7.2.0";
     public static int APP_ID = 4;
     public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index 5af5e61cf..ea45fb6e1 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -6924,6 +6924,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             if (chatActivityEnterView.getAnimatedTop() != 0) {
                 chatListViewPaddingTop += chatActivityEnterView.getHeightWithTopView() - AndroidUtilities.dp(51) - chatActivityEnterView.getAnimatedTop();
             } else if (!chatActivityEnterView.pannelAniamationInProgress())  {
+                chatListViewPaddingTop += chatActivityEnterView.getHeightWithTopView() - AndroidUtilities.dp(51);
                 chatListViewPaddingTop -= chatListView.getTranslationY();
             }
         }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarDrawable.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarDrawable.java
index ea46428ac..0e594d05b 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarDrawable.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarDrawable.java
@@ -359,9 +359,16 @@ public class AvatarDrawable extends Drawable {
                 }
             }
         } else if (drawDeleted && Theme.avatarDrawables[1] != null) {
-            int x = (size - Theme.avatarDrawables[1].getIntrinsicWidth()) / 2;
-            int y = (size - Theme.avatarDrawables[1].getIntrinsicHeight()) / 2;
-            Theme.avatarDrawables[1].setBounds(x, y, x + Theme.avatarDrawables[1].getIntrinsicWidth(), y + Theme.avatarDrawables[1].getIntrinsicHeight());
+            int w = Theme.avatarDrawables[1].getIntrinsicWidth();
+            int h = Theme.avatarDrawables[1].getIntrinsicHeight();
+            if (w > size || h > size) {
+                float scale = size / (float) AndroidUtilities.dp(50);
+                w *= scale;
+                h *= scale;
+            }
+            int x = (size - w) / 2;
+            int y = (size - h) / 2;
+            Theme.avatarDrawables[1].setBounds(x, y, x + w, y + h);
             Theme.avatarDrawables[1].draw(canvas);
         } else {
             if (textLayout != null) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/PinnedLineView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/PinnedLineView.java
index fdcf1ce19..fd9a5bd17 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/PinnedLineView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/PinnedLineView.java
@@ -221,8 +221,9 @@ public class PinnedLineView extends View {
             this.totalCount = totalCount;
             invalidate();
         } else {
-            if (this.totalCount != totalCount || Math.abs(selectedPosition - position) > 2) {
+            if (this.totalCount != totalCount || (Math.abs(selectedPosition - position) > 2 && !animationInProgress && !replaceInProgress)) {
                 if (animator != null) {
+                    nextPosition = 0;
                     animator.cancel();
                 }
                 int viewPadding = AndroidUtilities.dp(8);