diff --git a/bigbluebutton-client/branding/default/style/css/BBBDefault.css b/bigbluebutton-client/branding/default/style/css/BBBDefault.css
index a0b514a76a..25eaf44f81 100755
--- a/bigbluebutton-client/branding/default/style/css/BBBDefault.css
+++ b/bigbluebutton-client/branding/default/style/css/BBBDefault.css
@@ -451,17 +451,26 @@ DataGrid {
 
 }
 
-.presentationUploadFileFormatHintBoxStyle, .desktopShareUsingChromeOnMacHintBoxStyle {
+.presentationUploadFileFormatHintBoxStyle {
 	backgroundColor: #D4D4D4;
 	dropShadowEnabled: false;
 	paddingLeft: 10;
 	paddingRight: 10
 }
 
-.presentationUploadFileFormatHintTextStyle, .desktopShareUsingChromeOnMacHintTextStyle {
+.presentationUploadFileFormatHintTextStyle {
 	fontWeight: bold;
 }
 
+.desktopShareTextStyle {
+	fontSize:	11;
+	fontWeight:	bold;	
+}
+
+.chromeJavaHelpImage {
+	imageSource: Embed(source='assets/images/chromePluginBlocked.png');
+}
+
 .cameraDisplaySettingsWindowStyle {
   borderColor: #b9babc;
   borderAlpha: 1;
diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/chromePluginBlocked.png b/bigbluebutton-client/branding/default/style/css/assets/images/chromePluginBlocked.png
new file mode 100755
index 0000000000..5631ba46a3
Binary files /dev/null and b/bigbluebutton-client/branding/default/style/css/assets/images/chromePluginBlocked.png differ
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 3bffd61c65..dc491e945d 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -105,6 +105,10 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
+bbb.clientstatus.java.title = Java
+bbb.clientstatus.java.notdetected = Java version not detected.
+bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color='#0a4a7a'><a href='http://www.java.com/download/' target='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
+bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color='#0a4a7a'><a href='http://www.java.com/download/' target='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -265,10 +269,9 @@ bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently
 bbb.desktopPublish.minimizeBtn.toolTip = Minimize
 bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
 bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run.
-bbb.desktopPublish.javaTestLinkLabel = Test Java 
-bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Your Java Version
-bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Your Java Version
+bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
+bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
+bbb.desktopPublish.chromeHint.button = Retry
 bbb.desktopView.title = Desktop Sharing
 bbb.desktopView.fitToWindow = Fit to Window
 bbb.desktopView.actualSize = Display actual size
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index 0603d44b31..fb8bd184d0 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -10,7 +10,7 @@
     <language userSelectionEnabled="true" />
     <skinning enabled="true" url="http://HOST/client/branding/css/BBBDefault.css.swf" />
     <shortcutKeys showButton="true" />
-    <browserVersions chrome="CHROME_VERSION" firefox="FIREFOX_VERSION" flash="FLASH_VERSION" />
+    <browserVersions chrome="CHROME_VERSION" firefox="FIREFOX_VERSION" flash="FLASH_VERSION" java="1.7.0_51" />
     <layout showLogButton="false" showVideoLayout="false" showResetLayout="true" defaultLayout="bbb.layout.name.defaultlayout"
             showToolbar="true" showFooter="true" showMeetingName="true" showHelpButton="true" 
             showLogoutWindow="true" showLayoutTools="true" showNetworkMonitor="false" confirmLogout="true"
@@ -40,7 +40,7 @@
 
 		
 		<module name="DeskShareModule" 
-			url="http://HOST/client/DeskShareModule.swf?v=4105" 
+			url="http://HOST/client/DeskShareModule.swf?v=VERSION" 
 			uri="rtmp://HOST/deskShare"
 			showButton="true"
 			autoStart="false"
diff --git a/bigbluebutton-client/resources/prod/BigBlueButton.html b/bigbluebutton-client/resources/prod/BigBlueButton.html
index 6ca9bf4acb..2298798ffe 100755
--- a/bigbluebutton-client/resources/prod/BigBlueButton.html
+++ b/bigbluebutton-client/resources/prod/BigBlueButton.html
@@ -17,9 +17,14 @@
         width: 1px !important;
         overflow: hidden;
       }
+      
+      #deployJavaPlugin {
+        display : none;
+      }
     </style>
     
     <script type="text/javascript" src="swfobject/swfobject.js"></script>
+    <script src="lib/deployJava.js?v=VERSION" language="javascript"></script>
     <script type="text/javascript">
       //swfobject.registerObject("BigBlueButton", "11", "expressInstall.swf");
       var flashvars = {};
diff --git a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
old mode 100644
new mode 100755
index badfb49767..210d8ef042
Binary files a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar and b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar differ
diff --git a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
old mode 100644
new mode 100755
index 2d968e9836..c09b0eeff2
Binary files a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar and b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar differ
diff --git a/bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js b/bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
index b446bc6afb..919689122f 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
@@ -559,7 +559,14 @@
         swfObj.webRTCWebcamRequestFail(reason);
       }
     }
