diff --git a/api/messaging/spec.json b/api/messaging/spec.json
index 9b35c8918..2a0ef48be 100644
--- a/api/messaging/spec.json
+++ b/api/messaging/spec.json
@@ -429,6 +429,7 @@
                             "type": "string",
                             "name": "message",
                             "required": true,
+                            "sensitive": true,
                             "title": "Message contents (markdown)"
                         }
                     ]
@@ -506,6 +507,7 @@
                             "type": "string",
                             "name": "message",
                             "required": true,
+                            "sensitive": true,
                             "title": "Message contents (markdown)"
                         }
                     ]
@@ -546,6 +548,7 @@
                             "type": "string",
                             "name": "message",
                             "required": true,
+                            "sensitive": true,
                             "title": "Message contents (markdown)"
                         }
                     ]
@@ -1224,4 +1227,4 @@
             }
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/api/messaging/spec/message.json b/api/messaging/spec/message.json
index 822983bc3..7a91bd5d1 100644
--- a/api/messaging/spec/message.json
+++ b/api/messaging/spec/message.json
@@ -29,6 +29,7 @@
           {
             "name": "message",
             "required": true,
+            "sensitive": true,
             "title": "Message contents (markdown)",
             "type": "string"
           }
@@ -106,6 +107,7 @@
           {
             "name": "message",
             "required": true,
+            "sensitive": true,
             "title": "Message contents (markdown)",
             "type": "string"
           }
@@ -146,6 +148,7 @@
           {
             "name": "message",
             "required": true,
+            "sensitive": true,
             "title": "Message contents (markdown)",
             "type": "string"
           }
diff --git a/messaging/rest/request/message.go b/messaging/rest/request/message.go
index 0b122c20e..28daa7a28 100644
--- a/messaging/rest/request/message.go
+++ b/messaging/rest/request/message.go
@@ -43,7 +43,7 @@ func NewMessageCreate() *MessageCreate {
 func (r MessageCreate) Auditable() map[string]interface{} {
 	var out = map[string]interface{}{}
 
-	out["message"] = r.Message
+	out["message"] = "*masked*sensitive*data*"
 
 	out["channelID"] = r.ChannelID
 
@@ -236,7 +236,7 @@ func (r MessageEdit) Auditable() map[string]interface{} {
 
 	out["channelID"] = r.ChannelID
 
-	out["message"] = r.Message
+	out["message"] = "*masked*sensitive*data*"
 
 	return out
 }
@@ -353,7 +353,7 @@ func (r MessageReplyCreate) Auditable() map[string]interface{} {
 
 	out["channelID"] = r.ChannelID
 
-	out["message"] = r.Message
+	out["message"] = "*masked*sensitive*data*"
 
 	return out
 }