diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js
index fb5bb024..3d8b4db2 100644
--- a/app/js/messages_manager.js
+++ b/app/js/messages_manager.js
@@ -2681,7 +2681,7 @@ angular.module('myApp.services')
         }
 
         if (curMessage.views &&
-          !incrementedMessageViews[curMessage.mid]) {
+            !incrementedMessageViews[curMessage.mid]) {
           incrementedMessageViews[curMessage.mid] = true
           needIncrementMessageViews.push(curMessage.mid)
           if (incrementMessageViewsTimeout === false) {
@@ -2689,14 +2689,14 @@ angular.module('myApp.services')
           }
         }
 
-        if (prevMessage &&
-          // !curMessage.views &&
-          prevMessage.fromID == curMessage.fromID &&
-          !prevMessage.fwdFromID == !curMessage.fwdFromID &&
-          prevMessage.viaBotID == curMessage.viaBotID &&
-          !prevMessage.action &&
-          !curMessage.action &&
-          curMessage.date < prevMessage.date + 900) {
+        if ((!AppPeersManager.isBroadcast(getMessagePeer(curMessage)) || curMessage.fwdFromID) &&
+            prevMessage &&
+            prevMessage.fromID == curMessage.fromID &&
+            !prevMessage.fwdFromID == !curMessage.fwdFromID &&
+            prevMessage.viaBotID == curMessage.viaBotID &&
+            !prevMessage.action &&
+            !curMessage.action &&
+            curMessage.date < prevMessage.date + 900) {
           var singleLine = curMessage.message && curMessage.message.length < 70 && curMessage.message.indexOf('\n') == -1 && !curMessage.reply_to_mid
           if (groupFwd &&
             curMessage.fwdFromID &&
diff --git a/app/less/mobile.less b/app/less/mobile.less
index 68eee22e..50f7d3fb 100644
--- a/app/less/mobile.less
+++ b/app/less/mobile.less
@@ -864,11 +864,17 @@ img.im_message_video_thumb,
 
 .im_message_date {
   font-size: 10px;
+  line-height: 12px;
   padding: 0;
+  display: block;
 }
 .im_message_edited {
-  position: absolute;
-  top: -11px;
+  display: block;
+  margin-top: 4px;
+}
+.im_message_date_text {
+  display: block;
+  margin-top: 3px;
 }
 
 .im_message_out {