diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d15ccbe548..8808102498 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3710,6 +3710,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>EmotesUseItalic</key>
+    <map>
+      <key>Comment</key>
+      <string>Chat emotes are emphasized by using italic font style.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>EnableGrab</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index accceeb97f..a3073d73c8 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -829,7 +829,10 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 	if (irc_me || chat.mChatStyle == CHAT_STYLE_IRC)
 	{
 		delimiter = LLStringUtil::null;
-		style_params.font.style = "ITALIC";
+
+		// italics for emotes -Zi
+		if(gSavedSettings.getBOOL("EmotesUseItalic"))
+			style_params.font.style = "ITALIC";
 	}
 
 	bool message_from_log = chat.mChatStyle == CHAT_STYLE_HISTORY;
@@ -843,7 +846,8 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 	// Bold group moderators' chat -KC 
 	if (chat.mChatStyle == CHAT_STYLE_MODERATOR)
 	{
-		style_params.font.style = irc_me ? "ITALICBOLD" : "BOLD";
+		// italics for emotes -Zi
+		style_params.font.style = (irc_me && gSavedSettings.getBOOL("EmotesUseItalic")) ? "ITALICBOLD" : "BOLD";
 	}
 
 	if (use_plain_text_chat_history)
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 94020dc5b2..aa18448f31 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -157,7 +157,9 @@ void LLNearbyChatToastPanel::addMessage(LLSD& notification)
 
 		if(notification["chat_style"].asInteger()== CHAT_STYLE_IRC)
 		{
-			style_params.font.style = "ITALIC";
+			// italics for emotes -Zi
+			if(gSavedSettings.getBOOL("EmotesUseItalic"))
+				style_params.font.style = "ITALIC";
 		}
 		else if( chat_type == CHAT_TYPE_SHOUT)
 		{
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
index e0cb200ef5..a5f8b52f60 100644
--- a/indra/newview/lltoastimpanel.cpp
+++ b/indra/newview/lltoastimpanel.cpp
@@ -37,6 +37,7 @@
 #include "lltooltip.h"
 
 #include "llviewerchat.h"
+#include "llviewercontrol.h"
 
 const S32 LLToastIMPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT	= 6;
 
@@ -69,10 +70,14 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notif
 		//style_params.font.style = "UNDERLINE";
 		mMessage->clear();
 		
-		style_params.font.style ="ITALIC";
+		// italics for emotes -Zi
+		if(gSavedSettings.getBOOL("EmotesUseItalic"))
+			style_params.font.style ="ITALIC";
 		mMessage->appendText(p.from, FALSE, style_params);
 
-		style_params.font.style = "ITALIC";
+		// italics for emotes -Zi
+		if(gSavedSettings.getBOOL("EmotesUseItalic"))
+			style_params.font.style = "ITALIC";		//  why is this here twice? -Zi
 		mMessage->appendText(p.message.substr(3), FALSE, style_params);
 	}
 	else
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 28f33b9d3c..13910cbc0e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -447,6 +447,14 @@
 			 left="30"
 			 height="20"
 			 width="400" />
+			<check_box
+			 control_name="EmotesUseItalic"
+			 name="EmotesUseItalic"
+			 label="Emotes use italic font"
+			 layout="topleft"
+			 top_pad="0"
+			 height="20"
+			 width="400" />
 			<check_box
 			 control_name="AutoCloseOOC"
 			 name="AutoCloseOOC"