-            
+    
+    BBB.javaAppletLaunched = function() {
+      var swfObj = getSwfObj();
+      if (swfObj) {
+        swfObj.javaAppletLaunched();
+      }
+    }
+    
     // Third-party JS apps should use this to query if the BBB SWF file is ready to handle calls.
     BBB.isSwfClientReady = function() {
       return swfReady;
diff --git a/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js b/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
index 19e056ea1e..520f5bface 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
@@ -41,7 +41,6 @@ function stopApplet(){
         removeFrame();
 }
 
-function checkForJava(){
-//      if (navigator.javaEnabled() || window.navigator.javaEnabled())
-                return 1;
+function appletStartupCallback() {
+        BBB.javaAppletLaunched();
 }
diff --git a/bigbluebutton-client/resources/prod/lib/deployJava.js b/bigbluebutton-client/resources/prod/lib/deployJava.js
new file mode 100755
index 0000000000..7d06cb5ca1
--- /dev/null
+++ b/bigbluebutton-client/resources/prod/lib/deployJava.js
@@ -0,0 +1,2 @@
+/* Copy of the file found at http://www.java.com/js/deployJava.js - January 18, 2015 */
+var deployJava=function(){var l={core:["id","class","title","style"],i18n:["lang","dir"],events:["onclick","ondblclick","onmousedown","onmouseup","onmouseover","onmousemove","onmouseout","onkeypress","onkeydown","onkeyup"],applet:["codebase","code","name","archive","object","width","height","alt","align","hspace","vspace"],object:["classid","codebase","codetype","data","type","archive","declare","standby","height","width","usemap","name","tabindex","align","border","hspace","vspace"]};var b=l.object.concat(l.core,l.i18n,l.events);var m=l.applet.concat(l.core);function g(o){if(!d.debug){return}if(console.log){console.log(o)}else{alert(o)}}function k(p,o){if(p==null||p.length==0){return true}var r=p.charAt(p.length-1);if(r!="+"&&r!="*"&&(p.indexOf("_")!=-1&&r!="_")){p=p+"*";r="*"}p=p.substring(0,p.length-1);if(p.length>0){var q=p.charAt(p.length-1);if(q=="."||q=="_"){p=p.substring(0,p.length-1)}}if(r=="*"){return(o.indexOf(p)==0)}else{if(r=="+"){return p<=o}}return false}function e(){var o="//java.com/js/webstart.png";try{return document.location.protocol.indexOf("http")!=-1?o:"http:"+o}catch(p){return"http:"+o}}function n(p){var o="http://java.com/dt-redirect";if(p==null||p.length==0){return o}if(p.charAt(0)=="&"){p=p.substring(1,p.length)}return o+"?"+p}function j(q,p){var o=q.length;for(var r=0;r<o;r++){if(q[r]===p){return true}}return false}function c(o){return j(m,o.toLowerCase())}function i(o){return j(b,o.toLowerCase())}function a(o){if("MSIE"!=deployJava.browserName){return true}if(deployJava.compareVersionToPattern(deployJava.getPlugin().version,["10","0","0"],false,true)){return true}if(o==null){return false}return !k("1.6.0_33+",o)}var d={debug:null,version:"20120801",firefoxJavaVersion:null,myInterval:null,preInstallJREList:null,returnPage:null,brand:null,locale:null,installType:null,EAInstallEnabled:false,EarlyAccessURL:null,oldMimeType:"application/npruntime-scriptable-plugin;DeploymentToolkit",mimeType:"application/java-deployment-toolkit",launchButtonPNG:e(),browserName:null,browserName2:null,getJREs:function(){var t=new Array();if(this.isPluginInstalled()){var r=this.getPlugin();var o=r.jvms;for(var q=0;q<o.getLength();q++){t[q]=o.get(q).version}}else{var p=this.getBrowser();if(p=="MSIE"){if(this.testUsingActiveX("1.7.0")){t[0]="1.7.0"}else{if(this.testUsingActiveX("1.6.0")){t[0]="1.6.0"}else{if(this.testUsingActiveX("1.5.0")){t[0]="1.5.0"}else{if(this.testUsingActiveX("1.4.2")){t[0]="1.4.2"}else{if(this.testForMSVM()){t[0]="1.1"}}}}}}else{if(p=="Netscape Family"){this.getJPIVersionUsingMimeType();if(this.firefoxJavaVersion!=null){t[0]=this.firefoxJavaVersion}else{if(this.testUsingMimeTypes("1.7")){t[0]="1.7.0"}else{if(this.testUsingMimeTypes("1.6")){t[0]="1.6.0"}else{if(this.testUsingMimeTypes("1.5")){t[0]="1.5.0"}else{if(this.testUsingMimeTypes("1.4.2")){t[0]="1.4.2"}else{if(this.browserName2=="Safari"){if(this.testUsingPluginsArray("1.7.0")){t[0]="1.7.0"}else{if(this.testUsingPluginsArray("1.6")){t[0]="1.6.0"}else{if(this.testUsingPluginsArray("1.5")){t[0]="1.5.0"}else{if(this.testUsingPluginsArray("1.4.2")){t[0]="1.4.2"}}}}}}}}}}}}}if(this.debug){for(var q=0;q<t.length;++q){g("[getJREs()] We claim to have detected Java SE "+t[q])}}return t},installJRE:function(r,p){var o=false;if(this.isPluginInstalled()&&this.isAutoInstallEnabled(r)){var q=false;if(this.isCallbackSupported()){q=this.getPlugin().installJRE(r,p)}else{q=this.getPlugin().installJRE(r)}if(q){this.refresh();if(this.returnPage!=null){document.location=this.returnPage}}return q}else{return this.installLatestJRE()}},isAutoInstallEnabled:function(o){if(!this.isPluginInstalled()){return false}if(typeof o=="undefined"){o=null}return a(o)},isCallbackSupported:function(){return this.isPluginInstalled()&&this.compareVersionToPattern(this.getPlugin().version,["10","2","0"],false,true)},installLatestJRE:function(q){if(this.isPluginInstalled()&&this.isAutoInstallEnabled()){var r=false;if(this.isCallbackSupported()){r=this.getPlugin().installLatestJRE(q)}else{r=this.getPlugin().installLatestJRE()}if(r){this.refresh();if(this.returnPage!=null){document.location=this.returnPage}}return r}else{var p=this.getBrowser();var o=navigator.platform.toLowerCase();if((this.EAInstallEnabled=="true")&&(o.indexOf("win")!=-1)&&(this.EarlyAccessURL!=null)){this.preInstallJREList=this.getJREs();if(this.returnPage!=null){this.myInterval=setInterval("deployJava.poll()",3000)}location.href=this.EarlyAccessURL;return false}else{if(p=="MSIE"){return this.IEInstall()}else{if((p=="Netscape Family")&&(o.indexOf("win32")!=-1)){return this.FFInstall()}else{location.href=n(((this.returnPage!=null)?("&returnPage="+this.returnPage):"")+((this.locale!=null)?("&locale="+this.locale):"")+((this.brand!=null)?("&brand="+this.brand):""))}}return false}}},runApplet:function(p,u,r){if(r=="undefined"||r==null){r="1.1"}var t="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";var o=r.match(t);if(this.returnPage==null){this.returnPage=document.location}if(o!=null){var q=this.getBrowser();if(q!="?"){if(this.versionCheck(r+"+")){this.writeAppletTag(p,u)}else{if(this.installJRE(r+"+")){this.refresh();location.href=document.location;this.writeAppletTag(p,u)}}}else{this.writeAppletTag(p,u)}}else{g("[runApplet()] Invalid minimumVersion argument to runApplet():"+r)}},writeAppletTag:function(r,w){var o="<"+"applet ";var q="";var t="<"+"/"+"applet"+">";var x=true;if(null==w||typeof w!="object"){w=new Object()}for(var p in r){if(!c(p)){w[p]=r[p]}else{o+=(" "+p+'="'+r[p]+'"');if(p=="code"){x=false}}}var v=false;for(var u in w){if(u=="codebase_lookup"){v=true}if(u=="object"||u=="java_object"||u=="java_code"){x=false}q+='<param name="'+u+'" value="'+w[u]+'"/>'}if(!v){q+='<param name="codebase_lookup" value="false"/>'}if(x){o+=(' code="dummy"')}o+=">";document.write(o+"\n"+q+"\n"+t)},versionCheck:function(p){var v=0;var x="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?(\\*|\\+)?$";var y=p.match(x);if(y!=null){var r=false;var u=false;var q=new Array();for(var t=1;t<y.length;++t){if((typeof y[t]=="string")&&(y[t]!="")){q[v]=y[t];v++}}if(q[q.length-1]=="+"){u=true;r=false;q.length--}else{if(q[q.length-1]=="*"){u=false;r=true;q.length--}else{if(q.length<4){u=false;r=true}}}var w=this.getJREs();for(var t=0;t<w.length;++t){if(this.compareVersionToPattern(w[t],q,r,u)){return true}}return false}else{var o="Invalid versionPattern passed to versionCheck: "+p;g("[versionCheck()] "+o);alert(o);return false}},isWebStartInstalled:function(r){var q=this.getBrowser();if(q=="?"){return true}if(r=="undefined"||r==null){r="1.4.2"}var p=false;var t="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";var o=r.match(t);if(o!=null){p=this.versionCheck(r+"+")}else{g("[isWebStartInstaller()] Invalid minimumVersion argument to isWebStartInstalled(): "+r);p=this.versionCheck("1.4.2+")}return p},getJPIVersionUsingMimeType:function(){for(var p=0;p<navigator.mimeTypes.length;++p){var q=navigator.mimeTypes[p].type;var o=q.match(/^application\/x-java-applet;jpi-version=(.*)$/);if(o!=null){this.firefoxJavaVersion=o[1];if("Opera"!=this.browserName2){break}}}},launchWebStartApplication:function(r){var o=navigator.userAgent.toLowerCase();this.getJPIVersionUsingMimeType();if(this.isWebStartInstalled("1.7.0")==false){if((this.installJRE("1.7.0+")==false)||((this.isWebStartInstalled("1.7.0")==false))){return false}}var u=null;if(document.documentURI){u=document.documentURI}if(u==null){u=document.URL}var p=this.getBrowser();var q;if(p=="MSIE"){q="<"+'object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" '+'width="0" height="0">'+"<"+'PARAM name="launchjnlp" value="'+r+'"'+">"+"<"+'PARAM name="docbase" value="'+u+'"'+">"+"<"+"/"+"object"+">"}else{if(p=="Netscape Family"){q="<"+'embed type="application/x-java-applet;jpi-version='+this.firefoxJavaVersion+'" '+'width="0" height="0" '+'launchjnlp="'+r+'"'+'docbase="'+u+'"'+" />"}}if(document.body=="undefined"||document.body==null){document.write(q);document.location=u}else{var t=document.createElement("div");t.id="div1";t.style.position="relative";t.style.left="-10000px";t.style.margin="0px auto";t.className="dynamicDiv";t.innerHTML=q;document.body.appendChild(t)}},createWebStartLaunchButtonEx:function(q,p){if(this.returnPage==null){this.returnPage=q}var o="javascript:deployJava.launchWebStartApplication('"+q+"');";document.write("<"+'a href="'+o+"\" onMouseOver=\"window.status=''; "+'return true;"><'+"img "+'src="'+this.launchButtonPNG+'" '+'border="0" /><'+"/"+"a"+">")},createWebStartLaunchButton:function(q,p){if(this.returnPage==null){this.returnPage=q}var o="javascript:"+"if (!deployJava.isWebStartInstalled(&quot;"+p+"&quot;)) {"+"if (deployJava.installLatestJRE()) {"+"if (deployJava.launch(&quot;"+q+"&quot;)) {}"+"}"+"} else {"+"if (deployJava.launch(&quot;"+q+"&quot;)) {}"+"}";document.write("<"+'a href="'+o+"\" onMouseOver=\"window.status=''; "+'return true;"><'+"img "+'src="'+this.launchButtonPNG+'" '+'border="0" /><'+"/"+"a"+">")},launch:function(o){document.location=o;return true},isPluginInstalled:function(){var o=this.getPlugin();if(o&&o.jvms){return true}else{return false}},isAutoUpdateEnabled:function(){if(this.isPluginInstalled()){return this.getPlugin().isAutoUpdateEnabled()}return false},setAutoUpdateEnabled:function(){if(this.isPluginInstalled()){return this.getPlugin().setAutoUpdateEnabled()}return false},setInstallerType:function(o){this.installType=o;if(this.isPluginInstalled()){return this.getPlugin().setInstallerType(o)}return false},setAdditionalPackages:function(o){if(this.isPluginInstalled()){return this.getPlugin().setAdditionalPackages(o)}return false},setEarlyAccess:function(o){this.EAInstallEnabled=o},isPlugin2:function(){if(this.isPluginInstalled()){if(this.versionCheck("1.6.0_10+")){try{return this.getPlugin().isPlugin2()}catch(o){}}}return false},allowPlugin:function(){this.getBrowser();var o=("Safari"!=this.browserName2&&"Opera"!=this.browserName2);return o},getPlugin:function(){this.refresh();var o=null;if(this.allowPlugin()){o=document.getElementById("deployJavaPlugin")}return o},compareVersionToPattern:function(v,p,r,t){if(v==undefined||p==undefined){return false}var w="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";var x=v.match(w);if(x!=null){var u=0;var y=new Array();for(var q=1;q<x.length;++q){if((typeof x[q]=="string")&&(x[q]!="")){y[u]=x[q];u++}}var o=Math.min(y.length,p.length);if(t){for(var q=0;q<o;++q){if(y[q]<p[q]){return false}else{if(y[q]>p[q]){return true}}}return true}else{for(var q=0;q<o;++q){if(y[q]!=p[q]){return false}}if(r){return true}else{return(y.length==p.length)}}}else{return false}},getBrowser:function(){if(this.browserName==null){var o=navigator.userAgent.toLowerCase();g("[getBrowser()] navigator.userAgent.toLowerCase() -> "+o);if((o.indexOf("msie")!=-1)&&(o.indexOf("opera")==-1)){this.browserName="MSIE";this.browserName2="MSIE"}else{if(o.indexOf("trident")!=-1||o.indexOf("Trident")!=-1){this.browserName="MSIE";this.browserName2="MSIE"}else{if(o.indexOf("iphone")!=-1){this.browserName="Netscape Family";this.browserName2="iPhone"}else{if((o.indexOf("firefox")!=-1)&&(o.indexOf("opera")==-1)){this.browserName="Netscape Family";this.browserName2="Firefox"}else{if(o.indexOf("chrome")!=-1){this.browserName="Netscape Family";this.browserName2="Chrome"}else{if(o.indexOf("safari")!=-1){this.browserName="Netscape Family";this.browserName2="Safari"}else{if((o.indexOf("mozilla")!=-1)&&(o.indexOf("opera")==-1)){this.browserName="Netscape Family";this.browserName2="Other"}else{if(o.indexOf("opera")!=-1){this.browserName="Netscape Family";this.browserName2="Opera"}else{this.browserName="?";this.browserName2="unknown"}}}}}}}}g("[getBrowser()] Detected browser name:"+this.browserName+", "+this.browserName2)}return this.browserName},testUsingActiveX:function(o){var q="JavaWebStart.isInstalled."+o+".0";if(typeof ActiveXObject=="undefined"||!ActiveXObject){g("[testUsingActiveX()] Browser claims to be IE, but no ActiveXObject object?");return false}try{return(new ActiveXObject(q)!=null)}catch(p){return false}},testForMSVM:function(){var p="{08B0E5C0-4FCB-11CF-AAA5-00401C608500}";if(typeof oClientCaps!="undefined"){var o=oClientCaps.getComponentVersion(p,"ComponentID");if((o=="")||(o=="5,0,5000,0")){return false}else{return true}}else{return false}},testUsingMimeTypes:function(p){if(!navigator.mimeTypes){g("[testUsingMimeTypes()] Browser claims to be Netscape family, but no mimeTypes[] array?");return false}for(var q=0;q<navigator.mimeTypes.length;++q){s=navigator.mimeTypes[q].type;var o=s.match(/^application\/x-java-applet\x3Bversion=(1\.8|1\.7|1\.6|1\.5|1\.4\.2)$/);if(o!=null){if(this.compareVersions(o[1],p)){return true}}}return false},testUsingPluginsArray:function(p){if((!navigator.plugins)||(!navigator.plugins.length)){return false}var o=navigator.platform.toLowerCase();for(var q=0;q<navigator.plugins.length;++q){s=navigator.plugins[q].description;if(s.search(/^Java Switchable Plug-in (Cocoa)/)!=-1){if(this.compareVersions("1.5.0",p)){return true}}else{if(s.search(/^Java/)!=-1){if(o.indexOf("win")!=-1){if(this.compareVersions("1.5.0",p)||this.compareVersions("1.6.0",p)){return true}}}}}if(this.compareVersions("1.5.0",p)){return true}return false},IEInstall:function(){location.href=n(((this.returnPage!=null)?("&returnPage="+this.returnPage):"")+((this.locale!=null)?("&locale="+this.locale):"")+((this.brand!=null)?("&brand="+this.brand):""));return false},done:function(p,o){},FFInstall:function(){location.href=n(((this.returnPage!=null)?("&returnPage="+this.returnPage):"")+((this.locale!=null)?("&locale="+this.locale):"")+((this.brand!=null)?("&brand="+this.brand):"")+((this.installType!=null)?("&type="+this.installType):""));return false},compareVersions:function(r,t){var p=r.split(".");var o=t.split(".");for(var q=0;q<p.length;++q){p[q]=Number(p[q])}for(var q=0;q<o.length;++q){o[q]=Number(o[q])}if(p.length==2){p[2]=0}if(p[0]>o[0]){return true}if(p[0]<o[0]){return false}if(p[1]>o[1]){return true}if(p[1]<o[1]){return false}if(p[2]>o[2]){return true}if(p[2]<o[2]){return false}return true},enableAlerts:function(){this.browserName=null;this.debug=true},poll:function(){this.refresh();var o=this.getJREs();if((this.preInstallJREList.length==0)&&(o.length!=0)){clearInterval(this.myInterval);if(this.returnPage!=null){location.href=this.returnPage}}if((this.preInstallJREList.length!=0)&&(o.length!=0)&&(this.preInstallJREList[0]!=o[0])){clearInterval(this.myInterval);if(this.returnPage!=null){location.href=this.returnPage}}},writePluginTag:function(){var o=this.getBrowser();if(o=="MSIE"){document.write("<"+'object classid="clsid:CAFEEFAC-DEC7-0000-0001-ABCDEFFEDCBA" '+'id="deployJavaPlugin" width="0" height="0">'+"<"+"/"+"object"+">")}else{if(o=="Netscape Family"&&this.allowPlugin()){this.writeEmbedTag()}}},refresh:function(){navigator.plugins.refresh(false);var o=this.getBrowser();if(o=="Netscape Family"&&this.allowPlugin()){var p=document.getElementById("deployJavaPlugin");if(p==null){this.writeEmbedTag()}}},writeEmbedTag:function(){var o=false;if(navigator.mimeTypes!=null){for(var p=0;p<navigator.mimeTypes.length;p++){if(navigator.mimeTypes[p].type==this.mimeType){if(navigator.mimeTypes[p].enabledPlugin){document.write("<"+'embed id="deployJavaPlugin" type="'+this.mimeType+'" hidden="true" />');o=true}}}if(!o){for(var p=0;p<navigator.mimeTypes.length;p++){if(navigator.mimeTypes[p].type==this.oldMimeType){if(navigator.mimeTypes[p].enabledPlugin){document.write("<"+'embed id="deployJavaPlugin" type="'+this.oldMimeType+'" hidden="true" />')}}}}}}};d.writePluginTag();if(d.locale==null){var h=null;if(h==null){try{h=navigator.userLanguage}catch(f){}}if(h==null){try{h=navigator.systemLanguage}catch(f){}}if(h==null){try{h=navigator.language}catch(f){}}if(h!=null){h.replace("-","_");d.locale=h}}return d}();
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as b/bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
index 147fdb24a3..23266fbd3d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
@@ -37,6 +37,8 @@ package org.bigbluebutton.main.api
   import org.bigbluebutton.main.model.users.events.KickUserEvent;
   import org.bigbluebutton.main.model.users.events.RaiseHandEvent;
   import org.bigbluebutton.main.model.users.events.RoleChangeEvent;
+  import org.bigbluebutton.modules.deskshare.events.DeskshareAppletLaunchedEvent;
+  import org.bigbluebutton.modules.deskshare.utils.JavaCheck;
   import org.bigbluebutton.modules.phone.events.AudioSelectionWindowEvent;
   import org.bigbluebutton.modules.phone.events.FlashCallConnectedEvent;
   import org.bigbluebutton.modules.phone.events.FlashCallDisconnectedEvent;
@@ -111,6 +113,7 @@ package org.bigbluebutton.main.api
         ExternalInterface.addCallback("webRTCWebcamRequest", handleWebRTCWebcamRequest);
         ExternalInterface.addCallback("webRTCWebcamRequestSuccess", handleWebRTCWebcamRequestSuccess);
         ExternalInterface.addCallback("webRTCWebcamRequestFail", handleWebRTCWebcamRequestFail);
+        ExternalInterface.addCallback("javaAppletLaunched", handleJavaAppletLaunched);
       }
       
       // Tell out JS counterpart that we are ready.
@@ -483,5 +486,11 @@ package org.bigbluebutton.main.api
 		trace(LOG + "handleWebRTCWebcamRequest: received");
 		_dispatcher.dispatchEvent(new WebRTCWebcamRequestEvent(WebRTCWebcamRequestEvent.WEBRTC_WEBCAM_REQUEST));
 	}
