diff --git a/bigbluebutton-client/branding/default/style/css/V2Theme.css b/bigbluebutton-client/branding/default/style/css/V2Theme.css
index 56925f8e1786be854c061c86ce7fda960b510645..99e8815333120669ee0e9323368779531d3bc537 100755
--- a/bigbluebutton-client/branding/default/style/css/V2Theme.css
+++ b/bigbluebutton-client/branding/default/style/css/V2Theme.css
@@ -645,6 +645,10 @@ chat|AddChatTabBox {
 	fontSize : 14;
 }
 
+chat|ChatMessageRenderer {
+	moderatorIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Chat_Moderator");
+}
+
 .chatMessageListStyle {
 	borderStyle    : none;
 	rollOverColor  : #FFFFFF;
diff --git a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
index a1cb5348e425f63b7c2a74c03d691eab535632bd..cbb251fff010ab63527aec50062f1b17dde243ed 100644
Binary files a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla and b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla differ
diff --git a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
index 20753bf1c5a36bfd8b76a3225bd6a12db7183be4..782dcfd94ff90ffe34ded77a5e3c87bae8d750e3 100644
Binary files a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf and b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
index 1e38bf8ac26a2897f66e08f10e921cfbd600a1b7..b8ca99fb89258dcd98fed20957fc43ba1b40be4b 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
@@ -66,7 +66,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				hbHeader.includeInLayout = hbHeader.visible = lblName.visible || lblTime.visible;
 				
 				if (data.hasOwnProperty("senderId") && UsersUtil.getUser(data.senderId) && UsersUtil.getUser(data.senderId).role == Role.MODERATOR) {
-					hbHeader.styleName = "chatMessageHeaderModerator"
+					hbHeader.styleName = "chatMessageHeaderModerator";
+					if (lblName.visible) {
+						moderatorIcon.visible = true;
+					}
 				}
 				
 				// If you remove this some of the chat messages will fail to render
@@ -83,9 +86,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	</fx:Script>
 	
   <mx:Canvas width="100%" id="hbHeader" styleName="chatMessageHeader" verticalScrollPolicy="off" horizontalScrollPolicy="off">
-    <mx:Label id="lblName" text="{data.name}" visible="true" textAlign="left" left="0" width="{this.width - lblTime.width - 22}"/>
+    <mx:Label id="lblName" text="{data.name}" visible="true" verticalCenter="0" textAlign="left" left="0" maxWidth="{this.width - lblTime.width - moderatorIcon.width - 22}"/>
+	<mx:Image id="moderatorIcon" visible="false" source="{getStyle('moderatorIcon')}" x="{lblName.width + 4}" verticalCenter="0"/>
     <mx:Text id="lblTime" htmlText="{data.time}" textAlign="right"
-             visible="true" 
+			 verticalCenter="0"
+             visible="true"
              right="4" />
   </mx:Canvas>
   <mx:Text id="txtMessage" htmlText="{data.text}" link="onLinkClick(event)" color="{data.senderColor}"