diff --git a/src/components/common/GroupChatInfo.tsx b/src/components/common/GroupChatInfo.tsx
index 2af078305..f2d3f98d2 100644
--- a/src/components/common/GroupChatInfo.tsx
+++ b/src/components/common/GroupChatInfo.tsx
@@ -102,7 +102,7 @@ const GroupChatInfo: FC<OwnProps & StateProps> = ({
 
     if (withChatType) {
       return (
-        <div className="status" dir="auto">{lang(getChatTypeString(chat))}</div>
+        <span className="status" dir="auto">{lang(getChatTypeString(chat))}</span>
       );
     }
 
@@ -111,11 +111,11 @@ const GroupChatInfo: FC<OwnProps & StateProps> = ({
     const onlineStatus = onlineCount ? `, ${lang('OnlineCount', onlineCount, 'i')}` : undefined;
 
     return (
-      <div className="status">
+      <span className="status">
         {handle && <span className="handle">{handle}</span>}
         <span className="group-status">{groupStatus}</span>
         {onlineStatus && <span className="online-status">{onlineStatus}</span>}
-      </div>
+      </span>
     );
   }
 
diff --git a/src/components/common/PrivateChatInfo.tsx b/src/components/common/PrivateChatInfo.tsx
index 3e10d5974..efc702207 100644
--- a/src/components/common/PrivateChatInfo.tsx
+++ b/src/components/common/PrivateChatInfo.tsx
@@ -110,10 +110,10 @@ const PrivateChatInfo: FC<OwnProps & StateProps> = ({
     }
 
     return (
-      <div className={`status ${isUserOnline(user, userStatus) ? 'online' : ''}`}>
+      <span className={`status ${isUserOnline(user, userStatus) ? 'online' : ''}`}>
         {withUsername && user.username && <span className="handle">{user.username}</span>}
         <span className="user-status" dir="auto">{getUserStatus(lang, user, userStatus, serverTimeOffset)}</span>
-      </div>
+      </span>
     );
   }
 
diff --git a/src/components/middle/MiddleHeader.scss b/src/components/middle/MiddleHeader.scss
index fb57cff8f..0a027ae91 100644
--- a/src/components/middle/MiddleHeader.scss
+++ b/src/components/middle/MiddleHeader.scss
@@ -282,9 +282,15 @@
       }
     }
 
-    .status {
-      display: flex;
+    .status, .typing-status {
+      display: inline;
       unicode-bidi: plaintext;
+
+      @media (min-width: 1275px) {
+        #Main.right-column-open & {
+          max-width: calc(100% - var(--right-column-width));
+        }
+      }
     }
 
     .user-status {