+	
+	private function handleJavaAppletLaunched():void
+	{
+		trace(LOG + "handleJavaAppletLaunched: received");
+		_dispatcher.dispatchEvent(new DeskshareAppletLaunchedEvent(DeskshareAppletLaunchedEvent.APPLET_LAUNCHED));
+	}
   }
 }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/ClientStatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/ClientStatusItemRenderer.mxml
index 943ce1545e..8ad82ecfb5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/ClientStatusItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/ClientStatusItemRenderer.mxml
@@ -20,7 +20,7 @@
 						break
 				}
 				titleLbl.text = value.title;
-				messageTxt.text = value.message;
+				messageTxt.htmlText = value.message;
 				
 				validateNow();
 			}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 9bc4caf5a0..d64866a9ae 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -178,6 +178,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
  
         if (!showFooterOpt) {
           footerHeight = 0;
+          controlBar.visible = false;
         }        
       }
 		
@@ -637,11 +638,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         ls.x = point1.x - (ls.width/2);
         ls.y = point1.y - (ls.height/2);	
 			}
-			
-			
 		]]>
 	</mx:Script>
-			
+
 	<views:MainToolbar id="toolbar" 
 					   dock="true" 
 					   width="100%" 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
index 3bb6b8dc6e..667c49bedb 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
@@ -26,7 +26,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		   click="handleButtonClick();"
 		   move="handleMove();"
 		   creationComplete="onCreationComplete();"
