diff --git a/pandora_console/include/functions_messages.php b/pandora_console/include/functions_messages.php
index f633866f65..a67bcb56e1 100644
--- a/pandora_console/include/functions_messages.php
+++ b/pandora_console/include/functions_messages.php
@@ -384,7 +384,7 @@ function messages_get_count(
                     AND up.id_grupo=ng.id_group
             ) ON tm.id_mensaje=ng.id_mensaje 
             WHERE utimestamp_erased is null
-                AND (nu.id_user="%s" OR (up.id_usuario="%s" AND ng.id_group=0))
+                AND (nu.id_user="%s" OR up.id_usuario="%s" OR ng.id_group=0)
         ) t 
         %s',
         $source_sql,
@@ -496,7 +496,7 @@ function messages_get_overview(
             ) ON tm.id_mensaje=ng.id_mensaje
             %s
             WHERE utimestamp_erased is null
-                AND (nu.id_user="%s" OR (up.id_usuario="%s" AND ng.id_group=0))
+                AND (nu.id_user="%s" OR up.id_usuario="%s" OR ng.id_group=0)
         ) t 
         %s
         %s
diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php
index 0e35b7ea37..23b1a90e70 100644
--- a/pandora_console/include/functions_notifications.php
+++ b/pandora_console/include/functions_notifications.php
@@ -145,7 +145,7 @@ function check_notification_readable(int $id_message)
                     AND up.id_grupo=ng.id_group
             ) ON tm.id_mensaje=ng.id_mensaje 
             WHERE utimestamp_erased is null
-                AND (nu.id_user="%s" OR (up.id_usuario="%s" AND ng.id_group=0))',
+                AND (nu.id_user="%s" OR up.id_usuario="%s" OR ng.id_group=0)',
         $config['id_user'],
         $id_message,
         $config['id_user'],
diff --git a/pandora_console/operation/messages/message_edit.php b/pandora_console/operation/messages/message_edit.php
index 6c100d7c00..f116e6609d 100644
--- a/pandora_console/operation/messages/message_edit.php
+++ b/pandora_console/operation/messages/message_edit.php
@@ -106,7 +106,12 @@ if ($read_message) {
         $dst_name = $message['id_usuario_destino'];
     }
 
-    echo '<h1>Conversation with '.$user_name.'</h1>';
+    if (isset($user_name) !== true || empty($user_name) === true) {
+        echo '<h1>Notification</h1>';
+    } else {
+        echo '<h1>Conversation with '.$user_name.'</h1>';
+    }
+
     echo '<h2>Subject: '.$message['subject'].'</h2>';
 
     $conversation = [];