diff --git a/src/app/mainview/components/MessageListView.qml b/src/app/mainview/components/MessageListView.qml
index 442685cd7c9611609b221772b0c5aa98600ea3e1..bfff14cae6fd3068122dcc74c17219ca090b1948 100644
--- a/src/app/mainview/components/MessageListView.qml
+++ b/src/app/mainview/components/MessageListView.qml
@@ -109,7 +109,7 @@ JamiListView {
         function isFirst() {
             if (!nItem) return true
             else {
-                if (item.showTime || item.isReply  ) {
+                if (item.showTime || item.isReply || nItem.isEmojiOnly ) {
                     return true
                 } else if (nItem.author !== item.author) {
                     return true
@@ -121,7 +121,7 @@ JamiListView {
         function isLast() {
             if (!pItem) return true
             else {
-                if (pItem.showTime || pItem.isReply) {
+                if (pItem.showTime || pItem.isReply || pItem.isEmojiOnly) {
                     return true
                 } else if (pItem.author !== item.author) {
                     return true