-		   visible="false">
+		   visible="false" includeInLayout="false">
 	<mate:Listener type="{ClientStatusEvent.SUCCESS_MESSAGE_EVENT}" method="handleSuccessMessageEvent" />
 	<mate:Listener type="{ClientStatusEvent.WARNING_MESSAGE_EVENT}" method="handleWarningMessageEvent" />
 	<mate:Listener type="{ClientStatusEvent.FAIL_MESSAGE_EVENT}" method="handleFailMessageEvent" />
@@ -78,14 +78,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 			
 			private function showNotification():void {
-				visible = true;
-				
-				if (hideTimer.running) hideTimer.reset();
-				hideTimer.start()
-				
-				if (!notification) {
-					notification = ToolTipManager.createToolTip(ResourceUtil.getInstance().getString("bbb.clientstatus.notification"), 100, 100, "errorTipAbove", this) as ToolTip;
-					handleMove();
+				if (parent.visible) {
+					visible = includeInLayout = true;
+					
+					if (hideTimer.running) hideTimer.reset();
+					hideTimer.start()
+					
+					if (!notification) {
+						notification = ToolTipManager.createToolTip(ResourceUtil.getInstance().getString("bbb.clientstatus.notification"), 100, 100, "errorTipAbove", this) as ToolTip;
+						handleMove();
+					}
 				}
 			}
 			
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/events/DeskshareAppletLaunchedEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/events/DeskshareAppletLaunchedEvent.as
new file mode 100755
index 0000000000..2781e566ac
--- /dev/null
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/events/DeskshareAppletLaunchedEvent.as
@@ -0,0 +1,14 @@
+package org.bigbluebutton.modules.deskshare.events
+{
+	import flash.events.Event;
+	
+	public class DeskshareAppletLaunchedEvent extends Event
+	{
+		public static const APPLET_LAUNCHED:String = "DESKSHARE_APPLET_LAUNCHED_EVENT";
+		
+		public function DeskshareAppletLaunchedEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+		}
+	}
+}
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/maps/DeskshareEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/maps/DeskshareEventMap.mxml
index b3d27ee4d7..c1ae9cd5e7 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/maps/DeskshareEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/maps/DeskshareEventMap.mxml
@@ -25,25 +25,25 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 	<mx:Script>
 		<![CDATA[
-      import mx.events.FlexEvent;
-      
-      import org.bigbluebutton.main.events.BBBEvent;
-      import org.bigbluebutton.main.events.MadePresenterEvent;
-      import org.bigbluebutton.modules.deskshare.events.ModuleEvent;
-      import org.bigbluebutton.modules.deskshare.events.ShareEvent;
-      import org.bigbluebutton.modules.deskshare.events.ShareWindowEvent;
-      import org.bigbluebutton.modules.deskshare.events.StartedViewingEvent;
-      import org.bigbluebutton.modules.deskshare.events.StreamEvent;
-      import org.bigbluebutton.modules.deskshare.events.ViewStreamEvent;
-      import org.bigbluebutton.modules.deskshare.events.ViewWindowEvent;
-      import org.bigbluebutton.modules.deskshare.managers.DeskshareManager;
+			import mx.events.FlexEvent;
+			
+			import org.bigbluebutton.main.events.BBBEvent;
+			import org.bigbluebutton.main.events.MadePresenterEvent;
+			import org.bigbluebutton.modules.deskshare.events.ModuleEvent;
+			import org.bigbluebutton.modules.deskshare.events.ShareEvent;
+			import org.bigbluebutton.modules.deskshare.events.ShareWindowEvent;
+			import org.bigbluebutton.modules.deskshare.events.StartedViewingEvent;
+			import org.bigbluebutton.modules.deskshare.events.StreamEvent;
+			import org.bigbluebutton.modules.deskshare.events.ViewStreamEvent;
+			import org.bigbluebutton.modules.deskshare.events.ViewWindowEvent;
+			import org.bigbluebutton.modules.deskshare.managers.DeskshareManager;
 		]]>
 	</mx:Script>
 	<EventHandlers type="{FlexEvent.PREINITIALIZE}">
 		<!--
 		The FlexEvent.PREINITIALIZE event is a good place for creating and initializing managers.
 		-->
