diff --git a/app/partials/desktop/dialog.html b/app/partials/desktop/dialog.html
index 84ffb6f0..54572391 100644
--- a/app/partials/desktop/dialog.html
+++ b/app/partials/desktop/dialog.html
@@ -22,8 +22,10 @@
       <span class="im_dialog_chat" ng-switch-default ng-bind-html="dialogMessage.peerData.rTitle"></span>
     </div>
 
-    <div ng-if="dialogMessage.typing > 0" class="im_dialog_message" ng-switch="::dialogMessage.peerID > 0" my-i18n>
-      <span ng-switch-when="true" my-i18n-format="im_conversation_single_typing"></span><span ng-switch-default my-i18n-format="im_conversation_group_typing"></span><my-i18n-param name="name"><span my-user-link="dialogMessage.typing" short="true"></span></my-i18n-param><my-i18n-param name="dots"><span my-loading-dots></span></my-i18n-param>
+    <div ng-if="dialogMessage.typing > 0" class="im_dialog_message">
+      <span class="im_dialog_message_service" my-i18n="im_conversation_group_typing">
+        <my-i18n-param name="name"><span my-user-link="dialogMessage.typing" short="true" class="im_dialog_chat_from_wrap"></span></my-i18n-param><my-i18n-param name="dots"><span my-loading-dots></span></my-i18n-param>
+      </span>
     </div>
 
     <div ng-show="!dialogMessage.typing" ng-switch="dialogMessage.deleted">
diff --git a/app/partials/mobile/dialog.html b/app/partials/mobile/dialog.html
index 2a55169f8..d8e07677 100644
--- a/app/partials/mobile/dialog.html
+++ b/app/partials/mobile/dialog.html
@@ -29,8 +29,10 @@
       <span class="im_dialog_chat" ng-switch-default ng-bind-html="dialogMessage.peerData.rTitle"></span>
     </div>
 
-    <div ng-if="dialogMessage.typing > 0" class="im_dialog_message" ng-switch="::dialogMessage.peerID > 0" my-i18n>
-      <span ng-switch-when="true" my-i18n-format="im_conversation_single_typing"></span><span ng-switch-default my-i18n-format="im_conversation_group_typing"></span><my-i18n-param name="name"><span my-user-link="dialogMessage.typing" short="true"></span></my-i18n-param><my-i18n-param name="dots"><span my-loading-dots></span></my-i18n-param>
+    <div ng-if="dialogMessage.typing > 0" class="im_dialog_message">
+      <span class="im_dialog_message_service" my-i18n="im_conversation_group_typing">
+        <my-i18n-param name="name"><span my-user-link="dialogMessage.typing" short="true" class="im_dialog_chat_from_wrap"></span></my-i18n-param><my-i18n-param name="dots"><span my-loading-dots></span></my-i18n-param>
+      </span>
     </div>
 
     <div ng-show="!dialogMessage.typing" ng-switch="dialogMessage.deleted">