diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
index afe3de7655..7e86bdac79 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
@@ -107,14 +107,14 @@ package org.bigbluebutton.modules.chat.services
         welcomeMsg.toUserID = SPACE;
         welcomeMsg.toUsername = SPACE;
         welcomeMsg.message = welcome;
-        
+        
         var welcomeMsgEvent:PublicChatMessageEvent = new PublicChatMessageEvent(PublicChatMessageEvent.PUBLIC_CHAT_MESSAGE_EVENT);
         welcomeMsgEvent.message = welcomeMsg;
         welcomeMsgEvent.history = false;
         dispatcher.dispatchEvent(welcomeMsgEvent);
         
         //Say that client is ready when sending the welcome message
-        ExternalInterface.call("clientReady", ResourceUtil.getInstance().getString('bbb.accessibility.clientReady'));
+        ExternalInterface.call("clientReady", ResourceUtil.getInstance().getString('bbb.accessibility.clientReady'));
       }	
       
       if (UsersUtil.amIModerator()) {
@@ -129,11 +129,11 @@ package org.bigbluebutton.modules.chat.services
           moderatorOnlyMsg.toUserID = SPACE;
           moderatorOnlyMsg.toUsername = SPACE;
           moderatorOnlyMsg.message = MeetingModel.getInstance().modOnlyMessage;
-          
+          
           var moderatorOnlyMsgEvent:PublicChatMessageEvent = new PublicChatMessageEvent(PublicChatMessageEvent.PUBLIC_CHAT_MESSAGE_EVENT);
           moderatorOnlyMsgEvent.message = moderatorOnlyMsg;
           moderatorOnlyMsgEvent.history = false;
-          dispatcher.dispatchEvent(moderatorOnlyMsgEvent);
+          dispatcher.dispatchEvent(moderatorOnlyMsgEvent);
         }
       }
     }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageReceiver.as
index caaddeb5b4..bc521461b2 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageReceiver.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageReceiver.as
@@ -83,7 +83,7 @@ package org.bigbluebutton.modules.chat.services
         
     private function handleChatReceivePublicMessageCommand(message:Object, history:Boolean = false):void {
       LOGGER.debug("Handling public chat message [{0}]", [message.message]);
-
+      
       var msg:ChatMessageVO = new ChatMessageVO();
       msg.chatType = message.chatType;
       msg.fromUserID = message.fromUserID;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageSender.as b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageSender.as
index 6dcfcfdd9a..52e1c56c19 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageSender.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageSender.as
@@ -60,7 +60,7 @@ package org.bigbluebutton.modules.chat.services
         message.toObj()
       );
     }
-
+    
     public function sendPrivateMessage(message:ChatMessageVO):void
     {  
 	  LOGGER.debug("Sending [chat.sendPrivateMessage] to server.");
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
index dcb8eff147..babb2adafd 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
@@ -346,7 +346,8 @@
 	<mx:VBox width="100%" height="100%">
 		<components:SharedNotesRichTextEditor width="100%" height="100%" id="richTextEditor" showControlBar="{options.toolbarVisibleByDefault}" dropShadowEnabled="false" headerHeight="0" borderThicknessLeft="0" borderThicknessRight="0" borderThicknessTop="0" borderThicknessBottom="0" minWidth="120" minHeight="100" initialize="initSharedNotesRichTextEditor()"/>
 
-		<mx:HBox width="100%" horizontalAlign="right" paddingTop="0">		<mx:Button id="btnNew" styleName="sharedNotesNewButtonStyle" width="26" height="26" click="btnNew_clickHandler(event)" toolTip="{ResourceUtil.getInstance().getString('bbb.sharedNotes.new.toolTip')}"/>
+		<mx:HBox width="100%" horizontalAlign="right" paddingTop="0">
+			<mx:Button id="btnNew" styleName="sharedNotesNewButtonStyle" width="26" height="26" click="btnNew_clickHandler(event)" toolTip="{ResourceUtil.getInstance().getString('bbb.sharedNotes.new.toolTip')}"/>
 			<mx:Button styleName="sharedNotesFormatButtonStyle" width="26" height="26" click="btnToolbar_clickHandler(event)" toolTip="{ResourceUtil.getInstance().getString('bbb.sharedNotes.toolbar.toolTip')}" visible="{options.showToolbarButton}" includeInLayout="{options.showToolbarButton}"/>
 			<mx:Button id="btnSave" styleName="sharedNotesSaveButtonStyle" width="26" height="26" click="btnSave_clickHandler(event)" toolTip="{ResourceUtil.getInstance().getString('bbb.sharedNotes.save.toolTip')}"/>
 		</mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
index 5a167b3561..e3a44a2902 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
@@ -22,7 +22,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		   width="30" height="30"
 		   click="onClick()" styleName="whiteboardClearButtonStyle"
 		   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.clear')}"
-		   accessibilityName="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.clear.accessibilityName')}">
+		   accessibilityName="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.clear.accessibilityName')}">
 	<mx:Script>
 		<![CDATA[
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;