-		<ObjectBuilder generator="{DeskshareManager}"/>		
+		<ObjectBuilder generator="{DeskshareManager}"/>
 	</EventHandlers>
 		
 	<EventHandlers type="{ShareEvent.START_SHARING}">
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
new file mode 100755
index 0000000000..95015fd46e
--- /dev/null
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
@@ -0,0 +1,104 @@
+/**
+ * WebMeeting open source conferencing system - http://www.speakserve.org/
+ * 
+ * Copyright (c) 2013 SpeakServe Ltd. and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ * 
+ * WebMeeting is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with WebMeeting; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.bigbluebutton.modules.deskshare.utils
+{
+	import com.asfusion.mate.events.Dispatcher;
+	
+	import flash.external.ExternalInterface;
+	import flash.utils.setTimeout;
+	
+	import org.bigbluebutton.core.BBB;
+	import org.bigbluebutton.main.events.ClientStatusEvent;
+	import org.bigbluebutton.util.i18n.ResourceUtil;
+	
+	public class JavaCheck {		
+		public static function checkJava():String {
+			var dispatcher : Dispatcher = new Dispatcher();
+			var java_version:String = "1.7.0_51";
+			
+			var xml:XML = BBB.initConfigManager().config.browserVersions;
+			if (xml.@java != undefined) {
+				java_version = xml.@java.toString();
+			}
+			
+			try {
+				var javas : Array = JavaCheck.getJREs();
+			} catch ( e : Error ) {
+				dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, ResourceUtil.getInstance().getString("bbb.clientstatus.java.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.java.notdetected")));
+				return ResourceUtil.getInstance().getString("bbb.clientstatus.java.notdetected");
+			}
+			
+			if (javas.length == 0) {
+				dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, ResourceUtil.getInstance().getString("bbb.clientstatus.java.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.java.notinstalled")));
+				return ResourceUtil.getInstance().getString("bbb.clientstatus.java.notinstalled");
+			}
+			
+			var highestJava : String = javas[0];
+			for each (var java : String in javas) {
+				var highest : Array = highestJava.split(".");
+				var iter : Array = java.split(".");
+				
+				if (Number(iter[0]) > Number(highest[0])) {
+					highestJava = java;
+				} else if (Number(iter[0]) == Number(highest[0]) && Number(iter[1]) > Number(highest[1])) {
+					highestJava = java;
+				} else if (Number(iter[0]) == Number(highest[0]) && Number(iter[1]) == Number(highest[1])) {
+					var iterMinor : Number = Number((iter[2] as String).split("_")[1]);
+					var highestMinor : Number = Number((highest[2] as String).split("_")[1]);
+					if (iterMinor > highestMinor)
+					{
+						highestJava = java;
+					}
+				}
+			}
+			
+			var passedJava : Boolean = true;
+			var required : Array = java_version.split(".");
+			highest = highestJava.split(".");
+			if (Number(required[0]) > Number(highest[0])) {
+				passedJava = false;
+			} else if (Number(required[0]) == Number(highest[0]) && Number(required[1]) > Number(highest[1])) {
+				passedJava = false;
+			} else if (Number(required[0]) == Number(highest[0]) && Number(required[1]) == Number(highest[1])) {
+				var requiredMinor : Number = Number((required[2] as String).split("_")[1]);
+				var highestJavaMinor : Number = Number((highest[2] as String).split("_")[1]);
+				if (requiredMinor > highestJavaMinor)
+				{
+					passedJava = false;
+				}
+			}
+			
+			if (!passedJava) {
+				dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, ResourceUtil.getInstance().getString("bbb.clientstatus.java.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.java.oldversion")));
+				return ResourceUtil.getInstance().getString("bbb.clientstatus.java.oldversion");
+			} else {
+				// Java success
+				return null;
+			}
+		}
+		
+		private static function getJREs():Array{
+			var installedJREs:Array = ExternalInterface.call("deployJava.getJREs");
+			
+			if (installedJREs == null) throw new Error("Javascript files not found.");
+			
+			return installedJREs;
+		}
+	}
+}
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
index 07dd924462..ea87f4150d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
@@ -29,7 +29,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	initialize="init()"
 	creationComplete="onCreationComplete()"	
 	verticalScrollPolicy="off" horizontalScrollPolicy="off"
-	width="365" height="320"
+	width="365" height="350"
 	title="{ResourceUtil.getInstance().getString('bbb.desktopPublish.title')}"
 	resizable="false">
 	
@@ -40,33 +40,37 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	<mate:Listener type="{ViewStreamEvent.STOP}" method="closePublishWindow" />
 	<mate:Listener type="{LocaleChangeEvent.LOCALE_CHANGED}" method="localeChanged" />
 	<mate:Listener type="{StopSharingButtonEvent.STOP_SHARING}" method="stopSharingEvent" />
-	
+	<mate:Listener type="{DeskshareAppletLaunchedEvent.APPLET_LAUNCHED}" method="handleDeskshareAppletLaunchedEvent" />
 	<mate:Listener type="{ShortcutEvent.REMOTE_FOCUS_DESKTOP}" method="remoteFocus" />
 	
 	
 	<mx:Script>
 		<![CDATA[
-      import com.asfusion.mate.events.Dispatcher;
-      
-      import flexlib.mdi.events.MDIWindowEvent;
-      import flexlib.scheduling.scheduleClasses.BackgroundItem;   
-      import mx.core.UIComponent;     
-      import org.bigbluebutton.common.Images;
-      import org.bigbluebutton.common.LogUtil;
-      import org.bigbluebutton.common.events.LocaleChangeEvent;
-      import org.bigbluebutton.core.BBB;
-      import org.bigbluebutton.main.events.BBBEvent;
-      import org.bigbluebutton.main.events.MadePresenterEvent;
-      import org.bigbluebutton.main.events.ShortcutEvent;
-      import org.bigbluebutton.main.views.MainCanvas;
-      import org.bigbluebutton.modules.deskshare.events.AppletStartedEvent;
-      import org.bigbluebutton.modules.deskshare.events.CursorEvent;
-      import org.bigbluebutton.modules.deskshare.events.ShareWindowEvent;
-      import org.bigbluebutton.modules.deskshare.events.StopSharingButtonEvent;
-      import org.bigbluebutton.modules.deskshare.events.StreamEvent;
-      import org.bigbluebutton.modules.deskshare.events.ViewStreamEvent;
-      import org.bigbluebutton.modules.deskshare.model.DeskshareOptions;
-      import org.bigbluebutton.util.i18n.ResourceUtil;
+			import com.asfusion.mate.events.Dispatcher;
+			
+			import flexlib.mdi.events.MDIWindowEvent;
+			import flexlib.scheduling.scheduleClasses.BackgroundItem;
+			
+			import mx.core.UIComponent;
+			
+			import org.bigbluebutton.common.Images;
+			import org.bigbluebutton.common.LogUtil;
+			import org.bigbluebutton.common.events.LocaleChangeEvent;
+			import org.bigbluebutton.core.BBB;
+			import org.bigbluebutton.main.events.BBBEvent;
+			import org.bigbluebutton.main.events.MadePresenterEvent;
+			import org.bigbluebutton.main.events.ShortcutEvent;
+			import org.bigbluebutton.main.views.MainCanvas;
+			import org.bigbluebutton.modules.deskshare.events.AppletStartedEvent;
+			import org.bigbluebutton.modules.deskshare.events.CursorEvent;
+			import org.bigbluebutton.modules.deskshare.events.DeskshareAppletLaunchedEvent;
+			import org.bigbluebutton.modules.deskshare.events.ShareWindowEvent;
+			import org.bigbluebutton.modules.deskshare.events.StopSharingButtonEvent;
+			import org.bigbluebutton.modules.deskshare.events.StreamEvent;
+			import org.bigbluebutton.modules.deskshare.events.ViewStreamEvent;
+			import org.bigbluebutton.modules.deskshare.model.DeskshareOptions;
+			import org.bigbluebutton.modules.deskshare.utils.JavaCheck;
+			import org.bigbluebutton.util.i18n.ResourceUtil;
 			
 			public static const SCALE:Number = 5;
 			private static const VID_HEIGHT_PAD:Number = 73;
@@ -92,6 +96,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private var captureWidth:Number = Capabilities.screenResolutionX;
 			private var autoStart:Boolean = false;
 			private var globalDispatcher:Dispatcher = new Dispatcher();
+			private var javaTimer:Timer;
 			
 			[Bindable] private var cursor:Sprite;
 			[Bindable] private var baseIndex:int;
@@ -108,12 +113,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				cursor = new Sprite();
 				cursor.graphics.lineStyle(6, 0xFF0000, 0.6);
 				cursor.graphics.drawCircle(0,0,3);		
-					
+				
+				var javaIssue:String = JavaCheck.checkJava();
+				
 				if (isUsingLessThanChrome38OnMac()) {
-				   setCurrentState("chromeOnMacWarningState");
+					setCurrentState("chromeOnMacWarningState");
+				}
+				else if (javaIssue != null) {
+					setCurrentState("javaIssueWarningState");
+					javaIssueWarningStateLbl.htmlText = javaIssue;
 				}
 				else {
-				   setCurrentState("dispFullRegionControlBar");
+					setCurrentState("dispFullRegionControlBar");
 				}
 				resourcesChanged();
 				
@@ -168,6 +179,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				btnFSPublish.enabled = false;
 				btnRegionPublish.enabled = false;
 //				useSVC2Check.enabled = false;
+				javaTimer = new Timer(3000, 1);
+				javaTimer.addEventListener(TimerEvent.TIMER, onJavaTimer);
+				javaTimer.start();
 				startSharing(connection, uri, room, fullScreen);
 			}
 			
@@ -203,6 +217,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				closeWindow();
 			}
 			
+			private function onJavaTimer(e:TimerEvent):void {
+				var browser:Array = ExternalInterface.call("determineBrowser");
+				if (browser[0] == "Chrome")
+					javaHelpArea.visible = javaHelpArea.includeInLayout = true;
+			}
+			
 			private function onUpdateCursorEvent(event:CursorEvent):void {	
 				// DO NOT compute the x and y coordinate and assign directly to the cursorImg
                 // as it results in a flickering and jerky mouse pointer (ralam jun 10, 2010).
@@ -321,7 +341,19 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				ExternalInterface.call("stopApplet");	
 				dispatchEvent(new ShareWindowEvent(ShareWindowEvent.CLOSE));				
 			}		
-				
+			
+			private function restartJava():void {
+				ExternalInterface.call("stopApplet");
+				shareScreen(sharingFullScreen);
+			}
+			
+			private function handleDeskshareAppletLaunchedEvent(e:DeskshareAppletLaunchedEvent):void {
+				if (javaTimer && javaTimer.running) {
+					javaTimer.stop();
+				}
+				javaHelpArea.visible = javaHelpArea.includeInLayout = false;
+			}
+			
 			/*
 			 * Override the close handler. We want the Event Map to send a message to
 			 * the MDIManager to close this window;
@@ -360,81 +392,67 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				closeWindow();
 			}
 			
-      private function onCheckYourJavaClicked():void {
-        var CHECK_JAVA_URL:String = BBB.initConfigManager().config.javaTest.url;        
-        navigateToURL(new URLRequest(CHECK_JAVA_URL));
-      }
 			private function isUsingLessThanChrome38OnMac():Boolean {
-        var browser:Array = ExternalInterface.call("determineBrowser");
-        
-				return ((browser[0] == "Chrome")
-          && (parseInt(browser[1]) <= 38)
-          && (Capabilities.os.indexOf("Mac") >= 0));
+				var browser:Array = ExternalInterface.call("determineBrowser");
+				return ((browser[0] == "Chrome") && (parseInt(browser[1]) <= 38) && (Capabilities.os.indexOf("Mac") >= 0));
 			}
 		]]>
 	</mx:Script>
 
 	<!--http://stackoverflow.com/questions/369120/why-does-mxstates-have-trouble-being-resolved-to-a-component-implementation-->
+	<mx:VBox id="javaHelpArea" includeInLayout="false" visible="false" height="100%" width="100%" verticalAlign="middle" horizontalAlign="center">
+		<mx:Text width="80%" textAlign="center" styleName="desktopShareTextStyle" text="{ResourceUtil.getInstance().getString('bbb.desktopPublish.chromeHint.title')}" />
+		<mx:Image id="javaHelpImg" styleName="chromeJavaHelpImage" source="{javaHelpImg.getStyle('imageSource')}" />
+		<mx:Text width="80%" textAlign="center" styleName="desktopShareTextStyle" text="{ResourceUtil.getInstance().getString('bbb.desktopPublish.chromeHint.message')}" />
+		<mx:Button label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.chromeHint.button')}" click="restartJava()"/>
+	</mx:VBox>
 	<dspub:states>	    
         <mx:State name="dispFullRegionControlBar">   
             <mx:AddChild>
-              
-                <mx:ControlBar id="fullRegionBottomBar">
-                  <mx:VBox width="100%" height="100%" horizontalAlign="center">
-                    <mx:HBox horizontalAlign="center">
-                      <mx:Button id="btnFSPublish" 
-                                 toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.fullscreen.tooltip')}" 
-                                 label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.fullscreen.label')}" 
-                                 visible="true" 
-                                 click="shareScreen(true)" 
-                                 tabIndex="{baseIndex+4}"/>
-                      <mx:Spacer width="100%"/>
-                      <mx:Button id="btnClosePublish" 
-                                 toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.stop.tooltip')}" 
-                                 label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.stop.label')}" 
-                                 visible="true" 
-                                 enabled="false" 
-                                 click="stopSharing()" 
-                                 tabIndex="{baseIndex+5}"/>
-                      <mx:Spacer width="100%"/>
-                      <mx:Button id="btnRegionPublish"
-                                 toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.region.tooltip')}" 
-                                 label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.region.label')}" 
-                                 visible="true" 
-                                 click="shareScreen(false)" 
-                                 tabIndex="{baseIndex+6}"
-                                 focusEnabled="false"
-                                 tabEnabled="false"/>
-                      <mx:Spacer width="100%"/>                      
-                    </mx:HBox>
-
-                    
-                    <mx:Label id="javaVersionLabel" styleName="javaVersionRequiredLabelStyle" text="{ResourceUtil.getInstance().getString('bbb.desktopPublish.javaRequiredLabel')}"/>
-                    <mx:LinkButton id="checkJavaBtn" label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.javaTestLinkLabel')}" click="onCheckYourJavaClicked()" height="22" 
-                                   styleName="testJavaLinkButtonStyle" textDecoration="underline"
-                                   toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.javaTestLinkLabel.tooltip')}" 
-                                   accessibilityDescription="{ResourceUtil.getInstance().getString('bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility')}"/>
-                  </mx:VBox>
-                </mx:ControlBar>
+              <mx:ControlBar id="fullRegionBottomBar">
+                <mx:VBox width="100%" height="100%" horizontalAlign="center">
+                  <mx:HBox horizontalAlign="center">
+                    <mx:Button id="btnFSPublish" 
+                               toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.fullscreen.tooltip')}" 
+                               label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.fullscreen.label')}" 
+                               visible="true" 
+                               click="shareScreen(true)" 
+                               tabIndex="{baseIndex+4}"/>
+                    <mx:Spacer width="100%"/>
+                    <mx:Button id="btnClosePublish" 
+                               toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.stop.tooltip')}" 
+                               label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.stop.label')}" 
+                               visible="true" 
+                               enabled="false" 
+                               click="stopSharing()" 
+                               tabIndex="{baseIndex+5}"/>
+                    <mx:Spacer width="100%"/>
+                    <mx:Button id="btnRegionPublish"
+                               toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.region.tooltip')}" 
+                               label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.region.label')}" 
+                               visible="true" 
+                               click="shareScreen(false)" 
+                               tabIndex="{baseIndex+6}"
+                               focusEnabled="false"
+                               tabEnabled="false"/>
+                    <mx:Spacer width="100%"/>                      
+                  </mx:HBox>
+                </mx:VBox>
+              </mx:ControlBar>
             </mx:AddChild>
         </mx:State>	
 		<mx:State name="chromeOnMacWarningState">
 			<mx:AddChild>
-				<mx:VBox id="chromeOnMacWarningBottomBar" horizontalAlign="center" width="100%" height="100%" verticalAlign="bottom">
-					<mx:HBox>
-						<mx:Button id="chromeOnMacWarningCloseButton"
-								   toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.stop.tooltip')}"
-								   label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.stop.label')}"
-								   visible="true"
-								   enabled="true"
-								   click="stopSharing()"
-								   />
-						<mx:Spacer width="100%"/>
-					</mx:HBox>
-					<mx:HBox horizontalAlign="center" width="300" styleName="desktopShareUsingChromeOnMacHintBoxStyle">
-						<mx:Text id="chromeOnMacWarningLbl" width="100%" textAlign="center" text="{ResourceUtil.getInstance().getString('bbb.desktopPublish.chromeOnMacUnsupportedHint')}"
-								 styleName="desktopShareUsingChromeOnMacHintTextStyle" toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.chromeOnMacUnsupportedHint')}" />
-					</mx:HBox>
+				<mx:VBox height="100%" width="100%" verticalAlign="middle" horizontalAlign="center">
+					<mx:Text id="chromeOnMacWarningLbl" width="80%" textAlign="center" styleName="desktopShareTextStyle"
+							 text="{ResourceUtil.getInstance().getString('bbb.desktopPublish.chromeOnMacUnsupportedHint')}" />
+				</mx:VBox>
+			</mx:AddChild>
+		</mx:State>
+		<mx:State name="javaIssueWarningState">
+			<mx:AddChild>
+				<mx:VBox height="100%" width="100%" verticalAlign="middle" horizontalAlign="center">
+					<mx:Text id="javaIssueWarningStateLbl" width="80%" textAlign="center" styleName="desktopShareTextStyle" />
 				</mx:VBox>
 			</mx:AddChild>
 		</mx:State>
diff --git a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java
old mode 100644
new mode 100755
index 45c4910f27..ce83360aec
--- a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java
+++ b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.security.*;
 import java.awt.Image;
+import netscape.javascript.*;
 
 public class DeskShareApplet extends JApplet implements ClientListener {
 	public static final String NAME = "DESKSHAREAPPLET: ";
@@ -94,8 +95,16 @@ public class DeskShareApplet extends JApplet implements ClientListener {
 			icon = ImageIO.read(url);
 		} catch (IOException e) {
 		}
+		
+		// Callback to JavaScript
+		try {
+			JSObject window = JSObject.getWindow(this);
+			window.call("appletStartupCallback", new Object[]{});
+		} catch (JSException jse) {
+			jse.printStackTrace();
+		}
 	}
-	 
+	
 	private String getJavaVersionRuntime() {
 		return System.getProperty("java.version");
 	}