diff --git a/src/components/middle/ActionMessage.tsx b/src/components/middle/ActionMessage.tsx
index ca385f43e..c47bbd790 100644
--- a/src/components/middle/ActionMessage.tsx
+++ b/src/components/middle/ActionMessage.tsx
@@ -198,6 +198,7 @@ const ActionMessage: FC<OwnProps & StateProps> = ({
     (isGift || isSuggestedAvatar) && 'centered-action',
     isContextMenuShown && 'has-menu-open',
     isLastInList && 'last-in-list',
+    !isGift && !isSuggestedAvatar && 'in-one-row',
     transitionClassNames,
   );
 
diff --git a/src/components/middle/MessageList.scss b/src/components/middle/MessageList.scss
index a0538d574..fdf95d564 100644
--- a/src/components/middle/MessageList.scss
+++ b/src/components/middle/MessageList.scss
@@ -385,6 +385,10 @@
   .ActionMessage {
     margin-top: 0.5rem;
     margin-bottom: 0.5rem;
+  }
+
+  .local-action-message,
+  .ActionMessage.in-one-row {
     height: 1.5625rem;
   }