diff --git a/doc/contributions.txt b/doc/contributions.txt
index 0954704c262dcf73e470909cc1b7bc57e537fdf6..4e6c662e4f5f7c996474b79bc4a450f9d741ad1e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -370,8 +370,9 @@ Jonathan Yap
 	STORM-679
 	STORM-737
 	STORM-726
-	VWR-17801
 	STORM-785
+	STORM-829
+	VWR-17801
 Kage Pixel
 	VWR-11
 Ken March
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 7dc5d96689d4449471ee7a736ca676137f444bf4..7f7855c08c2daca7f9d08042cc3849d57cb97fbf 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2746,6 +2746,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				LLSD args;
 				args["slurl"] = location;
 				args["type"] = LLNotificationsUI::NT_NEARBYCHAT;
+
+				// Look for IRC-style emotes here so object name formatting is correct
+				std::string prefix = message.substr(0, 4);
+				if (prefix == "/me " || prefix == "/me'")
+				{
+					chat.mChatStyle = CHAT_STYLE_IRC;
+				}
+
 				LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
 			}