diff --git a/src/Discord.Net/Rest/Entities/Message.cs b/src/Discord.Net/Rest/Entities/Message.cs
index 25f2f64d8..a037a0202 100644
--- a/src/Discord.Net/Rest/Entities/Message.cs
+++ b/src/Discord.Net/Rest/Entities/Message.cs
@@ -142,7 +142,7 @@ namespace Discord.Rest
         }
 
         public override string ToString() => Text;
-        private string DebuggerDisplay => $"{Author}: {Text}";
+        private string DebuggerDisplay => $"{Author}: {Text}{(Attachments.Count > 0 ? $" [{Attachments.Count} Attachments]" : "")}";
 
         IUser IMessage.Author => Author;
         IReadOnlyList<Attachment> IMessage.Attachments => Attachments;
diff --git a/src/Discord.Net/WebSocket/Entities/Message.cs b/src/Discord.Net/WebSocket/Entities/Message.cs
index e55160415..8a22828fe 100644
--- a/src/Discord.Net/WebSocket/Entities/Message.cs
+++ b/src/Discord.Net/WebSocket/Entities/Message.cs
@@ -140,7 +140,7 @@ namespace Discord.WebSocket
         }
 
         public override string ToString() => Text;
-        private string DebuggerDisplay => $"{Author}: {Text}";
+        private string DebuggerDisplay => $"{Author}: {Text}{(Attachments.Count > 0 ? $" [{Attachments.Count} Attachments]" : "")}";
 
         IUser IMessage.Author => Author;
         IReadOnlyList<Attachment> IMessage.Attachments => Attachments;