diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index af785a072d8170ee1aec6c0cfae2a33690388fb7..925e7ee9200d58c851caa12d1277bfd0b63febec 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -101,6 +101,8 @@
 				<target-player>10.0.0</target-player>
 				<source-path path-element="locale/{locale}"/>
 				<include-resource-bundles>bbbResources</include-resource-bundles>
+				<include-resource-bundles>core</include-resource-bundles>
+				<include-resource-bundles>controls</include-resource-bundles>
 				<source-path path-element="${FLEX_HOME}/frameworks"/>
 			</mxmlc>
 		</sequential>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/LabelTruncate.as b/bigbluebutton-client/src/org/bigbluebutton/common/LabelTruncate.as
deleted file mode 100755
index 8fcc7bafdc149a290d338696ec520a1a6b1a5c71..0000000000000000000000000000000000000000
--- a/bigbluebutton-client/src/org/bigbluebutton/common/LabelTruncate.as
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bigbluebutton.common
-{
-	import mx.controls.Label;
-
-	/**
-	 * An extension for mx.controls.Label to truncate the text and show
-	 * a tooltip with the full-length content. This sub-class is meant to be
-	 * used when the regular truncateToFit does result in a "null" appendix
-	 * on the string instead of the "...". In order for this to work, I used
-	 * the following parameters in my mxml: 
-	 * 
-	 *  - truncateToFit = false
-	 *  - maxWidth = set
-	 *  - width = set
-	 * 
-	 * 
-	 * @author Tomi Niittumäki // Feijk Industries 2010
-	 * @NOTE: Feel free to use! :)
-	 */
-	public class LabelTruncate extends Label{
-		
-		// define the truncation indicator eg. ...(more) etc.
-		private const TRUNCATION_INDICATOR:String = new String("...");
-		
-		/**
-		 * Constructor
-		 */
-		public function LabelTruncate(){
-			super();
-		}
-		
-		/**
-		 * The overriding method, which forces the textField to truncate
-		 * its content with the method truncateToFit(truncationIndicator:String)
-		 * and then supers the tooltip to be the original full-length text.
-		 */
-		override protected function updateDisplayList(unscaledWidth:Number, 
-													  unscaledHeight:Number):void{
-			super.updateDisplayList(unscaledWidth, unscaledHeight);
-			//trace("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!: "+textField.text);
-			textField.truncateToFit(TRUNCATION_INDICATOR);
-			super.toolTip = text;
-		}
-		
-	}
-}
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/components/ChatMessageRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/components/ChatMessageRenderer.mxml
index cd633c04d88a7fcf204746f469f1202b616ba486..45b87212e682dddedf8289bd3de02ba2eeef0c1a 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/components/ChatMessageRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/components/ChatMessageRenderer.mxml
@@ -38,7 +38,7 @@
 		]]>
 	</mx:Script>
 	
-	<common:LabelTruncate maxWidth="50" width="50" truncateToFit="false" id="lblName" text="{data.name}" visible="{!(data.name == data.lastSenderName)}" color="gray" />
+	<mx:Label maxWidth="50" width="50" truncateToFit="true" id="lblName" text="{data.name}" visible="{!(data.name == data.lastSenderName)}" color="gray" />
 	<mx:Text id="txtMessage" htmlText="{rolledOver ? data.senderText : data.text}" link="onLinkClick(event)" color="{data.color}"
 			 rollOver="onRollOver()" rollOut="onRollOut()" width="100%" />
 	<mx:Label id="lblTime" text="{rolledOver ? data.senderTime : data.time}" visible="{!(data.lastTime == data.time) || !(data.name == data.lastSenderName)}" color="gray" />
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/components/ChatWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/components/ChatWindow.mxml
index 3196caed31e18e03292e3b9c4d6b6a395b75eed3..bcaf97db509939b3c88aa7fc47fdbf46630c5545 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/components/ChatWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/components/ChatWindow.mxml
@@ -34,6 +34,8 @@
 			
 			import mx.controls.Alert;
 			import mx.core.Application;
+			import mx.resources.ResourceBundle;
+			import mx.resources.ResourceManager;
 			
 			import org.bigbluebutton.main.views.MainCanvas;
 			import org.bigbluebutton.util.i18n.ResourceUtil;
@@ -51,6 +53,11 @@
 				/* Set up full screen handler. */
 				Application.application.stage.addEventListener(FullScreenEvent.FULL_SCREEN, fullScreenHandler);
 				dispState = Application.application.stage.displayState;
+				
+				/*var r:ResourceBundle = new ResourceBundle("fr_FR", "core");
+				r.content["truncationIndicator"] = '...';
+				resourceManager.addResourceBundle(r);
+				resourceManager.update();*/
 			}
 			
 			private function fullScreenHandler(evt:FullScreenEvent):void {