diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
index f28be82565f0565f81c45855fadefdb7f8980659..e58bdc3b484467228fba2570d97cb98b4af3a7d6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
@@ -45,15 +45,6 @@
 			
 			private function init():void{
 				participants = new ArrayCollection();
-				
-				var langCode:String = (ExternalInterface.call('getLanguage') as String);
-				if (langCode == null) return;
-				
-				var language:String = langCode.split("_")[0];
-				if (langCodes.indexOf(language) != -1){
-					langComboBox.selectedIndex = langCodes.indexOf(language);
-					changeLanguage();
-				} 
 			}
 
 
@@ -76,7 +67,7 @@
 			}
 			
 			private function toggleTranslation():void {
-				var e:ChatOptionsEvent=new ChatOptionsEvent(ChatOptionsEvent.TOGGLE_TRANSLATE);	
+				var e:ChatOptionsEvent = new ChatOptionsEvent(ChatOptionsEvent.TOGGLE_TRANSLATE);	
 				e.translateOn = autoTransCheckBox.selected;
 				dispatchEvent(e);
 			}
@@ -95,12 +86,7 @@
 			
 			override protected function resourcesChanged():void{
 				super.resourcesChanged();
-				
-				var language:String = ResourceUtil.getInstance().getCurrentLanguageCode().split("_")[0];
-				if ((langCodes.indexOf(language) != -1) && (langComboBox != null)){
-					langComboBox.selectedIndex = langCodes.indexOf(language);
-					changeLanguage();
-				} 
+//				ResourceUtil.getInstance().setPreferredLocale(ResourceUtil.getInstance().getLocaleCodeForIndex(langComboBox.selectedIndex)); 
 			}
 			
 		]]>
@@ -118,7 +104,7 @@
 				<mx:Label text="{ResourceUtil.getInstance().getString('bbb.chat.fontSize')}" />
 				<mx:ComboBox width="60" id="cmbFontSize" dataProvider="{fontSizes}" close="changeFontSize()" selectedIndex="1" />
 			</mx:HBox>
-			<mx:ComboBox id="langComboBox" dataProvider="{this.langNames}" selectedIndex="12"  change="changeLanguage()" rowCount="15" />
+			<mx:ComboBox id="langComboBox" dataProvider="{this.langNames}" selectedIndex="{ResourceUtil.getInstance().localeIndex}"  change="changeLanguage()" rowCount="15" />
 			<mx:CheckBox id="autoTransCheckBox" selected="false" label="AutoTranslate" toolTip="Auto detect language and translate" change="toggleTranslation()"/>
 		</mx:VBox>
 	</mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
index 5379a9ef7787f5f87e7efc3af48ddaa63940937b..3f2a6e74e9ad1674d4309c8fdd8aa178bcc11560 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
@@ -32,8 +32,7 @@
 			import org.bigbluebutton.modules.chat.model.ChatMessage;
 			import mx.collections.ArrayCollection;
 			import mx.controls.Button;
-			import mx.core.ScrollPolicy;
-			
+			import mx.core.ScrollPolicy;			
 			import org.bigbluebutton.modules.chat.events.ChatOptionsEvent;
 			import org.bigbluebutton.modules.chat.views.ChatMessageRenderer;
 			
@@ -48,10 +47,8 @@
 			private var lastTime:String = "";
 			
 			[Bindable] private var messages:ArrayCollection = new ArrayCollection();
-			private var lastCount:Number = 0;
-			
-			private var scrollTimer:Timer;
-			
+			private var lastCount:Number = 0;			
+			private var scrollTimer:Timer;			
 			private var scrollBarWorkaround:Boolean = false;
 			
 			private function onCreationComplete():void {