diff --git a/src/components/middle/MessageList.scss b/src/components/middle/MessageList.scss
index 684d63c9c..6aeebfaca 100644
--- a/src/components/middle/MessageList.scss
+++ b/src/components/middle/MessageList.scss
@@ -216,11 +216,6 @@
       max-width: 80%;
       text-align: left;
     }
-
-    .text-entity-link {
-      color: inherit !important;
-      text-decoration: underline !important;
-    }
   }
 
   .sticky-date,
diff --git a/src/components/middle/MessageListBotInfo.module.scss b/src/components/middle/MessageListBotInfo.module.scss
index 7b45dd3c0..b17265703 100644
--- a/src/components/middle/MessageListBotInfo.module.scss
+++ b/src/components/middle/MessageListBotInfo.module.scss
@@ -11,8 +11,8 @@
   display: flex;
   flex-direction: column;
 
-  background: var(--pattern-color);
-  color: white;
+  background-color: var(--color-background);
+  color: var(--color-text);
   font-size: calc(var(--message-text-size, 1rem) - 0.0625rem);
   line-height: 1.75;
   border-radius: var(--border-radius-messages);
@@ -28,3 +28,8 @@
   font-weight: 500;
   margin-bottom: 0.25rem;
 }
+
+.image {
+  max-width: 100%;
+  height: auto;
+}
diff --git a/src/components/middle/MessageListBotInfo.tsx b/src/components/middle/MessageListBotInfo.tsx
index 97f775000..269ae0e94 100644
--- a/src/components/middle/MessageListBotInfo.tsx
+++ b/src/components/middle/MessageListBotInfo.tsx
@@ -70,6 +70,7 @@ const MessageListBotInfo: FC<OwnProps & StateProps> = ({
         >
           {botInfoPhotoUrl && (
             <img
+              className={styles.image}
               src={botInfoPhotoUrl}
               width={botInfoRealDimensions?.width}
               height={botInfoRealDimensions?.height}
diff --git a/src/components/middle/composer/BotKeyboardMenu.scss b/src/components/middle/composer/BotKeyboardMenu.scss
index 25f12411f..ec2e77476 100644
--- a/src/components/middle/composer/BotKeyboardMenu.scss
+++ b/src/components/middle/composer/BotKeyboardMenu.scss
@@ -1,3 +1,5 @@
+@import "../../../styles/mixins";
+
 .BotKeyboardMenu {
   .bubble {
     width: 100% !important;
@@ -9,12 +11,9 @@
     display: flex;
     flex-direction: column;
     padding: 0.1875rem 0.625rem;
-    max-height: 80vh;
-    overflow: auto;
-
-    @media (max-width: 600px) {
-      max-height: 75vh;
-    }
+    max-height: 75vh;
+    overflow-y: scroll;
+    @include adapt-padding-to-scrollbar(0.625rem);
 
     .row {
       display: flex;
diff --git a/src/components/middle/composer/BotKeyboardMenu.tsx b/src/components/middle/composer/BotKeyboardMenu.tsx
index aad7d75e2..3ec717eec 100644
--- a/src/components/middle/composer/BotKeyboardMenu.tsx
+++ b/src/components/middle/composer/BotKeyboardMenu.tsx
@@ -49,7 +49,7 @@ const BotKeyboardMenu: FC<OwnProps & StateProps> = ({
       onMouseLeave={!IS_TOUCH_ENV ? handleMouseLeave : undefined}
       noCompact
     >
-      <div className="content">
+      <div className="content custom-scroll">
         {message.keyboardButtons.map((row) => (
           <div className="row">
             {row.map((button) => (
diff --git a/src/global/actions/api/chats.ts b/src/global/actions/api/chats.ts
index 58c0812be..87ee00ba1 100644
--- a/src/global/actions/api/chats.ts
+++ b/src/global/actions/api/chats.ts
@@ -1132,7 +1132,8 @@ addActionHandler('openChatByUsername', async (global, actions, payload): Promise
   const isWebApp = webAppName && !Number(webAppName) && !originalParts?.[2];
 
   if (!commentId) {
-    if (!startAttach && messageId && !startParam && chat?.usernames?.some((c) => c.username === username)) {
+    if (startAttach === undefined && messageId && !startParam
+      && chat?.usernames?.some((c) => c.username === username)) {
       actions.focusMessage({
         chatId: chat.id, threadId, messageId, tabId,
       });
@@ -2559,7 +2560,7 @@ async function openChatByUsername<T extends GlobalState>(
   threadId?: number,
   channelPostId?: number,
   startParam?: string,
-  startAttach?: string | boolean,
+  startAttach?: string,
   attach?: string,
   ...[tabId = getCurrentTabId()]: TabArgs<T>
 ) {
@@ -2567,7 +2568,7 @@ async function openChatByUsername<T extends GlobalState>(
   const currentChat = selectCurrentChat(global, tabId);
 
   // Attach in the current chat
-  if (startAttach && !attach) {
+  if (startAttach !== undefined && !attach) {
     const bot = await getAttachBotOrNotify(global, actions, username, tabId);
 
     if (!currentChat || !bot) return;
@@ -2575,7 +2576,7 @@ async function openChatByUsername<T extends GlobalState>(
     actions.callAttachBot({
       bot,
       chatId: currentChat.id,
-      ...(typeof startAttach === 'string' && { startParam: startAttach }),
+      startParam: startAttach,
       tabId,
     });
 
diff --git a/src/global/types.ts b/src/global/types.ts
index 6ac44d9aa..27ccd19c2 100644
--- a/src/global/types.ts
+++ b/src/global/types.ts
@@ -1353,7 +1353,7 @@ export interface ActionPayloads {
     messageId?: number;
     commentId?: number;
     startParam?: string;
-    startAttach?: string | boolean;
+    startAttach?: string;
     attach?: string;
     startApp?: string;
     originalParts?: string[];