diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index f2a8eee55..ed57c4a5f 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -648,7 +648,7 @@ export default {
         },
 
         filterDialog(dialog) {
-            if ($A.getDialogNum(dialog) > 0 || dialog.id == this.dialogId || dialog.top_at || dialog.todo_num > 0) {
+            if ((dialog.id > 0 && dialog.id == this.dialogId) || dialog.top_at || dialog.todo_num > 0 || $A.getDialogNum(dialog) > 0) {
                 return true
             }
             if (dialog.name === undefined || dialog.dialog_delete === 1) {
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 1ef7e64fa..dfe19a2fd 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -661,12 +661,12 @@
 
                                 img {
                                     cursor: pointer;
-                                    max-width: 220px;
+                                    max-width: 100%;
                                     max-height: 220px;
                                     vertical-align: bottom;
 
                                     &.emoticon {
-                                        max-width: 150px;
+                                        max-width: 100%;
                                         max-height: 150px;
                                     }
                                 }