diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 533e5d849..95e1b3af5 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -1734,25 +1734,29 @@ const Message = ({
           </span>
         )}
         <div className="title-spacer" />
-        {(!shouldSkipRenderAdminTitle && !signature) ? (forwardInfo?.isLinkedChannelPost ? (
-          <span className="admin-title" dir="auto">{oldLang('DiscussChannel')}</span>
-        ) : message.postAuthorTitle && isGroup && !asForwarded ? (
-          <span className="admin-title" dir="auto">{message.postAuthorTitle}</span>
-        ) : (senderChatMember || fromRank) && !asForwarded ? (
-          <RankBadge
-            chatId={chatId}
-            userId={(senderChatMember?.userId || sender?.id)!}
-            isAdmin={senderChatMember?.isAdmin}
-            isOwner={senderChatMember?.isOwner}
-            rank={senderChatMember?.rank || fromRank}
-            className="admin-title-badge"
-            isClickable
-          />
-        ) : undefined) : undefined}
-        {canShowSenderBoosts && (
-          <span className="sender-boosts" aria-hidden>
-            <Icon name={senderBoosts > 1 ? 'boosts' : 'boost'} />
-            {senderBoosts > 1 ? senderBoosts : undefined}
+        {((!shouldSkipRenderAdminTitle && !signature) || canShowSenderBoosts) && (
+          <span className="message-title-meta">
+            {(!shouldSkipRenderAdminTitle && !signature) ? (forwardInfo?.isLinkedChannelPost ? (
+              <span className="admin-title" dir="auto">{oldLang('DiscussChannel')}</span>
+            ) : message.postAuthorTitle && isGroup && !asForwarded ? (
+              <span className="admin-title" dir="auto">{message.postAuthorTitle}</span>
+            ) : (senderChatMember || fromRank) && !asForwarded ? (
+              <RankBadge
+                chatId={chatId}
+                userId={(senderChatMember?.userId || sender?.id)!}
+                isAdmin={senderChatMember?.isAdmin}
+                isOwner={senderChatMember?.isOwner}
+                rank={senderChatMember?.rank || fromRank}
+                className="admin-title-badge"
+                isClickable
+              />
+            ) : undefined) : undefined}
+            {canShowSenderBoosts && (
+              <span className="sender-boosts" aria-hidden>
+                <Icon name={senderBoosts > 1 ? 'boosts' : 'boost'} />
+                {senderBoosts > 1 ? senderBoosts : undefined}
+              </span>
+            )}
           </span>
         )}
       </div>
diff --git a/src/components/middle/message/_message-content.scss b/src/components/middle/message/_message-content.scss
index c0cdbbe0c..e2f9cfc47 100644
--- a/src/components/middle/message/_message-content.scss
+++ b/src/components/middle/message/_message-content.scss
@@ -398,9 +398,21 @@
       flex-grow: 1;
     }
 
+    .message-title-meta {
+      user-select: none;
+
+      display: flex;
+      align-items: center;
+      gap: 0.25rem;
+      margin-left: 1rem;
+    }
+
     .admin-title-badge, .admin-title {
       user-select: none;
-      margin-left: 1rem;
+    }
+
+    .admin-title-badge:last-child {
+      margin-right: -0.1875rem;
     }
 
     .admin-title {
@@ -414,19 +426,12 @@
       }
     }
 
-    .admin-title-badge {
-      margin-right: -0.1875rem;
-    }
-
     .sender-boosts {
       user-select: none;
 
       display: flex;
       align-items: center;
 
-      margin-top: -0.125rem;
-      margin-inline-start: 0.125rem;
-
       font-size: 0.75rem;
     }
   }