diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index fa8f56f809..8037dd7623 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -1299,8 +1299,8 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		}
 
 		bool is_trusted = isContentTrusted();
-		setContentTrusted(chat.mFromID.isNull()); // <FS:Ansariel> Set trusted content temporarily for system messages
-		setPlainText(use_plain_text_chat_history ? chat.mFromID.notNull() : false);
+		setContentTrusted(chat.mFromID.isNull() && is_p2p); // <FS:Ansariel> Set trusted content temporarily for system messages
+		setPlainText(use_plain_text_chat_history ? (chat.mFromID.notNull() && is_p2p) : false);
 		appendText(message, prependNewLineState, body_message_params);	// <FS:Zi> FIRE-8600: TAB out of chat history
 		setContentTrusted(is_trusted);
 		setPlainText(use_plain_text_chat_history);