diff --git a/app/less/app.less b/app/less/app.less
index 91e60036..a2b11e5d 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -289,6 +289,10 @@ input[type="number"] {
 
   -webkit-transform: translate3d(0, 22px, 0);
   transform: translate3d(0, 22px, 0);
+
+  span.ng-enter-prepare {
+    display: none;
+  }
 }
 
 .md-input-animated {
diff --git a/app/partials/desktop/dialog.html b/app/partials/desktop/dialog.html
index 6735f687..5c97ee6b 100644
--- a/app/partials/desktop/dialog.html
+++ b/app/partials/desktop/dialog.html
@@ -3,13 +3,13 @@
   <div class="im_dialog_meta pull-right text-right">
     <div class="im_dialog_date" ng-bind="dialogMessage.dateText"></div>
     <span
-      class="im_dialog_badge badge"
+      class="im_dialog_badge badge ng-hide"
       ng-show="dialogMessage.unreadCount > 0 && !dialogMessage.pFlags.out"
       ng-bind="dialogMessage.unreadCount"
       my-peer-muted="dialogMessage.peerID" muted-class="im_dialog_badge_muted"
     ></span>
     <i
-      class="im_dialog_unread"
+      class="im_dialog_unread ng-hide"
       ng-show="dialogMessage.pFlags.out && dialogMessage.pFlags.unread"
     ></i>
   </div>
diff --git a/app/partials/mobile/dialog.html b/app/partials/mobile/dialog.html
index 6735f687..5c97ee6b 100644
--- a/app/partials/mobile/dialog.html
+++ b/app/partials/mobile/dialog.html
@@ -3,13 +3,13 @@
   <div class="im_dialog_meta pull-right text-right">
     <div class="im_dialog_date" ng-bind="dialogMessage.dateText"></div>
     <span
-      class="im_dialog_badge badge"
+      class="im_dialog_badge badge ng-hide"
       ng-show="dialogMessage.unreadCount > 0 && !dialogMessage.pFlags.out"
       ng-bind="dialogMessage.unreadCount"
       my-peer-muted="dialogMessage.peerID" muted-class="im_dialog_badge_muted"
     ></span>
     <i
-      class="im_dialog_unread"
+      class="im_dialog_unread ng-hide"
       ng-show="dialogMessage.pFlags.out && dialogMessage.pFlags.unread"
     ></i>
   </div>